diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9fe02a8ead22fdb76032b5e537596e3a6000932b..19e1273dc677dd14fed70227c3e1770c2798a5a2 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 5f71b6e3f61e4f05eeaa4ce37290c0cb2bf5c5cb..4819703e7280b9673f35a37d00b0c4a3118fe97d 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 f007697e882bf29fa8ea6aead639b5bae5c5601f..4a12543650f27a58ccb0d5e8a93a4a7aa49755a0 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 31866c83c8b10d0a29f4b6de294446cc39a3bfcd..eec885fd291565a4443b97750b1e27c4323e12ba 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 9ec98743844409dcb48f4f40ffa56866405e1026..6a61e0f02fe08b747abeba5b31db704b497332ea 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 de68dd615360c4b208b32f033b697a75b5ea9225..a7f4cb558e8716543009cac30228892cc88eb117 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 631f9ac48b988cdd469f9de3f92565c64ea60c18..d5b99ac160f01aa40587e96b9eedf47cb7bc8632 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 8bf736471455a0eee4381fba8db3393465f7a661..21d4c724287b426779b6ca7c6fe466205ceb584a 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 c3c9d7021e976b22624732a31a1881a08e7433e5..e4f6240fc75d71572741bb716eae5d9cc1ace060 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;