diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
index 35dc9ddda..c56e49206 100644
--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@@ -43,6 +43,7 @@
 #include "lluictrlfactory.h"
 #include "llwindow.h"
 #include "llviewerwindow.h"
+#include "llhttpclient.h"
 
 static LLFloaterURLEntry* sInstance = NULL;
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index fcd46b82e..328ccf2dc 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -219,6 +219,7 @@
 #include "llfloaterblacklist.h"
 #include "scriptcounter.h"
 #include "shfloatermediaticker.h"
+#include "llpacketring.h"
 // </edit>
 
 #include "llavatarnamecache.h"
diff --git a/indra/newview/lltexturestatsuploader.cpp b/indra/newview/lltexturestatsuploader.cpp
index e0358e1fc..7f14a4254 100644
--- a/indra/newview/lltexturestatsuploader.cpp
+++ b/indra/newview/lltexturestatsuploader.cpp
@@ -33,6 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "lltexturestatsuploader.h"
+#include "llhttpclient.h"
 
 LLTextureStatsUploader::LLTextureStatsUploader()
 {
diff --git a/indra/newview/lluserauth.cpp b/indra/newview/lluserauth.cpp
index 29930a96e..a10c66fca 100644
--- a/indra/newview/lluserauth.cpp
+++ b/indra/newview/lluserauth.cpp
@@ -49,6 +49,10 @@
 // NOTE: MUST include these after otherincludes since queue gets redefined!?!!
 #include <xmlrpc-epi/xmlrpc.h>
 
+#include <curl/curl.h>
+#ifdef DEBUG_CURLIO
+#include "debug_libcurl.h"
+#endif
 
 // Don't define PLATFORM_STRING for unknown platforms - they need
 // to get added to the login cgi script, so we want this to cause an
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 56f0403e9..7d83e718d 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -48,6 +48,7 @@
 #include "llnotificationsutil.h"
 #include "lluuid.h"
 #include "llkeyboard.h"
+#include "llhttpclient.h"
 
 // Merov: Temporary definitions while porting the new viewer media code to Snowglobe
 const int LEFT_BUTTON  = 0;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 5d6134412..a30508522 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -250,6 +250,7 @@
 #include "llfloatervfs.h"
 #include "llfloatervfsexplorer.h"
 #include "shfloatermediaticker.h"
+#include "llpacketring.h"
 // </edit>
 
 #include "scriptcounter.h"
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index ef77a099d..a265b3613 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -61,6 +61,7 @@
 #include "message.h"
 #include "pipeline.h"
 #include "llappviewer.h"		// for do_disconnect()
+#include "llpacketring.h"
 
 #include <deque>
 #include <queue>
diff --git a/indra/newview/scriptcounter.cpp b/indra/newview/scriptcounter.cpp
index f58d26b34..3da258c28 100644
--- a/indra/newview/scriptcounter.cpp
+++ b/indra/newview/scriptcounter.cpp
@@ -43,6 +43,7 @@
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
 #include "llviewerobject.h"
+#include "llpacketring.h"
 #include <sstream>
 
 ScriptCounter* ScriptCounter::sInstance;