diff --git a/indra/newview/animationexplorer.h b/indra/newview/animationexplorer.h
index 2f6e3b999e..92f5c25ad1 100644
--- a/indra/newview/animationexplorer.h
+++ b/indra/newview/animationexplorer.h
@@ -28,11 +28,8 @@
 #ifndef ANIMATIONEXPLORER_H
 #define ANIMATIONEXPLORER_H
 
-#include <deque>
-
 #include "llfloater.h"
 #include "llfloaterbvhpreview.h"	// for LLPreviewAnimation
-#include "llscrolllistitem.h"
 #include "llsingleton.h"
 
 // --------------------------------------------------------------------------
diff --git a/indra/newview/aoengine.h b/indra/newview/aoengine.h
index 05b653a0d6..905a7534cf 100644
--- a/indra/newview/aoengine.h
+++ b/indra/newview/aoengine.h
@@ -32,7 +32,6 @@
 #include "llassettype.h"
 #include "lleventtimer.h"
 #include "llsingleton.h"
-#include "lluuid.h"
 
 // NaCl - feex
 #include "llextendedstatus.h"
diff --git a/indra/newview/aoset.h b/indra/newview/aoset.h
index 3293975b3d..71758ec9a6 100644
--- a/indra/newview/aoset.h
+++ b/indra/newview/aoset.h
@@ -25,7 +25,6 @@
 #ifndef AOSET_H
 #define AOSET_H
 
-#include "llcommon.h"
 #include "lleventtimer.h"
 
 class AOSet
diff --git a/indra/newview/growlmanager.h b/indra/newview/growlmanager.h
index aa1faf992a..327192df39 100644
--- a/indra/newview/growlmanager.h
+++ b/indra/newview/growlmanager.h
@@ -36,7 +36,6 @@
 #include "llnotifications.h"
 #include "growlnotifier.h"
 #include "lleventtimer.h"
-#include <map>
 
 struct GrowlNotification
 {
diff --git a/indra/newview/quickprefs.h b/indra/newview/quickprefs.h
index 5e98fcd695..54bd89f41d 100644
--- a/indra/newview/quickprefs.h
+++ b/indra/newview/quickprefs.h
@@ -32,16 +32,20 @@
 
 #include "lltransientdockablefloater.h"
 #include "llwlparamset.h"
-#include "llmultisliderctrl.h"
-#include "llcombobox.h"
 #include "rlvdefines.h"
 
 const std::string PHOTOTOOLS_FLOATER = "phototools";
 
 // <FS:Zi> Dynamic quick prefs
-class LLLayoutStack;
+class LLCheckBoxCtrl;
+class LLComboBox;
 class LLLayoutPanel;
+class LLLayoutStack;
+class LLLineEditor;
+class LLMultiSliderCtrl;
+class LLSlider;
 class LLSpinCtrl;
+class LLTextBox;
 // </FS:Zi>
 
 #define PRESET_NAME_REGION_DEFAULT "__Regiondefault__"
diff --git a/indra/newview/utilitybar.h b/indra/newview/utilitybar.h
index 123b5c2350..df9b65a094 100644
--- a/indra/newview/utilitybar.h
+++ b/indra/newview/utilitybar.h
@@ -27,7 +27,6 @@
 
 #include "lleventtimer.h"
 #include "llsingleton.h"
-#include "lluuid.h"
 
 class LLButton;