Fixups for things broken after the last merge and for the linux build.

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);

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

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"