9 files changed, 18 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9fe02a8ead..19e1273dc6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -34,8 +34,7 @@
 
 #include "llappviewer.h"
 
-#include "llprimitive.h"
-
+// Viewer includes
 #include "llversionviewer.h"
 #include "llfeaturemanager.h"
 #include "lluictrlfactory.h"
@@ -80,7 +79,10 @@
 
 // Linden library includes
 #include "llmemory.h"
+#include "llprimitive.h"
 #include "llurlaction.h"
+#include "llvfsthread.h"
+#include "llvolumemgr.h"
 
 // Third party library includes
 #include <boost/bind.hpp>
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 5f71b6e3f6..4819703e72 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -41,6 +41,7 @@
 
 #include "llagent.h"
 #include "llappviewer.h"		// for gLastVersionChannel
+#include "llcachename.h"
 #include "llcallingcard.h"		// for LLAvatarTracker
 #include "llinventorymodel.h"	// for gInventory.findCategoryUUIDForType
 #include "llimview.h"			// for gIMMgr
diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h
index f007697e88..4a12543650 100644
--- a/indra/newview/llfloaterimagepreview.h
+++ b/indra/newview/llfloaterimagepreview.h
@@ -35,6 +35,7 @@
 
 #include "llfloaternamedesc.h"
 #include "lldynamictexture.h"
+#include "llpointer.h"
 #include "llquaternion.h"
 
 class LLComboBox;
@@ -43,6 +44,7 @@ class LLViewerJointMesh;
 class LLVOAvatar;
 class LLTextBox;
 class LLVertexBuffer;
+class LLVolume;
 
 class LLImagePreviewSculpted : public LLViewerDynamicTexture
 {
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index 31866c83c8..eec885fd29 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -33,6 +33,7 @@
 #define LLFOLDERVIEWITEM_H
 
 #include "llview.h"
+#include "lldarray.h"  // *TODO: Eliminate, forward declare
 
 class LLFontGL;
 class LLFolderView;
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 9ec9874384..6a61e0f02f 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -39,9 +39,11 @@
 #include "lleconomy.h"
 #include "llerror.h"
 #include "llfontgl.h"
+#include "llmaterialtable.h"
 #include "llpermissionsflags.h"
 #include "llstring.h"
 #include "llvolume.h"
+#include "material_codes.h"
 #include "m3math.h"
 
 // project includes
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index de68dd6153..a7f4cb558e 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -65,6 +65,7 @@
 // linden library headers
 #include "llprimitive.h"
 #include "llwindow.h"			// incBusyCount()
+#include "material_codes.h"
 
 const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
 
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 631f9ac48b..d5b99ac160 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -37,6 +37,8 @@
 #include "llframetimer.h"
 #include "llwearable.h"
 
+#include <boost/signals2.hpp>	// boost::signals2::trackable
+
 class LLFolderView;
 class LLFolderBridge;
 class LLViewerInventoryCategory;
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index 8bf7364714..21d4c72428 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -207,6 +207,8 @@
 #include "patch_dct.h"
 #include "sound_ids.h"
 
+// Builds work with all headers below commented out as of 2009-09-10 JC
+
 // Library includes from llprimitive
 #include "imageids.h"
 #include "legacy_object_types.h"
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index c3c9d7021e..e4f6240fc7 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -51,6 +51,9 @@
 #include "llcursortypes.h"
 #include "llhandle.h"
 
+#include <boost/function.hpp>
+#include <boost/signals2.hpp>
+
 class LLView;
 class LLViewerObject;
 class LLUUID;