diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index 72b81f382cc9c234f1721b7cd323e8acc6813233..963ea38249752f44a39f032bd1d5f6b0609709a2 100644
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -39,8 +39,11 @@
 #include "lloptioninterface.h"
 
 // Forward declarations
+template <typename Type> class LLAtomic32;
+typedef LLAtomic32<U32> LLAtomicU32;
 class LLErrorThread;
 class LLLiveFile;
+typedef struct siginfo siginfo_t;
 
 typedef void (*LLAppErrorHandler)();
 typedef void (*LLAppChildCallback)(int pid, bool exited, int status);
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index ab2455620fee2ab9f0a40add1695eb65425bb281..7ecbc3db601fba5f8ea17ca1fd55bb5d7e695f46 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -64,11 +64,6 @@ extern "C" {
 #if LL_GTK
 # include "gtk/gtk.h"
 #endif // LL_GTK
-
-// also mostly for Linux, for some X11-specific filepicker usability tweaks
-#if LL_X11
-#include "SDL/SDL_syswm.h"
-#endif
 }
 
 class LLFilePicker
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f72bbb70bf53a20ce094036884d338e4f2f4e1d0..d15214ed4bcdd878d45eea625ba7b370d0661049 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -38,10 +38,14 @@
 #include "lleconomy.h"
 #include "llfloaterreg.h"
 #include "llfollowcamparams.h"
+#include "llregionhandle.h"
 #include "llsdserialize.h"
+#include "llteleportflags.h"
 #include "lltransactionflags.h"
 #include "llvfile.h"
 #include "llvfs.h"
+#include "llxfermanager.h"
+#include "mean_collision_data.h"
 
 #include "llagent.h"
 #include "llcallingcard.h"