diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
index f32e072a711a74def4c0c67bf0602b21123274b7..20eb4678dd223b987fc535d89ef06ba43421b1ee 100644
--- a/indra/llappearance/CMakeLists.txt
+++ b/indra/llappearance/CMakeLists.txt
@@ -9,6 +9,7 @@ include(LLImage)
 include(LLInventory)
 include(LLMath)
 include(LLMessage)
+include(LLCoreHttp)
 include(LLRender)
 include(LLVFS)
 include(LLWindow)
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 9684a3578a477ff7f0ba10646ba8da2d8631c670..3f258ee3837ffdb8a0dd7e54ed0017041814c616 100755
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -6,6 +6,7 @@ include(00-Common)
 include(LLCommon)
 include(LLMath)
 include(LLMessage)
+include(LLCoreHttp)
 include(LLXML)
 include(LLPhysicsExtensions)
 
@@ -73,6 +74,8 @@ target_link_libraries(llprimitive
     ${LLCOREHTTP_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LLPHYSICSEXTENSIONS_LIBRARIES}
+    ${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
     )
 
 
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index e2bbbb828529d2bd71d765b01f550f07f38a634a..259fbde80601d912826f03ce09e56c5e5ad23bbf 100755
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -8,6 +8,7 @@ include(LLImage)
 include(LLInventory)
 include(LLMath)
 include(LLMessage)
+include(LLCoreHttp)
 include(LLRender)
 include(LLWindow)
 include(LLVFS)
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt
index 9884edc4999b29021bef1e8285a3b3042593d767..3bedeb7292ff310cea76b22fd6bd5cfe220e9f8d 100755
--- a/indra/viewer_components/login/CMakeLists.txt
+++ b/indra/viewer_components/login/CMakeLists.txt
@@ -10,6 +10,8 @@ include(LLCommon)
 include(LLMath)
 include(LLXML)
 include(Boost)
+include(LLCoreHttp)
+include(LLMessage)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt
index 0d44334276c08b238b250a35e42cbc4304bbaca8..48c065c2edc19924a0bc31735525c59a5cb02f24 100755
--- a/indra/viewer_components/updater/CMakeLists.txt
+++ b/indra/viewer_components/updater/CMakeLists.txt
@@ -62,8 +62,8 @@ add_library(llupdaterservice
 
 target_link_libraries(llupdaterservice
     ${LLCOMMON_LIBRARIES}
-    ${LLCOREHTTP_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
+    ${LLCOREHTTP_LIBRARIES}
     ${LLPLUGIN_LIBRARIES}
     ${LLVFS_LIBRARIES}
     )