diff --git a/indra/llappearance/llpolymesh.h b/indra/llappearance/llpolymesh.h
index 83659d9514c30ac9c895ad98e8e708253b8194d8..22b92fa61d424a6ee759b8cf111ece7f9a1de8ae 100644
--- a/indra/llappearance/llpolymesh.h
+++ b/indra/llappearance/llpolymesh.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLPOLYMESHINTERFACE_H
 #define LL_LLPOLYMESHINTERFACE_H
 
-#include <string>
-#include <map>
 #include "llstl.h"
 
 #include "v3math.h"
diff --git a/indra/llappearance/llpolymorph.h b/indra/llappearance/llpolymorph.h
index 3c2c68079c39d29169dbc3083b96ab77aaa3da93..ded6e6c7b3c7531694ae847b052a5f720e12cb54 100644
--- a/indra/llappearance/llpolymorph.h
+++ b/indra/llappearance/llpolymorph.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLPOLYMORPH_H
 #define LL_LLPOLYMORPH_H
 
-#include <string>
-#include <vector>
-
 #include "llviewervisualparam.h"
 
 class LLAvatarJointCollisionVolume;
diff --git a/indra/llappearance/llpolyskeletaldistortion.h b/indra/llappearance/llpolyskeletaldistortion.h
index f6c467980bc4b8865d255298804a2c7e3454b935..07f8f58c90ca958c8a155945671cada5393334b2 100644
--- a/indra/llappearance/llpolyskeletaldistortion.h
+++ b/indra/llappearance/llpolyskeletaldistortion.h
@@ -29,8 +29,6 @@
 
 #include "llcommon.h"
 
-#include <string>
-#include <map>
 #include "llstl.h"
 
 #include "v3math.h"
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
index f1e1b4e308c79a440115011ed64a53c2dfe0343e..fecb4103704a8a54fe5c3e0cfe406964a03c9ecb 100755
--- a/indra/llaudio/llaudioengine.h
+++ b/indra/llaudio/llaudioengine.h
@@ -28,9 +28,6 @@
 #ifndef LL_AUDIOENGINE_H
 #define LL_AUDIOENGINE_H
 
-#include <list>
-#include <map>
-
 #include "v3math.h"
 #include "v3dmath.h"
 #include "lltimer.h"
diff --git a/indra/llcharacter/llanimationstates.h b/indra/llcharacter/llanimationstates.h
index 79cbcabdc1da0e72ad4c4fd6544cf2ebc2f288bd..3d152c23d6f0b84a3e6f85d18e98795fd4010698 100755
--- a/indra/llcharacter/llanimationstates.h
+++ b/indra/llcharacter/llanimationstates.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLANIMATIONSTATES_H
 #define LL_LLANIMATIONSTATES_H
 
-#include <map>
-
 #include "llstringtable.h"
 #include "lluuid.h"
 
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index 4840b44dc41ac55b17076e24670fe4a0542eb15c..ad148f5e65fde4ef49205b64134120f62f6e3738 100755
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -30,8 +30,6 @@
 //-----------------------------------------------------------------------------
 // Header Files
 //-----------------------------------------------------------------------------
-#include <string>
-
 #include "lljoint.h"
 #include "llmotioncontroller.h"
 #include "llvisualparam.h"
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 2abe1d6db1510cb6da94adf987e473a271c6da73..f0d065eb16f7c0570f17960955266c7cc9c4ff3b 100755
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -30,7 +30,6 @@
 //-----------------------------------------------------------------------------
 // Header Files
 //-----------------------------------------------------------------------------
-#include <string>
 #include <list>
 
 #include "v3math.h"
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h
index b1422b2b903c742a0d4e13d1fd816666f0a3e9e1..619ccd4428e4dd4cc2213bb2030b611078c7c244 100755
--- a/indra/llcharacter/llkeyframemotion.h
+++ b/indra/llcharacter/llkeyframemotion.h
@@ -31,8 +31,6 @@
 // Header files
 //-----------------------------------------------------------------------------
 
-#include <string>
-
 #include "llassetstorage.h"
 #include "llbboxlocal.h"
 #include "llhandmotion.h"
diff --git a/indra/llcharacter/llkeyframemotionparam.h b/indra/llcharacter/llkeyframemotionparam.h
index 0fac3724d14dac9392c0d7571595c40da532bc30..e26961c6cca5ea7af1f0a6ba7d39c8fae05eac9d 100755
--- a/indra/llcharacter/llkeyframemotionparam.h
+++ b/indra/llcharacter/llkeyframemotionparam.h
@@ -31,8 +31,6 @@
 // Header files
 //-----------------------------------------------------------------------------
 
-#include <string>
-
 #include "llmotion.h"
 #include "lljointstate.h"
 #include "v3math.h"
diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h
index 9bc55ec1f3feb9c5161006ef21c9f8f61a83dc85..e0129f57666fd0ed1c0c51fd15269eab2a7a41fa 100755
--- a/indra/llcharacter/llmotion.h
+++ b/indra/llcharacter/llmotion.h
@@ -30,8 +30,6 @@
 //-----------------------------------------------------------------------------
 // Header files
 //-----------------------------------------------------------------------------
-#include <string>
-
 #include "llerror.h"
 #include "llpose.h"
 #include "lluuid.h"
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h
index 2bd5271c4f73a0775985fa7f8eab83b8c3f7dfd7..4e76c956931d617e2dad0d66b42779acccfe3832 100755
--- a/indra/llcharacter/llmotioncontroller.h
+++ b/indra/llcharacter/llmotioncontroller.h
@@ -30,9 +30,6 @@
 //-----------------------------------------------------------------------------
 // Header files
 //-----------------------------------------------------------------------------
-#include <string>
-#include <map>
-#include <deque>
 
 #include "llmotion.h"
 #include "llpose.h"
diff --git a/indra/llcharacter/llmultigesture.h b/indra/llcharacter/llmultigesture.h
index 92820159d4541c96060cc45987dacc1503721099..fab1e959d6fa24993c95c92c227a89466e5a1ed0 100755
--- a/indra/llcharacter/llmultigesture.h
+++ b/indra/llcharacter/llmultigesture.h
@@ -28,8 +28,6 @@
 #define LL_LLMULTIGESTURE_H
 
 #include <set>
-#include <string>
-#include <vector>
 
 #include "lluuid.h"
 #include "llframetimer.h"
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h
index c004a0f3b74388b3ceb7999eca33b2dff6a59fb9..d3f4553625d8371f7bd8dcc79d6f2011454e1a20 100755
--- a/indra/llcharacter/llpose.h
+++ b/indra/llcharacter/llpose.h
@@ -35,9 +35,6 @@
 #include "lljoint.h"
 #include "llpointer.h"
 
-#include <map>
-#include <string>
-
 
 //-----------------------------------------------------------------------------
 // class LLPose
diff --git a/indra/llcharacter/llstatemachine.h b/indra/llcharacter/llstatemachine.h
index a2f7e59bd2b24a54948b7a288ecbd9769277346d..2aa1625a39fb519b92868426798fd255b23edc66 100755
--- a/indra/llcharacter/llstatemachine.h
+++ b/indra/llcharacter/llstatemachine.h
@@ -27,10 +27,7 @@
 #ifndef LL_LLSTATEMACHINE_H
 #define LL_LLSTATEMACHINE_H
 
-#include <string>
-
 #include "llerror.h"
-#include <map>
 
 class LLUniqueID
 {
diff --git a/indra/llcommon/lluriparser.h b/indra/llcommon/lluriparser.h
index 2df8085ae6330582453cd0c0e839a97a5ad5994a..b2baa0862f5b08276aa67ebdad60d7117e6a31aa 100644
--- a/indra/llcommon/lluriparser.h
+++ b/indra/llcommon/lluriparser.h
@@ -30,7 +30,7 @@
 #define LL_LLURIPARSER_H
 
 #include <string>
-#include "uriparser/Uri.h"
+#include <uriparser/Uri.h>
 
 class LL_COMMON_API LLUriParser
 {
diff --git a/indra/llinventory/llfoldertype.h b/indra/llinventory/llfoldertype.h
index a3896cc6e0c94794d9f68b6742c3c88f527147e0..bcabc2816c6b9716b71202e6b87254745daf9300 100644
--- a/indra/llinventory/llfoldertype.h
+++ b/indra/llinventory/llfoldertype.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLFOLDERTYPE_H
 #define LL_LLFOLDERTYPE_H
 
-#include <string>
 #include "llassettype.h"
 
 // This class handles folder types (similar to assettype, except for folders)
diff --git a/indra/llinventory/lllandmark.h b/indra/llinventory/lllandmark.h
index 92923ea6fb32fb621cf533be3907d27173d5ae2b..13afc34c1ddc5000317770e3d4b0415bb930a643 100755
--- a/indra/llinventory/lllandmark.h
+++ b/indra/llinventory/lllandmark.h
@@ -28,7 +28,6 @@
 #ifndef LL_LLLANDMARK_H
 #define LL_LLLANDMARK_H
 
-#include <map>
 #include <boost/function.hpp>
 #include "llframetimer.h"
 #include "lluuid.h"
diff --git a/indra/llinventory/lluserrelations.h b/indra/llinventory/lluserrelations.h
index 9fbf36f0e210343b71443ffee857635e225c7910..ab9e5546e4321496600cb225b91fb9da98b7169e 100755
--- a/indra/llinventory/lluserrelations.h
+++ b/indra/llinventory/lluserrelations.h
@@ -29,7 +29,6 @@
 #ifndef LL_LLUSERRELAIONS_H
 #define LL_LLUSERRELAIONS_H
 
-#include <map>
 #include "lluuid.h"
 
 /** 
diff --git a/indra/llmath/llcalc.h b/indra/llmath/llcalc.h
index 8c71569f43dc1039cde84b1b39d6dd216df82d56..4b36cf63a8b283f1d29b421df2d17167a1f147ee 100755
--- a/indra/llmath/llcalc.h
+++ b/indra/llmath/llcalc.h
@@ -27,9 +27,6 @@
 #ifndef LL_CALC_H
 #define LL_CALC_H
 
-#include <map>
-#include <string>
-
 class LLCalc
 {
 public:
diff --git a/indra/llmath/llvolumemgr.h b/indra/llmath/llvolumemgr.h
index c75906f675ff8fa7b484432d2adac78bdaa11f10..5478322b4014282ae88ae3ac9436354aa6b80589 100755
--- a/indra/llmath/llvolumemgr.h
+++ b/indra/llmath/llvolumemgr.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLVOLUMEMGR_H
 #define LL_LLVOLUMEMGR_H
 
-#include <map>
-
 #include "llvolume.h"
 #include "llpointer.h"
 #include "llthread.h"
diff --git a/indra/llmessage/llavatarname.h b/indra/llmessage/llavatarname.h
index af5bcf13a90ff384afb2c79c78ff1a9e33411084..ff53156707f446191d30afc43ea1b2d319aa8258 100644
--- a/indra/llmessage/llavatarname.h
+++ b/indra/llmessage/llavatarname.h
@@ -28,8 +28,6 @@
 #ifndef LLAVATARNAME_H
 #define LLAVATARNAME_H
 
-#include <string>
-
 class LLSD;
 
 class LLAvatarName
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 549708097ab45b6ce27f25eff9762670adf63fa3..e2677e00c8fcec1279ef57aadf6ee936ec5a590e 100755
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -36,9 +36,6 @@
 
 #include <boost/tokenizer.hpp>
 
-#include <map>
-#include <set>
-
 namespace LLAvatarNameCache
 {
 	use_display_name_signal_t mUseDisplayNamesSignal;
diff --git a/indra/llmessage/llcircuit.h b/indra/llmessage/llcircuit.h
index e0c055592516b282dac0e423b984e6afdb9a6434..96aec37084d6953c8e49f48499bbb2aa5e44d08e 100755
--- a/indra/llmessage/llcircuit.h
+++ b/indra/llmessage/llcircuit.h
@@ -28,9 +28,6 @@
 #ifndef LL_LLCIRCUIT_H
 #define LL_LLCIRCUIT_H
 
-#include <map>
-#include <vector>
-
 #include "llerror.h"
 
 #include "lltimer.h"
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index 5fa1216017901c00a4a2549c70810fac0044e95a..d09f36b40b74f25aecebbb807137d08a3c85745d 100755
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -32,8 +32,6 @@
 #include "linden_common.h"
 
 #include <sstream>
-#include <string>
-#include <vector>
 
 #include <boost/intrusive_ptr.hpp>
 #include <curl/curl.h> // TODO: remove dependency
diff --git a/indra/llmessage/lldispatcher.h b/indra/llmessage/lldispatcher.h
index 9d1751f588cb646867fa743c45df031136092b11..473f600195ddf45316d99ea6c88524351e674a79 100755
--- a/indra/llmessage/lldispatcher.h
+++ b/indra/llmessage/lldispatcher.h
@@ -27,10 +27,6 @@
 #ifndef LL_LLDISPATCHER_H
 #define LL_LLDISPATCHER_H
 
-#include <map>
-#include <vector>
-#include <string>
-
 class LLDispatcher;
 class LLMessageSystem;
 class LLUUID;
diff --git a/indra/llmessage/llhost.h b/indra/llmessage/llhost.h
index 0cf52a4151c7af4f517cf63161d95180e0da7aba..96a95bff05dfedecc32f3a7201b20efd01753778 100755
--- a/indra/llmessage/llhost.h
+++ b/indra/llmessage/llhost.h
@@ -29,7 +29,6 @@
 #define LL_LLHOST_H
 
 #include <iostream>
-#include <string>
 
 #include "net.h"
 
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index b9da02cbd7f0cb99a5f4058e003a6c594a35c93c..24223bdc142b13c2495ecc3f87c384e3d3273e2d 100755
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -31,8 +31,6 @@
  * These classes represent the HTTP client framework.
  */
 
-#include <string>
-
 #include <boost/intrusive_ptr.hpp>
 #include <openssl/x509_vfy.h>
 #include "llurlrequest.h"
diff --git a/indra/llmessage/llhttpclientinterface.h b/indra/llmessage/llhttpclientinterface.h
index 12a3857a61d4fa2bbec60779384a092a815dd1ac..bcc73f20dd46edac7f6d1e5724bc56368f238c7a 100755
--- a/indra/llmessage/llhttpclientinterface.h
+++ b/indra/llmessage/llhttpclientinterface.h
@@ -30,8 +30,6 @@
 #include "linden_common.h"
 #include "llcurl.h"
 
-#include <string>
-
 class LLHTTPClientInterface
 {
 public:
diff --git a/indra/llmessage/llhttpsender.cpp b/indra/llmessage/llhttpsender.cpp
index 5363088d794cc80062d6eca530373ad78d11b6b9..0522c55c1d2e3bdee4ff92550b1b999e345e458e 100755
--- a/indra/llmessage/llhttpsender.cpp
+++ b/indra/llmessage/llhttpsender.cpp
@@ -28,9 +28,6 @@
 
 #include "llhttpsender.h"
 
-#include <map>
-#include <sstream>
-
 #include "llhost.h"
 #include "llsd.h"
 
diff --git a/indra/llmessage/llmail.cpp b/indra/llmessage/llmail.cpp
index 77f8bb7da6b4f10b02642fad1a0c7ab1e2554996..0f6b9d9fa9be95adb77866d7b0d78eb462e3252f 100755
--- a/indra/llmessage/llmail.cpp
+++ b/indra/llmessage/llmail.cpp
@@ -30,7 +30,6 @@
 
 // APR on Windows needs full windows headers
 #include "llwin32headers.h"
-#include <string>
 #include <sstream>
 
 #include "apr_pools.h"
diff --git a/indra/llmessage/llmessagebuilder.h b/indra/llmessage/llmessagebuilder.h
index bf5be929f233be1270f0e66bb5602478ed517dfa..8abcd94bd15dcd734d67089bce19c72c1c5fd8f0 100755
--- a/indra/llmessage/llmessagebuilder.h
+++ b/indra/llmessage/llmessagebuilder.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLMESSAGEBUILDER_H
 #define LL_LLMESSAGEBUILDER_H
 
-#include <string>
-
 #include "stdtypes.h"
 
 class LLMsgData;
diff --git a/indra/llmessage/llmessageconfig.h b/indra/llmessage/llmessageconfig.h
index 0f6075e172476dc6096861a3839ed80fb755a498..19f17ba9a8618b350cc3ae86377f06519a849e35 100755
--- a/indra/llmessage/llmessageconfig.h
+++ b/indra/llmessage/llmessageconfig.h
@@ -27,7 +27,6 @@
 #ifndef LL_MESSAGECONFIG_H
 #define LL_MESSAGECONFIG_H
 
-#include <string>
 #include "llsd.h"
 #include "llfile.h"
 #include "lllivefile.h"
diff --git a/indra/llmessage/llmessagetemplateparser.h b/indra/llmessage/llmessagetemplateparser.h
index 372a2b292d9e15e6ac4b96e639388d6af7ac48c7..98319afa0c74975bcf3509dd51ea44d47f8027fb 100755
--- a/indra/llmessage/llmessagetemplateparser.h
+++ b/indra/llmessage/llmessagetemplateparser.h
@@ -27,7 +27,6 @@
 #ifndef LL_MESSAGETEMPLATEPARSER_H
 #define LL_MESSAGETEMPLATEPARSER_H
 
-#include <string>
 #include "llmessagetemplate.h"
 
 class LLTemplateTokenizer
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
index 0eb39e154538fedbe43e0f27b3040d0779d41f3a..476a765f6066bcd0bb9993f6fd683cd8b709301f 100755
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -28,7 +28,6 @@
 
 #include "llproxy.h"
 
-#include <string>
 #include <curl/curl.h>
 
 #include "llapr.h"
diff --git a/indra/llmessage/llproxy.h b/indra/llmessage/llproxy.h
index a9193705404ace5c51168c261d5c9a35bb951f5a..9e8971491a1a91b0aeaddb46d4a363679debfc28 100755
--- a/indra/llmessage/llproxy.h
+++ b/indra/llmessage/llproxy.h
@@ -33,7 +33,6 @@
 #include "llmemory.h"
 #include "llsingleton.h"
 #include "llthread.h"
-#include <string>
 
 // SOCKS error codes returned from the StartProxy method
 #define SOCKS_OK 0
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp
index 2885ed99d222920464b542ea91ac60707a97228f..48653d2af3815c8c11c674cc33d4d33b6230dcc9 100755
--- a/indra/llmessage/llpumpio.cpp
+++ b/indra/llmessage/llpumpio.cpp
@@ -29,8 +29,6 @@
 #include "linden_common.h"
 #include "llpumpio.h"
 
-#include <map>
-#include <set>
 #include "apr_poll.h"
 
 #include "llapr.h"
diff --git a/indra/llmessage/llsdmessage.h b/indra/llmessage/llsdmessage.h
index e5d532d6a42c100823a36bd36d617e9e01f894f0..a3bd0ff20a35b8cb432a245dd35628b4d4214106 100755
--- a/indra/llmessage/llsdmessage.h
+++ b/indra/llmessage/llsdmessage.h
@@ -33,7 +33,6 @@
 #include "llerror.h"                // LOG_CLASS()
 #include "llevents.h"               // LLEventPumps
 #include "llhttpclient.h"
-#include <string>
 #include <stdexcept>
 
 class LLSD;
diff --git a/indra/llmessage/llsdmessagebuilder.h b/indra/llmessage/llsdmessagebuilder.h
index 9c7c1bfde3588f8508ba974a66ee4ae61e45d5a5..d21f0b78de62028aea7c03502118ec8ab3e8d662 100755
--- a/indra/llmessage/llsdmessagebuilder.h
+++ b/indra/llmessage/llsdmessagebuilder.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLSDMESSAGEBUILDER_H
 #define LL_LLSDMESSAGEBUILDER_H
 
-#include <map>
-
 #include "llmessagebuilder.h"
 #include "llmsgvariabletype.h"
 #include "llsd.h"
diff --git a/indra/llmessage/llsdmessagereader.h b/indra/llmessage/llsdmessagereader.h
index 3b3d7fbfbe7957867a3d22c8a81a46416fd35429..cf0c3d5e4ef00ce5ce5afbf26eda034709c72444 100755
--- a/indra/llmessage/llsdmessagereader.h
+++ b/indra/llmessage/llsdmessagereader.h
@@ -30,8 +30,6 @@
 #include "llmessagereader.h"
 #include "llsd.h"
 
-#include <map>
-
 class LLMessageTemplate;
 class LLMsgData;
 
diff --git a/indra/llmessage/llsdrpcserver.h b/indra/llmessage/llsdrpcserver.h
index 415bd31c26e11f0412cc5565a11c6731c6c84a9a..ed76a7748d79b032bc0e5ac9ccc37d4ca3ed3cd3 100755
--- a/indra/llmessage/llsdrpcserver.h
+++ b/indra/llmessage/llsdrpcserver.h
@@ -64,7 +64,6 @@
  * methods below to help.
  */
 
-#include <map>
 #include "lliopipe.h"
 #include "lliohttpserver.h"
 #include "llfiltersd2xmlrpc.h"
diff --git a/indra/llmessage/llservice.h b/indra/llmessage/llservice.h
index 9c09aeb44ca42bf5408391a12c488f8c4ffcb135..f70b06c36e4b3fc81ad02a3a3db78a9d1ca62540 100755
--- a/indra/llmessage/llservice.h
+++ b/indra/llmessage/llservice.h
@@ -29,12 +29,6 @@
 #ifndef LL_LLSERVICE_H
 #define LL_LLSERVICE_H
 
-#include <string>
-#include <map>
-//#include <boost/intrusive_ptr.hpp>
-//#include <boost/shared_ptr.hpp>
-
-//#include "llframetimer.h"
 #include "lliopipe.h"
 #include "llchainio.h"
 
diff --git a/indra/llmessage/llservicebuilder.h b/indra/llmessage/llservicebuilder.h
index 968995edf2739e926fedc95d3270081380d4a099..4a82562e545c5d2e6f0b8ae119e2837e5641d3b0 100755
--- a/indra/llmessage/llservicebuilder.h
+++ b/indra/llmessage/llservicebuilder.h
@@ -27,8 +27,6 @@
 #ifndef LLSERVICEBUILDER_H
 #define LLSERVICEBUILDER_H
 
-#include <string>
-#include <map>
 #include "llerror.h"
 
 class LLSD;
diff --git a/indra/llmessage/llstoredmessage.h b/indra/llmessage/llstoredmessage.h
index 9c98e2c558ab5c12c8546d7e62ebefaf13b65423..1d4bf618b4c3d52d6bc20e0b5b08935d4bdfc792 100755
--- a/indra/llmessage/llstoredmessage.h
+++ b/indra/llmessage/llstoredmessage.h
@@ -30,7 +30,6 @@
 #include "linden_common.h"
 #include "llsd.h"
 #include <boost/shared_ptr.hpp>
-#include <string>
 
 
 class LLMessageSystem;
diff --git a/indra/llmessage/lltemplatemessagebuilder.h b/indra/llmessage/lltemplatemessagebuilder.h
index 4f614a4657555c81c6f668388d4f0710eb4b78e0..6ff39d6851d85933e4e3a8b77ee050728ce5e62d 100755
--- a/indra/llmessage/lltemplatemessagebuilder.h
+++ b/indra/llmessage/lltemplatemessagebuilder.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLTEMPLATEMESSAGEBUILDER_H
 #define LL_LLTEMPLATEMESSAGEBUILDER_H
 
-#include <map>
-
 #include "llmessagebuilder.h"
 #include "llmsgvariabletype.h"
 
diff --git a/indra/llmessage/lltemplatemessagereader.h b/indra/llmessage/lltemplatemessagereader.h
index 59cb4ae437d0e86c58e6da533dd1a369ff07475d..49da2a33f9c6ebc5a789a860dde22836bebc5f3b 100755
--- a/indra/llmessage/lltemplatemessagereader.h
+++ b/indra/llmessage/lltemplatemessagereader.h
@@ -29,8 +29,6 @@
 
 #include "llmessagereader.h"
 
-#include <map>
-
 class LLMessageTemplate;
 class LLMsgData;
 
diff --git a/indra/llmessage/lltransfermanager.h b/indra/llmessage/lltransfermanager.h
index 6aad153c24c893c2578359f65749623c9a76181a..4eb9fef864530427ed8015ca2ea0da975224632b 100755
--- a/indra/llmessage/lltransfermanager.h
+++ b/indra/llmessage/lltransfermanager.h
@@ -28,9 +28,6 @@
 #ifndef LL_LLTRANSFERMANAGER_H
 #define LL_LLTRANSFERMANAGER_H
 
-#include <map>
-#include <list>
-
 #include "llhost.h"
 #include "lluuid.h"
 #include "llthrottle.h"
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index 88fccd4bf693c8d93e515e036be9327bf0a931f2..1fcb8eb226a36409d24dc82dd1c283619a9165ac 100755
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -34,7 +34,6 @@
  * url based client requests. 
  */
 
-#include <string>
 #include "lliopipe.h"
 #include "llchainio.h"
 #include "llerror.h"
diff --git a/indra/llmessage/lluseroperation.h b/indra/llmessage/lluseroperation.h
index 7db5f0b27f4c418fbe5051c6efe7f0a59499c2f8..2e8a7e504e28602a0545906ebb66bbcebc5f5439 100755
--- a/indra/llmessage/lluseroperation.h
+++ b/indra/llmessage/lluseroperation.h
@@ -31,8 +31,6 @@
 #include "lluuid.h"
 #include "llframetimer.h"
 
-#include <map>
-
 class LLUserOperation
 {
 public:
diff --git a/indra/llplugin/llplugincookiestore.h b/indra/llplugin/llplugincookiestore.h
index a2fdeab64754a45a68f07570a66ebd0070cd03e2..205627392b6b699b11398b09721942c1144f1c20 100755
--- a/indra/llplugin/llplugincookiestore.h
+++ b/indra/llplugin/llplugincookiestore.h
@@ -30,8 +30,6 @@
 #define LL_LLPLUGINCOOKIESTORE_H
 
 #include "lldate.h"
-#include <map>
-#include <string>
 #include <iostream>
 
 class LLPluginCookieStore
diff --git a/indra/llprimitive/llmaterialid.cpp b/indra/llprimitive/llmaterialid.cpp
index 820f62c43ce04941c51f5ab28b208d99f1fcdec0..6fcf5a03547d571b34fb1bce65be9b4972139df1 100644
--- a/indra/llprimitive/llmaterialid.cpp
+++ b/indra/llprimitive/llmaterialid.cpp
@@ -29,8 +29,6 @@
 
 #include "llmaterialid.h"
 
-#include <string>
-
 #include "llformat.h"
 
 const LLMaterialID LLMaterialID::null;
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h
index b4c82d3b7b7fc0c21d0a8f9d1f265539c7852877..289a458f17a15f9b548cb770dd5a7601a899a8d7 100644
--- a/indra/llprimitive/llmaterialid.h
+++ b/indra/llprimitive/llmaterialid.h
@@ -29,7 +29,6 @@
 
 #define MATERIAL_ID_SIZE 16
 
-#include <string>
 #include "llsd.h"
 
 class LLMaterialID
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index dac0c7af693417d995539584a7007e46c8265470..ce798b5ee913148bea85f0773191506b0c87260f 100755
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -29,7 +29,6 @@
 
 // This file contains various stuff for handling gl extensions and other gl related stuff.
 
-#include <string>
 #include <boost/unordered_map.hpp>
 #include <list>
 
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h
index bdfc632831b99459c85ddcc0fe12630f89e7178c..6103ff57e3d2c7694245432a0ec47dbd370328e9 100755
--- a/indra/llrender/llpostprocess.h
+++ b/indra/llrender/llpostprocess.h
@@ -27,8 +27,6 @@
 #ifndef LL_POSTPROCESS_H
 #define LL_POSTPROCESS_H
 
-#include <map>
-#include <fstream>
 #include "llgl.h"
 #include "llglheaders.h"
 #include "llstaticstringtable.h"
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
index 1fe64c472edea53d99b2a7e8385c266e57a5ec5c..0dedef25713e392a785c5099379cad7eaba4ed10 100755
--- a/indra/llui/llaccordionctrl.h
+++ b/indra/llui/llaccordionctrl.h
@@ -31,10 +31,6 @@
 #include "lltextbox.h"
 #include "llscrollbar.h"
 
-#include <vector>
-#include <algorithm>
-#include <string>
-
 class LLAccordionCtrlTab;
 
 class LLAccordionCtrl: public LLPanel
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 7a78700e0f21aa89df82e70f076df6e5c57e7893..7110787013f6368ccd039c348a8676c903ffe515 100755
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -27,7 +27,6 @@
 #ifndef LL_ACCORDIONCTRLTAB_H_
 #define LL_ACCORDIONCTRLTAB_H_
 
-#include <string>
 #include "llrect.h"
 #include "lluictrl.h"
 #include "lluicolor.h"
diff --git a/indra/llui/llcallbackmap.h b/indra/llui/llcallbackmap.h
index 0a10877c092c6cb69f0df16fe43c99f2c8d28f1c..ebd7440c6b1e71fca16e409c6d5ac4ecd070dafe 100755
--- a/indra/llui/llcallbackmap.h
+++ b/indra/llui/llcallbackmap.h
@@ -27,8 +27,6 @@
 #ifndef LLCALLBACKMAP_H
 #define LLCALLBACKMAP_H
 
-#include <map>
-#include <string>
 #include <boost/function.hpp>
 
 class LLCallbackMap
diff --git a/indra/llui/llfloaterreglistener.h b/indra/llui/llfloaterreglistener.h
index 24311a2dfa2610797e63570640b80483bb05a6fe..95eb1c8abfc9951eca663fc292830a52952f6a26 100755
--- a/indra/llui/llfloaterreglistener.h
+++ b/indra/llui/llfloaterreglistener.h
@@ -30,7 +30,6 @@
 #define LL_LLFLOATERREGLISTENER_H
 
 #include "lleventapi.h"
-#include <string>
 
 class LLSD;
 
diff --git a/indra/llui/llfunctorregistry.h b/indra/llui/llfunctorregistry.h
index f5364f48636d12c81e7e9fe46e6052a5fcc2ffa5..3ef0b22420cbddae569592218608110c90439c89 100755
--- a/indra/llui/llfunctorregistry.h
+++ b/indra/llui/llfunctorregistry.h
@@ -28,9 +28,6 @@
 #ifndef LL_LLFUNCTORREGISTRY_H
 #define LL_LLFUNCTORREGISTRY_H
 
-#include <string>
-#include <map>
-
 #include <boost/function.hpp>
 
 #include "llsd.h"
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index 18e2ed06c53e6a4be87d08a5201ec6cb67002b08..b603191b70a7501be208e4f70431f1af0fbd933f 100755
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -32,9 +32,6 @@
 #include "llstring.h"
 #include "v3color.h"
 #include "v4color.h"
-#include <map>
-#include <list>
-#include <deque>
 #include "llpointer.h"
 
 class LLTextSegment;
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 8e8c7e14fcc88ac4ac8a953fa361a0bc8ad7306b..0aacaddb4632e6b64e273bda4ba98561ffac500d 100755
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -75,13 +75,7 @@
  *
  */
 
-#include <string>
-#include <list>
-#include <vector>
-#include <map>
-#include <set>
 #include <iomanip>
-#include <sstream>
 
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/indra/llui/llnotificationslistener.h b/indra/llui/llnotificationslistener.h
index f9f7641de6c5fb1f8d4d7073a435d73d7348fc5b..a5e54fa1f53b0641942a7388f2aaa2f45b1e9e6f 100644
--- a/indra/llui/llnotificationslistener.h
+++ b/indra/llui/llnotificationslistener.h
@@ -32,8 +32,6 @@
 #include "lleventapi.h"
 #include "llnotificationptr.h"
 #include <boost/shared_ptr.hpp>
-#include <map>
-#include <string>
 
 class LLNotifications;
 class LLSD;
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index a61e74390917daffd02ffc79d1c303c79119da41..e776b1f67a08da3ad89b45091e27b97f700fb88d 100755
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -35,8 +35,6 @@
 #include "llkeywords.h"
 #include "llpanel.h"
 
-#include <string>
-#include <vector>
 #include <set>
 
 #include <boost/signals2.hpp>
diff --git a/indra/llui/lltrans.cpp b/indra/llui/lltrans.cpp
index 4d4ff4236d37e40439dea09c64382b0ead823821..676bff4648647badd430d8029023b9f4ffca9034 100755
--- a/indra/llui/lltrans.cpp
+++ b/indra/llui/lltrans.cpp
@@ -33,8 +33,6 @@
 #include "llsd.h"
 #include "llxmlnode.h"
 
-#include <map>
-
 LLTrans::template_map_t LLTrans::sStringTemplates;
 LLStringUtil::format_map_t LLTrans::sDefaultArgs;
 
diff --git a/indra/llui/lltrans.h b/indra/llui/lltrans.h
index a47ce94f080658d5d0b0ce4cfe8123c6f274f820..0892b880c33f35e5f522cf8aa27846e831a49ce0 100755
--- a/indra/llui/lltrans.h
+++ b/indra/llui/lltrans.h
@@ -27,11 +27,9 @@
 #ifndef LL_TRANS_H
 #define LL_TRANS_H
 
-#include <map>
-#include <set>
-
 #include "llpointer.h"
 #include "llstring.h"
+#include <set>
 
 class LLXMLNode;
 
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index aabc7ed2e423b61fc6cbff0a63b7f5cfeb4fd121..a55d85c465c3aac0d52f0ce3cd03ddc79f6f62d0 100755
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -28,9 +28,6 @@
 
 #include "linden_common.h"
 
-#include <string>
-#include <map>
-
 // Linden library includes
 #include "v2math.h"
 #include "m3math.h"
diff --git a/indra/llui/lluicolortable.h b/indra/llui/lluicolortable.h
index c7dc4b04cfe8f14d322100d7d5527bd257a988f3..33d737ee02c30e1db4eca9a9b2a56c0bd210cc22 100755
--- a/indra/llui/lluicolortable.h
+++ b/indra/llui/lluicolortable.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLUICOLORTABLE_H_
 #define LL_LLUICOLORTABLE_H_
 
-#include <map>
 #include <boost/unordered_map.hpp>
 
 #include "llinitparam.h"
diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h
index 07e02de6d857acbd31632a6d038d3c28e6e7a097..32ccb40e7ce1c01907954e6f6520f44322184280 100755
--- a/indra/llui/lluistring.h
+++ b/indra/llui/lluistring.h
@@ -29,7 +29,6 @@
 #define LL_LLUISTRING_H
 
 #include "llstring.h"
-#include <string>
 
 // Use this class to store translated text that may have arguments
 // e.g. "Welcome [USERNAME] to [SECONDLIFE]!"
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h
index 5f3626490cabfe6d58e586752ac2c9493f832c69..6e279bb2de8d724669a055969047be19b175ea5b 100755
--- a/indra/llui/llurlaction.h
+++ b/indra/llui/llurlaction.h
@@ -28,7 +28,6 @@
 #ifndef LL_LLURLACTION_H
 #define LL_LLURLACTION_H
 
-#include <string>
 #include <boost/function.hpp>
 
 ///
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index b4fae044bd541082dca35774816caf8446088d74..5d70fd823ae9f1fc5dbb83a408600d5135ca2643 100755
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -37,8 +37,6 @@
 
 #include <boost/signals2.hpp>
 #include <boost/regex.hpp>
-#include <string>
-#include <map>
 
 class LLAvatarName;
 
diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h
index ff699902caa97d8a04d066ba21d91222af32deb3..5a6b57a07443c810ef0cebfae95578d5c94b25e2 100755
--- a/indra/llui/llurlmatch.h
+++ b/indra/llui/llurlmatch.h
@@ -30,8 +30,6 @@
 
 //#include "linden_common.h"
 
-#include <string>
-#include <vector>
 #include "llstyle.h"
 
 ///
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h
index 5ce4048d5d66a647ad712aabdc82fe1801a8d585..90099c6d1ab3d4b25f08c1ff622021e8cf0905da 100755
--- a/indra/llui/llurlregistry.h
+++ b/indra/llui/llurlregistry.h
@@ -33,9 +33,6 @@
 #include "llsingleton.h"
 #include "llstring.h"
 
-#include <string>
-#include <vector>
-
 /// This default callback for findUrl() simply ignores any label updates
 void LLUrlRegistryNullCallback(const std::string &url,
 							   const std::string &label,
diff --git a/indra/llui/llviewinject.h b/indra/llui/llviewinject.h
index 0de3d155c41ba819b491ac4d93e1ed894e587c04..3afb14282ee82acd4bd9ac8c89ea73d620db20dc 100755
--- a/indra/llui/llviewinject.h
+++ b/indra/llui/llviewinject.h
@@ -13,7 +13,6 @@
 #define LL_LLVIEWINJECT_H
 
 #include "llview.h"
-#include <map>
 
 namespace llview
 {
diff --git a/indra/llui/llviewmodel.h b/indra/llui/llviewmodel.h
index 49d7c322a3d5f99f420a7856ab0e87acbefb1823..2592b229e9b364e5808fb3eff535a4f5d0f7ba85 100755
--- a/indra/llui/llviewmodel.h
+++ b/indra/llui/llviewmodel.h
@@ -40,7 +40,6 @@
 #include "llstring.h"
 #include "lltrace.h"
 #include "llui.h"
-#include <string>
 
 class LLScrollListItem;
 
diff --git a/indra/llvfs/lllfsthread.h b/indra/llvfs/lllfsthread.h
index cdb5c759465495390d6ed38205a04771286f016a..5292110af7c4ffd19e8983955234a44d6d7733ee 100755
--- a/indra/llvfs/lllfsthread.h
+++ b/indra/llvfs/lllfsthread.h
@@ -27,11 +27,6 @@
 #ifndef LL_LLLFSTHREAD_H
 #define LL_LLLFSTHREAD_H
 
-#include <queue>
-#include <string>
-#include <map>
-#include <set>
-
 #include "llapr.h"
 #include "llpointer.h"
 #include "llqueuedthread.h"
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp
index 07bf844d43aec18b9aa39e7c8f35bbcf6e7fef85..2b5f52d5cc43f3921fe7b1a7aaad1da613ba83f6 100755
--- a/indra/llvfs/llvfs.cpp
+++ b/indra/llvfs/llvfs.cpp
@@ -29,8 +29,6 @@
 #include "llvfs.h"
 
 #include <sys/stat.h>
-#include <set>
-#include <map>
 #if LL_WINDOWS
 #include <share.h>
 #else
diff --git a/indra/llvfs/llvfsthread.h b/indra/llvfs/llvfsthread.h
index 95f3c857c6ffb3557418d1bf98aca662938243e3..52dad45f5c20e56e6dea8b85267401e65b36c4f9 100755
--- a/indra/llvfs/llvfsthread.h
+++ b/indra/llvfs/llvfsthread.h
@@ -27,11 +27,6 @@
 #ifndef LL_LLVFSTHREAD_H
 #define LL_LLVFSTHREAD_H
 
-#include <queue>
-#include <string>
-#include <map>
-#include <set>
-
 #include "llapr.h"
 
 #include "llqueuedthread.h"
diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h
index 6f2dc87317a0ed62768475182883efd347b0c625..a40978c425f4965c848be3ce5936825762529427 100755
--- a/indra/llwindow/llkeyboard.h
+++ b/indra/llwindow/llkeyboard.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLKEYBOARD_H
 #define LL_LLKEYBOARD_H
 
-#include <map>
 #include <boost/function.hpp>
 
 #include "llstringtable.h"
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 9b1f49cd1ff8f57e1716845712119eabaae960e7..319e819ba682a843d497f7547aa374ea2d860874 100755
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -28,7 +28,6 @@
 #include "linden_common.h"
 
 #include <iostream>
-#include <map>
 
 #include "llxmlnode.h"
 
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index 0b8da5dc5def14a10bba0da520f1cc861b3a9ebb..b8a977f362799207270626c6f72f0cd64d7e8b80 100755
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -35,7 +35,6 @@
 #else
 #include "expat/expat.h"
 #endif
-#include <map>
 
 #include "indra_constants.h"
 #include "llrefcount.h"
diff --git a/indra/llxml/llxmltree.h b/indra/llxml/llxmltree.h
index a82fee041612a1697289d3c1b0b868f717dfd243..9347d645f4abe3a074e7e5a93afbdf794f7a14cd 100755
--- a/indra/llxml/llxmltree.h
+++ b/indra/llxml/llxmltree.h
@@ -28,8 +28,6 @@
 #ifndef LL_LLXMLTREE_H
 #define LL_LLXMLTREE_H
 
-#include <map>
-#include <list>
 #include "llstring.h"
 #include "llxmlparser.h"
 #include "llstringtable.h"
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index bb483fb1335fac2606b5ac4f5d96041308d9a35e..754f71cbd231cf8ef877f0d295d753c6a1f0af24 100755
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -28,9 +28,6 @@
 #define LL_LLAISAPI_H
 
 #include "lluuid.h"
-#include <map>
-#include <set>
-#include <string>
 #include "llcurl.h"
 #include "llhttpclient.h"
 #include "llhttpretrypolicy.h"
diff --git a/indra/newview/llassetuploadqueue.h b/indra/newview/llassetuploadqueue.h
index 2ceee8f7008f9f15998fafac044f752bf3227485..25e7a18ceee5e515fb5cfa0e0507be0f1835df84 100755
--- a/indra/newview/llassetuploadqueue.h
+++ b/indra/newview/llassetuploadqueue.h
@@ -29,9 +29,6 @@
 
 #include "lluuid.h"
 
-#include <string>
-#include <deque>
-
 class LLAssetUploadQueueSupplier;
 
 class LLAssetUploadQueue
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index 816caaeda6bda688e05a3bdf01b85ddd548b5363..a6174cf8ea2d3ff3b89582b792b0bc41c287cd31 100755
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -30,9 +30,6 @@
 #include "llsd.h"
 #include "lluuid.h"
 
-#include <string>
-#include <vector>
-
 class LLAvatarName;
 class LLInventoryPanel;
 class LLFloater;
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
index fbb7626a8c94a2bf5c88712c096817d7f038f3d7..c01d59e57c213d7802ab1ed4a43db73663f9a904 100755
--- a/indra/newview/llavatarpropertiesprocessor.h
+++ b/indra/newview/llavatarpropertiesprocessor.h
@@ -30,8 +30,6 @@
 #include "lluuid.h"
 #include "llsingleton.h"
 #include "v3dmath.h"	// LLVector3d
-#include <list>
-#include <map>
 
 // For Flags in AvatarPropertiesReply
 const U32 AVATAR_ALLOW_PUBLISH			= 0x1 << 0;	// whether profile is externally visible or not
diff --git a/indra/newview/llcallingcard.h b/indra/newview/llcallingcard.h
index 609cfc3d9073b4ab33884668aa633f9db583c3fe..6c8ce65248db7382b5cc29b14ff24f9065d2b2ad 100755
--- a/indra/newview/llcallingcard.h
+++ b/indra/newview/llcallingcard.h
@@ -27,10 +27,6 @@
 #ifndef LL_LLCALLINGCARD_H
 #define LL_LLCALLINGCARD_H
 
-#include <map>
-#include <set>
-#include <string>
-#include <vector>
 #include "lluserrelations.h"
 #include "lluuid.h"
 #include "v3dmath.h"
diff --git a/indra/newview/llcapabilitylistener.cpp b/indra/newview/llcapabilitylistener.cpp
index ef9b910ae5fcf1dfe0b553f95bddd145ce08b047..5ea3032e3dfda98ef9427ab2a8f4cd5189779271 100755
--- a/indra/newview/llcapabilitylistener.cpp
+++ b/indra/newview/llcapabilitylistener.cpp
@@ -30,9 +30,6 @@
 #include "llviewerprecompiledheaders.h"
 // associated header
 #include "llcapabilitylistener.h"
-// STL headers
-#include <map>
-// std headers
 // external library headers
 #include <boost/bind.hpp>
 // other Linden headers
diff --git a/indra/newview/llcapabilityprovider.h b/indra/newview/llcapabilityprovider.h
index 9d912455977289d779a4a2ba27cbe26a478a2e02..b692d03848358e6d75fb76c6eb3f08692f232a00 100755
--- a/indra/newview/llcapabilityprovider.h
+++ b/indra/newview/llcapabilityprovider.h
@@ -31,7 +31,6 @@
 #define LL_LLCAPABILITYPROVIDER_H
 
 #include "llhost.h"
-#include <string>
 
 /// Interface for obtaining a capability URL, given a capability name
 class LLCapabilityProvider
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index a5de8a53271dc434fa5cae04ad7ee59d1ce47705..efa7b67738a657c61a92dd6e5934137a50bffe10 100755
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -32,7 +32,6 @@
 
 #include "lluuid.h"
 
-#include <map>
 #include <boost/shared_ptr.hpp>
 
 namespace LLNotificationsUI
diff --git a/indra/newview/llclassifiedinfo.h b/indra/newview/llclassifiedinfo.h
index 3ff793b1682861a262b62e39f26146f438a04f8d..79ff238518e4b07564e5a87b2eba711c30d44fcc 100755
--- a/indra/newview/llclassifiedinfo.h
+++ b/indra/newview/llclassifiedinfo.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLCLASSIFIEDINFO_H
 #define LL_LLCLASSIFIEDINFO_H
 
-#include <map>
-
 #include "v3dmath.h"
 #include "lluuid.h"
 
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp
index 851fa14de1c21d14dd235be082803105e0759d8a..05f99d7737ea241d763ef24d817285302ba86d35 100755
--- a/indra/newview/llcommandlineparser.cpp
+++ b/indra/newview/llcommandlineparser.cpp
@@ -35,9 +35,6 @@
 #include "llsdserialize.h"
 #include "llerror.h"
 #include "stringize.h"
-#include <string>
-#include <set>
-#include <iostream>
 #include <sstream>
 #include <typeinfo>
 
diff --git a/indra/newview/llcommunicationchannel.cpp b/indra/newview/llcommunicationchannel.cpp
index cf98b56b4c6e67c7e4cf917bed3e2a6ca071fda5..9b523ace0fdc79182c48c827a164659a622d0ede 100755
--- a/indra/newview/llcommunicationchannel.cpp
+++ b/indra/newview/llcommunicationchannel.cpp
@@ -29,9 +29,6 @@
 
 #include "llcommunicationchannel.h"
 
-#include <string>
-#include <map>
-
 #include "llagent.h"
 #include "lldate.h"
 #include "llnotifications.h"
diff --git a/indra/newview/llcommunicationchannel.h b/indra/newview/llcommunicationchannel.h
index 0d8f7f4387516a084aa23971833643b0d2ee3372..573ab80eef131028157fd0104468352beff94d28 100755
--- a/indra/newview/llcommunicationchannel.h
+++ b/indra/newview/llcommunicationchannel.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLCOMMUNICATIONCHANNEL_H
 #define LL_LLCOMMUNICATIONCHANNEL_H
 
-#include <string>
-#include <map>
-
 #include "lldate.h"
 #include "llerror.h"
 #include "llnotifications.h"
diff --git a/indra/newview/lldaycyclemanager.h b/indra/newview/lldaycyclemanager.h
index 3d2144960da160d3429ec6b039f7db70f554911a..5077e4bb6b24b7f1c0afbc18f2fff930c7b108d9 100755
--- a/indra/newview/lldaycyclemanager.h
+++ b/indra/newview/lldaycyclemanager.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLDAYCYCLEMANAGER_H
 #define LL_LLDAYCYCLEMANAGER_H
 
-#include <map>
-#include <string>
-
 #include "llwldaycycle.h"
 #include "llwlparammanager.h"
 
diff --git a/indra/newview/lldebugmessagebox.h b/indra/newview/lldebugmessagebox.h
index 87a0910662aa119a456424f2f6b1aa2f5b774c8c..62c19cc1d7bbb849ec7c60c8b7f5f75369d41386 100755
--- a/indra/newview/lldebugmessagebox.h
+++ b/indra/newview/lldebugmessagebox.h
@@ -33,8 +33,6 @@
 #include "lltextbox.h"
 #include "llstring.h"
 #include "llframetimer.h"
-#include <vector>
-#include <map>
 
 class LLSliderCtrl;
 
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index a3461d4c01141327750be99f5551aea3055bb732..e279f863a766bdb4cfb3b209ad49f8d41bdf8093 100755
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -27,9 +27,6 @@
 #ifndef LL_DRAWABLE_H
 #define LL_DRAWABLE_H
 
-#include <vector>
-#include <map>
-
 #include "v2math.h"
 #include "v3math.h"
 #include "v4math.h"
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
index 64ef260c14e1f9c59cd1a83213da4b676475ddaa..c4322917c45693aa8571c39a94cbc90c60c8a4a4 100755
--- a/indra/newview/llfeaturemanager.h
+++ b/indra/newview/llfeaturemanager.h
@@ -31,7 +31,6 @@
 
 #include "llsingleton.h"
 #include "llstring.h"
-#include <map>
 
 typedef enum EGPUClass
 {
diff --git a/indra/newview/llfloatergroups.h b/indra/newview/llfloatergroups.h
index 1ad27cea19f300d41221ad7a614c706101d873e8..ab58208985d9f15c92e68d19b7abde2756fedfa3 100755
--- a/indra/newview/llfloatergroups.h
+++ b/indra/newview/llfloatergroups.h
@@ -40,7 +40,6 @@
 
 #include "lluuid.h"
 #include "llfloater.h"
-#include <map>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h
index 3d4648fdc16b3ae3fab4b18a1505010d82d79c5d..1036143935da43a43b7389f8aa79bedd733443ae 100755
--- a/indra/newview/llfloaterimcontainer.h
+++ b/indra/newview/llfloaterimcontainer.h
@@ -27,16 +27,15 @@
 #ifndef LL_LLFLOATERIMCONTAINER_H
 #define LL_LLFLOATERIMCONTAINER_H
 
-#include <map>
-#include <vector>
-
+// LLUI
+#include "lltrans.h"
+#include "llfloater.h"
+#include "llmultifloater.h"
+// newview
 #include "llimview.h"
 #include "llevents.h"
-#include "../llui/llfloater.h"
-#include "../llui/llmultifloater.h"
 #include "llavatarpropertiesprocessor.h"
 #include "llgroupmgr.h"
-#include "../llui/lltrans.h"
 #include "llconversationmodel.h"
 #include "llconversationview.h"
 
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index 87f927ff6533986194368ba787a6837398844146..7c467b754744cfca24f29a3914ef38623fb660a1 100755
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -30,8 +30,6 @@
 
 #include "llfloaterpathfindingcharacters.h"
 
-#include <string>
-
 #include "llcheckboxctrl.h"
 #include "llfloaterreg.h"
 #include "llfloaterpathfindingobjects.h"
diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 1e46d7a402abf1f4ac1104f0ea1ecc733c79b0fd..c3b3cf89f4428c6cf01a4db8d15fe006c77d1389 100755
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -30,8 +30,6 @@
 
 #include "llfloaterpathfindinglinksets.h"
 
-#include <string>
-
 #include <boost/bind.hpp>
 
 #include "llagent.h"
diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h
index 7149da9215f9258a7c48492dce4650f4830f73d9..8346dc81ef2999296a5d0822b19db8474c8efe12 100755
--- a/indra/newview/llfloaterpathfindinglinksets.h
+++ b/indra/newview/llfloaterpathfindinglinksets.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLFLOATERPATHFINDINGLINKSETS_H
 #define LL_LLFLOATERPATHFINDINGLINKSETS_H
 
-#include <string>
-
 #include "llfloaterpathfindingobjects.h"
 #include "llpathfindinglinkset.h"
 #include "llpathfindingobjectlist.h"
diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp
index f6ff83eaf4842c5c9c3eba8f032ac9e745f30b4c..e76978cad97f32877ba7751cf71b458b119fe010 100755
--- a/indra/newview/llfloaterpathfindingobjects.cpp
+++ b/indra/newview/llfloaterpathfindingobjects.cpp
@@ -29,10 +29,6 @@
 
 #include "llfloaterpathfindingobjects.h"
 
-#include <string>
-#include <map>
-#include <vector>
-
 #include <boost/bind.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/indra/newview/llfloaterpathfindingobjects.h b/indra/newview/llfloaterpathfindingobjects.h
index 4024e15fd63ee1a6e25a9203f72acbdbea02cfbe..8bf42f1ca09f48915e6cb5e9ba527d7c17d94a9d 100755
--- a/indra/newview/llfloaterpathfindingobjects.h
+++ b/indra/newview/llfloaterpathfindingobjects.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLFLOATERPATHFINDINGOBJECTS_H
 #define LL_LLFLOATERPATHFINDINGOBJECTS_H
 
-#include <string>
-#include <map>
-
 #include <boost/signals2.hpp>
 
 #include "llagent.h"
diff --git a/indra/newview/llfloaterproperties.h b/indra/newview/llfloaterproperties.h
index aa3fcec3374d99d1ba5de336aaccb7140c3dd3ee..4bd30eab9a502573f359c1329abeeca8a1268ebe 100755
--- a/indra/newview/llfloaterproperties.h
+++ b/indra/newview/llfloaterproperties.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLFLOATERPROPERTIES_H
 #define LL_LLFLOATERPROPERTIES_H
 
-#include <map>
 #include "llmultifloater.h"
 #include "lliconctrl.h"
 
diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h
index 35b268e1b28f0774fdcfde386ea1de0e4db14582..1fb557a2d54638e536cb44a43cfe478eef38aca1 100755
--- a/indra/newview/llfloatersearch.h
+++ b/indra/newview/llfloatersearch.h
@@ -31,8 +31,6 @@
 #include "llfloaterwebcontent.h"
 #include "llviewermediaobserver.h"
 
-#include <string>
-
 class LLMediaCtrl;
 
 ///
diff --git a/indra/newview/llfloaterwebprofile.h b/indra/newview/llfloaterwebprofile.h
index 4c355e401b6d425f8b97fb4929a3e98fab837187..aa780d24957dd77533c80e3939df80fe15b1cf5c 100755
--- a/indra/newview/llfloaterwebprofile.h
+++ b/indra/newview/llfloaterwebprofile.h
@@ -30,8 +30,6 @@
 #include "llfloaterwebcontent.h"
 #include "llviewermediaobserver.h"
 
-#include <string>
-
 class LLMediaCtrl;
 
 /**
diff --git a/indra/newview/llfollowcam.h b/indra/newview/llfollowcam.h
index f4b7b2723a0091ffdd7560722a783060d5268381..de5bde67545f86a64c0eafb169e0e9656f55180a 100755
--- a/indra/newview/llfollowcam.h
+++ b/indra/newview/llfollowcam.h
@@ -46,8 +46,6 @@
 #include "lltimer.h"
 #include "llquaternion.h"
 #include "llcriticaldamp.h"
-#include <map>
-#include <vector>
 
 class LLFollowCamParams
 {
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index 26a5924ec307f4c499ad792586267f890e8b1fe4..db96cbbfb2a2a7ea9634b2ba01eb5cf7465053f0 100755
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -27,10 +27,6 @@
 #ifndef LL_LLGESTUREMGR_H
 #define LL_LLGESTUREMGR_H
 
-#include <map>
-#include <string>
-#include <vector>
-
 #include "llassetstorage.h"	// LLAssetType
 #include "llinventoryobserver.h"
 #include "llsingleton.h"
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index 2e94e8d9a0d359484f6b50658f434ecbc8b828c0..67258a90bb3743bf0f91877e4dc8e27f3168ae1c 100755
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -29,9 +29,6 @@
 
 #include "lluuid.h"
 #include "roles_constants.h"
-#include <vector>
-#include <string>
-#include <map>
 
 // Forward Declarations
 class LLMessageSystem;
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index ac336e347cca2f8e7ca7382e730e90a8aa243e8a..f9d6a5261e4813fe766cd00153383a3b951a1193 100755
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -27,11 +27,6 @@
 #ifndef LL_LLINVENTORYMODEL_H
 #define LL_LLINVENTORYMODEL_H
 
-#include <map>
-#include <set>
-#include <string>
-#include <vector>
-
 #include "llassettype.h"
 #include "llfoldertype.h"
 #include "llframetimer.h"
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index 8cf6a6bdab8f821815d831f3c0c6ae9a9729974c..e85838c1697a9ea7807df8c3a8edf68e9e4493b9 100755
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -29,8 +29,6 @@
 
 #include "lluuid.h"
 #include "llmd5.h"
-#include <string>
-#include <vector>
 
 class LLViewerInventoryCategory;
 
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h
index 3356f866ce453aa83c8ebaef1e783e84fd7a8d0a..cdabfbe0e8a92b5ee35cba22902970006d803396 100755
--- a/indra/newview/lllandmarklist.h
+++ b/indra/newview/lllandmarklist.h
@@ -28,7 +28,6 @@
 #define LL_LLLANDMARKLIST_H
 
 #include <boost/function.hpp>
-#include <map>
 #include "lllandmark.h"
 #include "lluuid.h"
 #include "llassetstorage.h"
diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h
index 9fef42c5df11996246dd882ba1c4718f11533cb5..31e089f55c686b391b1bb3b0587141be82c931bd 100755
--- a/indra/newview/lllocationhistory.h
+++ b/indra/newview/lllocationhistory.h
@@ -29,9 +29,6 @@
 
 #include "llsingleton.h" // for LLSingleton
 
-#include <vector>
-#include <string>
-#include <map>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/indra/newview/llmimetypes.h b/indra/newview/llmimetypes.h
index ab629fd96504a665e18b6727b75474a6356399a7..b0b7b451169bf103614e0c7dc3378a2da2e3615b 100755
--- a/indra/newview/llmimetypes.h
+++ b/indra/newview/llmimetypes.h
@@ -28,9 +28,6 @@
 #ifndef LLMIMETYPES_H
 #define LLMIMETYPES_H
 
-#include <string>
-#include <map>
-
 class LLMIMETypes
 {
 public:
diff --git a/indra/newview/llnotificationmanager.h b/indra/newview/llnotificationmanager.h
index f37c6b833c0b406827d1427ca03c09488089a919..f4fee83903e0e32e1ee74b5a8ff52e6959a83c9f 100755
--- a/indra/newview/llnotificationmanager.h
+++ b/indra/newview/llnotificationmanager.h
@@ -31,10 +31,6 @@
 #include "lluictrl.h"
 #include "llnotificationhandler.h"
 
-
-#include <map>
-#include <string>
-
 #include <boost/shared_ptr.hpp>
 
 namespace LLNotificationsUI {
diff --git a/indra/newview/llnotificationstorage.cpp b/indra/newview/llnotificationstorage.cpp
index 3418b33d377897bbe88faca093017a802c6d5082..0f2d15edbcbdf391d0a5b0ec922096c61fc91ab6 100755
--- a/indra/newview/llnotificationstorage.cpp
+++ b/indra/newview/llnotificationstorage.cpp
@@ -28,9 +28,6 @@
 
 #include "llnotificationstorage.h"
 
-#include <string>
-#include <map>
-
 #include "llerror.h"
 #include "llfile.h"
 #include "llnotifications.h"
diff --git a/indra/newview/llnotificationstorage.h b/indra/newview/llnotificationstorage.h
index 21d7123747db9139f23f33e2adc865792ea4674d..11614a1df48dbefbe1f3efc24eaeaa32bbcaeb90 100755
--- a/indra/newview/llnotificationstorage.h
+++ b/indra/newview/llnotificationstorage.h
@@ -27,8 +27,6 @@
 #ifndef LL_NOTIFICATIONSTORAGE_H
 #define LL_NOTIFICATIONSTORAGE_H
 
-#include <string>
-
 #include "llerror.h"
 
 class LLNotificationResponderInterface;
diff --git a/indra/newview/llpanelgrouplandmoney.h b/indra/newview/llpanelgrouplandmoney.h
index 3cec6065e709526b11db000e8e7a5a00d45a4dbe..8f45c73c7052586672bd3b8ce364b50434c83708 100755
--- a/indra/newview/llpanelgrouplandmoney.h
+++ b/indra/newview/llpanelgrouplandmoney.h
@@ -28,7 +28,6 @@
 #define LL_PANEL_GROUP_LAND_MONEY_H
 
 #include "llpanelgroup.h"
-#include <map>
 #include "lluuid.h"
 
 class LLPanelGroupLandMoney : public LLPanelGroupTab
diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp
index 00f2ebc4bbe2bea72e9b2a7ba57a0ce9a61f7545..9dd9fa503b346ca192caa7daa26a299ded58b60a 100755
--- a/indra/newview/llpathfindingcharacter.cpp
+++ b/indra/newview/llpathfindingcharacter.cpp
@@ -30,8 +30,6 @@
 
 #include "llpathfindingcharacter.h"
 
-#include <string>
-
 #include "llpathfindingobject.h"
 #include "llsd.h"
 
diff --git a/indra/newview/llpathfindingcharacter.h b/indra/newview/llpathfindingcharacter.h
index 7cf9f401b023bc2d8dbbbbd8d70dc1763a19d2e0..7414164610ba6eb0424679833abb05101cc8fea4 100755
--- a/indra/newview/llpathfindingcharacter.h
+++ b/indra/newview/llpathfindingcharacter.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLPATHFINDINGCHARACTER_H
 #define LL_LLPATHFINDINGCHARACTER_H
 
-#include <string>
-
 #include "llpathfindingobject.h"
 
 class LLSD;
diff --git a/indra/newview/llpathfindinglinkset.cpp b/indra/newview/llpathfindinglinkset.cpp
index 50b76378f5e29f0ffced23bf53f2961ca4ded652..be8172beab89bcb07dcc3dd8e98c5a4f52ca1b43 100755
--- a/indra/newview/llpathfindinglinkset.cpp
+++ b/indra/newview/llpathfindinglinkset.cpp
@@ -27,11 +27,8 @@
 
 
 #include "llviewerprecompiledheaders.h"
-
 #include "llpathfindinglinkset.h"
 
-#include <string>
-
 #include "llpathfindingobject.h"
 #include "llsd.h"
 
diff --git a/indra/newview/llpathfindinglinkset.h b/indra/newview/llpathfindinglinkset.h
index 308a3a1e0f580a1d402a8562e2ce10d0a2d15357..c3adfc213652ed345c52ebe58e873e41cb1bfde5 100755
--- a/indra/newview/llpathfindinglinkset.h
+++ b/indra/newview/llpathfindinglinkset.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLPATHFINDINGLINKSET_H
 #define LL_LLPATHFINDINGLINKSET_H
 
-#include <string>
-
 #include "llpathfindingobject.h"
 
 class LLSD;
diff --git a/indra/newview/llpathfindinglinksetlist.cpp b/indra/newview/llpathfindinglinksetlist.cpp
index b886e46765804bf92bc9d1978eaaf90580be33d3..bcf3217ebee628c445d0ba176b71f249fbf1d752 100755
--- a/indra/newview/llpathfindinglinksetlist.cpp
+++ b/indra/newview/llpathfindinglinksetlist.cpp
@@ -30,9 +30,6 @@
 
 #include "llpathfindinglinksetlist.h"
 
-#include <string>
-#include <map>
-
 #include "llpathfindinglinkset.h"
 #include "llpathfindingobject.h"
 #include "llpathfindingobjectlist.h"
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 8bc1e6a5cb1e79b880e61baddceba56c20bb494d..32edfffa9845b565194eea90f6d2ce7b1c3cde06 100755
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -30,9 +30,6 @@
 
 #include "llpathfindingmanager.h"
 
-#include <string>
-#include <map>
-
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index c61ff244fc1a4549db5c78535cad9633823d28a1..fb005223c61e6876682f60e55958bf0c814599ca 100755
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLPATHFINDINGMANAGER_H
 #define LL_LLPATHFINDINGMANAGER_H
 
-#include <string>
-#include <map>
-
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
index 0287c07f962c0573f930c3bc9994efa44d178446..1ed9f69ef79f40c370fec9ede6abc5f71634ba2c 100755
--- a/indra/newview/llpathfindingnavmesh.cpp
+++ b/indra/newview/llpathfindingnavmesh.cpp
@@ -30,8 +30,6 @@
 
 #include "llpathfindingnavmesh.h"
 
-#include <string>
-
 #include "llpathfindingnavmeshstatus.h"
 #include "llsd.h"
 #include "llsdserialize.h"
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h
index 87f32b8d56487245b7ff0ba0d890845b483cfb4a..63b1703d07630e378c175094060fa4b30e2d63e6 100755
--- a/indra/newview/llpathfindingnavmesh.h
+++ b/indra/newview/llpathfindingnavmesh.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLPATHFINDINGNAVMESH_H
 #define LL_LLPATHFINDINGNAVMESH_H
 
-#include <string>
-
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
diff --git a/indra/newview/llpathfindingnavmeshstatus.cpp b/indra/newview/llpathfindingnavmeshstatus.cpp
index 2eaa6075ca30577a53d4aeea34a92c78760c7d91..9e37f886366e12160a9b14d3447fbb907a5f632f 100755
--- a/indra/newview/llpathfindingnavmeshstatus.cpp
+++ b/indra/newview/llpathfindingnavmeshstatus.cpp
@@ -30,8 +30,6 @@
 
 #include "llpathfindingnavmeshstatus.h"
 
-#include <string>
-
 #include "llsd.h"
 #include "llstring.h"
 #include "lluuid.h"
diff --git a/indra/newview/llpathfindingnavmeshstatus.h b/indra/newview/llpathfindingnavmeshstatus.h
index 74533fa484f2564a669d8d6b0f1d5232e13544a3..2a22a997e4e5d7c690d5d87519837395cdea7662 100755
--- a/indra/newview/llpathfindingnavmeshstatus.h
+++ b/indra/newview/llpathfindingnavmeshstatus.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLPATHFINDINGNAVMESHSTATUS_H
 #define LL_LLPATHFINDINGNAVMESHSTATUS_H
 
-#include <string>
-
 #include "lluuid.h"
 
 class LLSD;
diff --git a/indra/newview/llpathfindingobject.cpp b/indra/newview/llpathfindingobject.cpp
index 900763eae479cc9d52878daf483fb5c1feef0724..21d81c32a89dd51f7a95e9b4ac7d83cf6ea1f986 100755
--- a/indra/newview/llpathfindingobject.cpp
+++ b/indra/newview/llpathfindingobject.cpp
@@ -30,8 +30,6 @@
 
 #include "llpathfindingobject.h"
 
-#include <string>
-
 #include "llavatarname.h"
 #include "llavatarnamecache.h"
 #include "llsd.h"
diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h
index b8d3ca236413f08be20eafa37b6a8c28acb89ebc..a30c0a6398a5bd863c72f47ed1cdb4f4e5c53406 100755
--- a/indra/newview/llpathfindingobject.h
+++ b/indra/newview/llpathfindingobject.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLPATHFINDINGOBJECT_H
 #define LL_LLPATHFINDINGOBJECT_H
 
-#include <string>
-
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
diff --git a/indra/newview/llpathfindingobjectlist.cpp b/indra/newview/llpathfindingobjectlist.cpp
index f1ecb45fc021b51fbc01b6a92c287b083eb174bb..d1a6cd9c247e2f803e78de9aaf52d2ac84c6c658 100755
--- a/indra/newview/llpathfindingobjectlist.cpp
+++ b/indra/newview/llpathfindingobjectlist.cpp
@@ -28,10 +28,6 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llpathfindingobjectlist.h"
-
-#include <string>
-#include <map>
-
 #include "llpathfindingobject.h"
 
 //---------------------------------------------------------------------------
diff --git a/indra/newview/llpathfindingobjectlist.h b/indra/newview/llpathfindingobjectlist.h
index 61580582d370bdd4d2356d54ab6d9ab6678c640e..3a68650aa8a20d9834ba0588876972ad60837c8d 100755
--- a/indra/newview/llpathfindingobjectlist.h
+++ b/indra/newview/llpathfindingobjectlist.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLPATHFINDINGOBJECTLIST_H
 #define LL_LLPATHFINDINGOBJECTLIST_H
 
-#include <string>
-#include <map>
-
 #include <boost/shared_ptr.hpp>
 
 #include "llpathfindingobject.h"
diff --git a/indra/newview/llpreview.h b/indra/newview/llpreview.h
index 49c114720b4ab1c4a68c44f8cbc5b41904951674..f5645c2a09e2f22687228b55c19b1d142e9e1401 100755
--- a/indra/newview/llpreview.h
+++ b/indra/newview/llpreview.h
@@ -33,7 +33,6 @@
 #include "lluuid.h"
 #include "llinventoryobserver.h"
 #include "llextendedstatus.h"
-#include <map>
 
 class LLInventoryItem;
 class LLLineEditor;
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index e5f4807ab7ca5131599d47da28a3a4cce2e51a7f..b20191c297f7dc93121058e8ddd5d11b96d4fab5 100755
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -29,7 +29,6 @@
 
 #include "lltoast.h"
 
-#include <map>
 #include <boost/shared_ptr.hpp>
 
 namespace LLNotificationsUI
diff --git a/indra/newview/llsecapi.cpp b/indra/newview/llsecapi.cpp
index 43bb7b15965a6308df2ff7fac2777b280534ec04..f0dea262321992a066e0b5e602f8bf3ae3bd196e 100755
--- a/indra/newview/llsecapi.cpp
+++ b/indra/newview/llsecapi.cpp
@@ -28,12 +28,12 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llsecapi.h"
+
 #include "llsechandler_basic.h"
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <map>
 #include "llhttpclient.h"
 
+#include <openssl/evp.h>
+#include <openssl/err.h>
 
 
 std::map<std::string, LLPointer<LLSecAPIHandler> > gHandlerMap;
diff --git a/indra/newview/llsyswellitem.h b/indra/newview/llsyswellitem.h
index d961708a01dae7966ead36d7f332bf6c34df6885..f376f5fafd44e79b97e767c6e08a3047a9a354b8 100755
--- a/indra/newview/llsyswellitem.h
+++ b/indra/newview/llsyswellitem.h
@@ -32,8 +32,6 @@
 #include "llbutton.h"
 #include "lliconctrl.h"
 
-#include <string>
-
 class LLSysWellItem : public LLPanel
 {
 public:
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h
index e9c29c39bf3e945d91a57f4260d8ad705919f56d..a613b3309cb37a6c7cef5a1d91d6af9855e09f96 100755
--- a/indra/newview/llteleporthistory.h
+++ b/indra/newview/llteleporthistory.h
@@ -29,8 +29,6 @@
 
 #include "llsingleton.h" // for LLSingleton
 
-#include <vector>
-#include <string>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
 #include "llteleporthistorystorage.h"
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index cebec9bcc6a8b1aff8b918a3f579b58633c0da87..85ac544812c393e3d72866a3ce0758544a32eebd 100755
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -26,12 +26,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include <iostream>
-#include <map>
-#include <algorithm>
-
-#include "llstl.h"
-
 #include "lltexturefetch.h"
 
 #include "lldir.h"
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 27779a31e0ad93294302f07cced692754d8fdc2e..eb1819a9c080ce9dd130b6366e94b88400920673 100755
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLTEXTUREFETCH_H
 #define LL_LLTEXTUREFETCH_H
 
-#include <vector>
-#include <map>
-
 #include "lldir.h"
 #include "llimage.h"
 #include "lluuid.h"
diff --git a/indra/newview/lltextureinfo.h b/indra/newview/lltextureinfo.h
index 176f2cbb7462f9e290bfdf61b53fd6b94eec8f35..ed62ae6fc41ce94beab0f8e2bc7ded960eb2d2e6 100755
--- a/indra/newview/lltextureinfo.h
+++ b/indra/newview/lltextureinfo.h
@@ -30,7 +30,6 @@
 #include "lluuid.h"
 #include "lltextureinfodetails.h"
 #include "lltracerecording.h"
-#include <map>
 
 class LLTextureInfo
 {
diff --git a/indra/newview/lltoastpanel.h b/indra/newview/lltoastpanel.h
index 51630381f2118ff899b298484a1cc80d21df40d4..cc31ca70c3cafefbefcfb0ea52e1080a32b687dd 100755
--- a/indra/newview/lltoastpanel.h
+++ b/indra/newview/lltoastpanel.h
@@ -31,8 +31,6 @@
 #include "lltextbox.h"
 #include "llnotificationptr.h"
 
-#include <string>
-
 /**
  * Base class for all panels that can be added to the toast.
  * All toast panels should contain necessary logic for representing certain notification
diff --git a/indra/newview/lluilistener.h b/indra/newview/lluilistener.h
index 08724024dc84401b6add6c79d2f26bdf6d108ac0..86ba94a436a9c23f8024bab988e04657cb92ee85 100755
--- a/indra/newview/lluilistener.h
+++ b/indra/newview/lluilistener.h
@@ -30,7 +30,6 @@
 #define LL_LLUILISTENER_H
 
 #include "lleventapi.h"
-#include <string>
 
 class LLSD;
 
diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h
index 4e75535ec5470cec1b1cb710fe62b06d2f336f18..013870747cb7d180af681ae8f9bcdf218bba3a1f 100755
--- a/indra/newview/llversioninfo.h
+++ b/indra/newview/llversioninfo.h
@@ -28,7 +28,6 @@
 #ifndef LL_LLVERSIONINFO_H
 #define LL_LLVERSIONINFO_H
 
-#include <string>
 #include "stdtypes.h"
 
 ///
diff --git a/indra/newview/llviewerassettype.h b/indra/newview/llviewerassettype.h
index 9ad8ea7eebd589681d19fcfca335b1f79be8c524..513f752c1ca07385d5afbebcaba72dd2b3647028 100755
--- a/indra/newview/llviewerassettype.h
+++ b/indra/newview/llviewerassettype.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLVIEWERASSETTYPE_H
 #define LL_LLVIEWERASSETTYPE_H
 
-#include <string>
 #include "llassettype.h"
 #include "llui.h" //EDragAndDropType
 
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h
index d7191f5c8d5d8703ec7d76b80fdb8ab9a2c49259..2710d3facd6b05be5b2c477e6c2cc7c759147641 100755
--- a/indra/newview/llviewercontrol.h
+++ b/indra/newview/llviewercontrol.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLVIEWERCONTROL_H
 #define LL_LLVIEWERCONTROL_H
 
-#include <map>
 #include "llcontrol.h"
 
 // Enabled this definition to compile a 'hacked' viewer that
diff --git a/indra/newview/llviewerfoldertype.h b/indra/newview/llviewerfoldertype.h
index 13d5a8fbbdf192cf67d8116de88a011c1057c384..833d0a6c11da8dd63aba5a58f74bebf2d8192cf1 100755
--- a/indra/newview/llviewerfoldertype.h
+++ b/indra/newview/llviewerfoldertype.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLVIEWERFOLDERTYPE_H
 #define LL_LLVIEWERFOLDERTYPE_H
 
-#include <string>
 #include "llfoldertype.h"
 
 // This class is similar to llfoldertype, but contains methods
diff --git a/indra/newview/llviewerhome.h b/indra/newview/llviewerhome.h
index 8e0cdc85ecc5dc3c92e7b9ce1de183ed70c0375f..993e5b82d7e6904386542d655db61b6e742145b0 100755
--- a/indra/newview/llviewerhome.h
+++ b/indra/newview/llviewerhome.h
@@ -28,8 +28,6 @@
 #ifndef LL_LLVIEWERHOME_H
 #define LL_LLVIEWERHOME_H
 
-#include <string>
-
 class LLViewerHome
 {
 public:
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 05c87c153b804354a291033f5d0ff80cffb51b33..eb6e44352baaa0a2bc726fdc5468e94c8d02f47f 100755
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLVIEWEROBJECT_H
 #define LL_LLVIEWEROBJECT_H
 
-#include <map>
-
 #include "llassetstorage.h"
 //#include "llhudicon.h"
 #include "llinventory.h"
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 7b74f96af0d8632adabcd3c50627d10d420be6e8..ec4a9083243c1527b1a6d967e051c6cb8023362f 100755
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLVIEWEROBJECTLIST_H
 #define LL_LLVIEWEROBJECTLIST_H
 
-#include <map>
-#include <set>
 #include <boost/unordered_map.hpp>
 
 // common includes
diff --git a/indra/newview/llvieweroctree.h b/indra/newview/llvieweroctree.h
index 219ec7e8da7c47d2d46f6a512267ca2e6fd96bb0..9bfda684ebab210ec52c271a66ba3263a241c9cb 100644
--- a/indra/newview/llvieweroctree.h
+++ b/indra/newview/llvieweroctree.h
@@ -27,9 +27,6 @@
 #ifndef LL_VIEWEROCTREE_H
 #define LL_VIEWEROCTREE_H
 
-#include <vector>
-#include <map>
-
 #include "v2math.h"
 #include "v3math.h"
 #include "v4math.h"
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index c04b50f4c38bb9cb7b69a641eb68290570b974e5..13dda69ae0d13afe2e14471176f5e07cef531bde 100755
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -29,7 +29,6 @@
 
 // A ViewerRegion is a class that contains a bunch of objects and surfaces
 // that are in to a particular region.
-#include <string>
 #include <boost/signals2.hpp>
 #include <boost/unordered_map.hpp>
 
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index d433bd4dd24567b9d72c9d31a77b65d1b21ce04d..5c4dd032f24235b259df28384f83e4f112306b2f 100755
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -36,9 +36,6 @@
 #include "llmetricperformancetester.h"
 #include "httpcommon.h"
 
-#include <map>
-#include <list>
-
 extern const S32Megabytes gMinVideoRam;
 extern const S32Megabytes gMaxVideoRam;
 
diff --git a/indra/newview/llviewerwindowlistener.cpp b/indra/newview/llviewerwindowlistener.cpp
index 1fe5fc9800c0591c0e2d072f2182c68904b20493..30ab17ff2f0d552006fc28cdac0231a556f17d56 100755
--- a/indra/newview/llviewerwindowlistener.cpp
+++ b/indra/newview/llviewerwindowlistener.cpp
@@ -30,9 +30,6 @@
 #include "llviewerprecompiledheaders.h"
 // associated header
 #include "llviewerwindowlistener.h"
-// STL headers
-#include <map>
-// std headers
 // external library headers
 // other Linden headers
 #include "llviewerwindow.h"
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 51401ab1fe16acce48d788a2ea70606360335d18..7288f4574da30467d5af7c9d2d5fac70caec2c0e 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -28,11 +28,6 @@
 #ifndef LL_VOAVATAR_H
 #define LL_VOAVATAR_H
 
-#include <map>
-#include <deque>
-#include <string>
-#include <vector>
-
 #include <boost/signals2/trackable.hpp>
 
 #include "llavatarappearance.h"
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index b5f8efa2b945e28f71ba7ed71621ca77cb9cae48..231b08725d3ab86c70587234da533a3dc58beb8d 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -30,7 +30,6 @@
 
 #include "llviewertexture.h"
 #include "llvoavatar.h"
-#include <map>
 
 struct LocalTextureData;
 class LLInventoryCallback;
diff --git a/indra/newview/llvograss.h b/indra/newview/llvograss.h
index 3952a6acf918f09ba84ba5cd92c68d99fe3dc919..c395e4362d13e0ce5b6f96424beb355416916f35 100755
--- a/indra/newview/llvograss.h
+++ b/indra/newview/llvograss.h
@@ -28,7 +28,6 @@
 #define LL_LLVOGRASS_H
 
 #include "llviewerobject.h"
-#include <map>
 
 class LLSurfacePatch;
 class LLViewerTexture;
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index bbaca316b0a87957d761d74442d4754c0b31cc51..453965a98994730d89bad93f9ddbef08a727e32d 100755
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -34,7 +34,6 @@
 #include "lllocalbitmaps.h"
 #include "m3math.h"		// LLMatrix3
 #include "m4math.h"		// LLMatrix4
-#include <map>
 
 class LLViewerTextureAnim;
 class LLDrawPool;
diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h
index dc7d41be2ac57b0cff6712da49a30d4bb71d1126..95f77c7aa661747dfa7a29da20316ce01cfd0774 100755
--- a/indra/newview/llwaterparammanager.h
+++ b/indra/newview/llwaterparammanager.h
@@ -27,8 +27,6 @@
 #ifndef LL_WATER_PARAMMANAGER_H
 #define LL_WATER_PARAMMANAGER_H
 
-#include <list>
-#include <map>
 #include "llwaterparamset.h"
 #include "llviewercamera.h"
 #include "v4color.h"
diff --git a/indra/newview/llwaterparamset.h b/indra/newview/llwaterparamset.h
index 368cb0ccba9362e43ed9bbf2b555ec0e6d024a11..d0a2e874f71adb4a7a3c85f68702a9882f96e442 100755
--- a/indra/newview/llwaterparamset.h
+++ b/indra/newview/llwaterparamset.h
@@ -27,9 +27,6 @@
 #ifndef LL_WATER_PARAM_SET_H
 #define LL_WATER_PARAM_SET_H
 
-#include <string>
-#include <map>
-
 #include "v4math.h"
 #include "v4color.h"
 #include "llviewershadermgr.h"
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h
index 7c90badbfe643eabae9349d16489e59e3f3c90ac..0f0147b522e3e0ebf0ea7fe09d3af8bd053e11cd 100755
--- a/indra/newview/llweb.h
+++ b/indra/newview/llweb.h
@@ -28,8 +28,6 @@
 #ifndef LL_LLWEB_H
 #define LL_LLWEB_H
 
-#include <string>
-
 ///
 /// The LLWeb class provides various static methods to display the
 /// contents of a Url in a web browser. Variations are provided to 
diff --git a/indra/newview/llwindowlistener.cpp b/indra/newview/llwindowlistener.cpp
index 1b321dda2cc415c9086c49141aa6e30c78cd6737..8adfc2bec2441de92236c3651c273f52fd1d5f1f 100755
--- a/indra/newview/llwindowlistener.cpp
+++ b/indra/newview/llwindowlistener.cpp
@@ -41,9 +41,6 @@
 #include "llrootview.h"
 #include "llsdutil.h"
 #include "stringize.h"
-#include <functional>
-#include <typeinfo>
-#include <map>
 #include <boost/scoped_ptr.hpp>
 
 LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter& kbgetter)
diff --git a/indra/newview/llwlanimator.h b/indra/newview/llwlanimator.h
index b2126590d9be4735981385036978c291a9467e77..265840e48323a15d4f3f19437c54dbb19f7066ff 100755
--- a/indra/newview/llwlanimator.h
+++ b/indra/newview/llwlanimator.h
@@ -29,8 +29,6 @@
 
 #include "llwlparamset.h"
 #include "llwaterparamset.h"
-#include <string>
-#include <map>
 
 struct LLWLParamKey;
 
diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp
index 88079c5d263f5253ba07ca3838f805a670d7a25e..6fa9201f1aa3daa011aa5480068be5f47ab1c22a 100755
--- a/indra/newview/llwldaycycle.cpp
+++ b/indra/newview/llwldaycycle.cpp
@@ -33,8 +33,6 @@
 
 #include "llviewerwindow.h"
 
-#include <map>
-
 LLWLDayCycle::LLWLDayCycle() : mDayRate(120)
 {
 }
diff --git a/indra/newview/llwldaycycle.h b/indra/newview/llwldaycycle.h
index c8585564edbf822a5441d627f40df658aaa34572..cffdd82ecf6622eb99d9e33c571fb08b20886d9f 100755
--- a/indra/newview/llwldaycycle.h
+++ b/indra/newview/llwldaycycle.h
@@ -29,9 +29,6 @@
 
 class LLWLDayCycle;
 
-#include <vector>
-#include <map>
-#include <string>
 #include "llwlparamset.h"
 #include "llwlanimator.h"
 struct LLWLParamKey;
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h
index e13aed98edfc507d5bec39592e9fdc8493cc67a1..ae87d4d98aeec015c15a83a2a319ef849c2c674e 100755
--- a/indra/newview/llwlparammanager.h
+++ b/indra/newview/llwlparammanager.h
@@ -27,8 +27,6 @@
 #ifndef LL_WLPARAMMANAGER_H
 #define LL_WLPARAMMANAGER_H
 
-#include <list>
-#include <map>
 #include "llenvmanager.h"
 #include "llwlparamset.h"
 #include "llwlanimator.h"
diff --git a/indra/newview/llwlparamset.h b/indra/newview/llwlparamset.h
index 6e5f1d3a4bc22daf5396a665d52803a77a7f1b59..1472e61eb4149f5215fef849bb18dc4dd06722a1 100755
--- a/indra/newview/llwlparamset.h
+++ b/indra/newview/llwlparamset.h
@@ -27,10 +27,6 @@
 #ifndef LL_WLPARAM_SET_H
 #define LL_WLPARAM_SET_H
 
-#include <string>
-#include <map>
-#include <vector>
-
 #include "v4math.h"
 #include "v4color.h"
 #include "llstaticstringtable.h"
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 842b4aa9ff38202d4a42a63f15cc8be8d3b31d5a..9b669b77a7c920c4b8a6e2e07ee0900f3c0f436b 100755
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -56,10 +56,6 @@
 #include "pipeline.h"
 #include "llappviewer.h"		// for do_disconnect()
 #include "llscenemonitor.h"
-#include <deque>
-#include <queue>
-#include <map>
-#include <cstring>
 
 
 //
diff --git a/indra/newview/llworldmipmap.h b/indra/newview/llworldmipmap.h
index 963aac1403d4d497e129d3f74d2fb67c65cb7195..fecf7a2993be110bb8b32cee6ec4f2a2cbc0a904 100755
--- a/indra/newview/llworldmipmap.h
+++ b/indra/newview/llworldmipmap.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLWORLDMIPMAP_H
 #define LL_LLWORLDMIPMAP_H
 
-#include <map>
-
 #include "llmemory.h"			// LLPointer
 #include "indra_constants.h"	// REGION_WIDTH_UNITS
 #include "llregionhandle.h"		// to_region_handle()
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp
index 97a9eb7f5fc557accfd4d7fc555f8098f0f8f6e7..d10c11e38f55e051691a5ef2a4a8ea0c0d2efe0e 100755
--- a/indra/newview/llxmlrpclistener.cpp
+++ b/indra/newview/llxmlrpclistener.cpp
@@ -31,10 +31,6 @@
 #include "llviewerprecompiledheaders.h"
 // associated header
 #include "llxmlrpclistener.h"
-// STL headers
-#include <map>
-#include <set>
-// std headers
 // external library headers
 #include <boost/scoped_ptr.hpp>
 #include <boost/range.hpp>          // boost::begin(), boost::end()
diff --git a/indra/newview/llxmlrpctransaction.h b/indra/newview/llxmlrpctransaction.h
index f2589c7f411640aa7b5e8f2ff99b518cdd11c0a6..b7cc106dbcff3e67fe4e3139a1872a1b5851ddc1 100755
--- a/indra/newview/llxmlrpctransaction.h
+++ b/indra/newview/llxmlrpctransaction.h
@@ -27,8 +27,6 @@
 #ifndef LLXMLRPCTRANSACTION_H
 #define LLXMLRPCTRANSACTION_H
 
-#include <string>
-
 typedef struct _xmlrpc_request* XMLRPC_REQUEST;
 typedef struct _xmlrpc_value* XMLRPC_VALUE;
 	// foward decl of types from xmlrpc.h (this usage is type safe)