From dea44cf05e382ba8ce89c649f3460495cbcade7b Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Tue, 29 Sep 2015 23:06:00 -0600
Subject: [PATCH] Remove a ton of unnecessary stl includes
---
indra/llappearance/llpolymesh.h | 2 --
indra/llappearance/llpolymorph.h | 3 ---
indra/llappearance/llpolyskeletaldistortion.h | 2 --
indra/llaudio/llaudioengine.h | 3 ---
indra/llcharacter/llanimationstates.h | 2 --
indra/llcharacter/llcharacter.h | 2 --
indra/llcharacter/lljoint.h | 1 -
indra/llcharacter/llkeyframemotion.h | 2 --
indra/llcharacter/llkeyframemotionparam.h | 2 --
indra/llcharacter/llmotion.h | 2 --
indra/llcharacter/llmotioncontroller.h | 3 ---
indra/llcharacter/llmultigesture.h | 2 --
indra/llcharacter/llpose.h | 3 ---
indra/llcharacter/llstatemachine.h | 3 ---
indra/llcommon/lluriparser.h | 2 +-
indra/llinventory/llfoldertype.h | 1 -
indra/llinventory/lllandmark.h | 1 -
indra/llinventory/lluserrelations.h | 1 -
indra/llmath/llcalc.h | 3 ---
indra/llmath/llvolumemgr.h | 2 --
indra/llmessage/llavatarname.h | 2 --
indra/llmessage/llavatarnamecache.cpp | 3 ---
indra/llmessage/llcircuit.h | 3 ---
indra/llmessage/llcurl.h | 2 --
indra/llmessage/lldispatcher.h | 4 ----
indra/llmessage/llhost.h | 1 -
indra/llmessage/llhttpclient.h | 2 --
indra/llmessage/llhttpclientinterface.h | 2 --
indra/llmessage/llhttpsender.cpp | 3 ---
indra/llmessage/llmail.cpp | 1 -
indra/llmessage/llmessagebuilder.h | 2 --
indra/llmessage/llmessageconfig.h | 1 -
indra/llmessage/llmessagetemplateparser.h | 1 -
indra/llmessage/llproxy.cpp | 1 -
indra/llmessage/llproxy.h | 1 -
indra/llmessage/llpumpio.cpp | 2 --
indra/llmessage/llsdmessage.h | 1 -
indra/llmessage/llsdmessagebuilder.h | 2 --
indra/llmessage/llsdmessagereader.h | 2 --
indra/llmessage/llsdrpcserver.h | 1 -
indra/llmessage/llservice.h | 6 ------
indra/llmessage/llservicebuilder.h | 2 --
indra/llmessage/llstoredmessage.h | 1 -
indra/llmessage/lltemplatemessagebuilder.h | 2 --
indra/llmessage/lltemplatemessagereader.h | 2 --
indra/llmessage/lltransfermanager.h | 3 ---
indra/llmessage/llurlrequest.h | 1 -
indra/llmessage/lluseroperation.h | 2 --
indra/llplugin/llplugincookiestore.h | 2 --
indra/llprimitive/llmaterialid.cpp | 2 --
indra/llprimitive/llmaterialid.h | 1 -
indra/llrender/llgl.h | 1 -
indra/llrender/llpostprocess.h | 2 --
indra/llui/llaccordionctrl.h | 4 ----
indra/llui/llaccordionctrltab.h | 1 -
indra/llui/llcallbackmap.h | 2 --
indra/llui/llfloaterreglistener.h | 1 -
indra/llui/llfunctorregistry.h | 3 ---
indra/llui/llkeywords.h | 3 ---
indra/llui/llnotifications.h | 6 ------
indra/llui/llnotificationslistener.h | 2 --
indra/llui/lltextbase.h | 2 --
indra/llui/lltrans.cpp | 2 --
indra/llui/lltrans.h | 4 +---
indra/llui/llui.cpp | 3 ---
indra/llui/lluicolortable.h | 1 -
indra/llui/lluistring.h | 1 -
indra/llui/llurlaction.h | 1 -
indra/llui/llurlentry.h | 2 --
indra/llui/llurlmatch.h | 2 --
indra/llui/llurlregistry.h | 3 ---
indra/llui/llviewinject.h | 1 -
indra/llui/llviewmodel.h | 1 -
indra/llvfs/lllfsthread.h | 5 -----
indra/llvfs/llvfs.cpp | 2 --
indra/llvfs/llvfsthread.h | 5 -----
indra/llwindow/llkeyboard.h | 1 -
indra/llxml/llxmlnode.cpp | 1 -
indra/llxml/llxmlnode.h | 1 -
indra/llxml/llxmltree.h | 2 --
indra/newview/llaisapi.h | 3 ---
indra/newview/llassetuploadqueue.h | 3 ---
indra/newview/llavataractions.h | 3 ---
indra/newview/llavatarpropertiesprocessor.h | 2 --
indra/newview/llcallingcard.h | 4 ----
indra/newview/llcapabilitylistener.cpp | 3 ---
indra/newview/llcapabilityprovider.h | 1 -
indra/newview/llchannelmanager.h | 1 -
indra/newview/llclassifiedinfo.h | 2 --
indra/newview/llcommandlineparser.cpp | 3 ---
indra/newview/llcommunicationchannel.cpp | 3 ---
indra/newview/llcommunicationchannel.h | 3 ---
indra/newview/lldaycyclemanager.h | 3 ---
indra/newview/lldebugmessagebox.h | 2 --
indra/newview/lldrawable.h | 3 ---
indra/newview/llfeaturemanager.h | 1 -
indra/newview/llfloatergroups.h | 1 -
indra/newview/llfloaterimcontainer.h | 11 +++++------
indra/newview/llfloaterpathfindingcharacters.cpp | 2 --
indra/newview/llfloaterpathfindinglinksets.cpp | 2 --
indra/newview/llfloaterpathfindinglinksets.h | 2 --
indra/newview/llfloaterpathfindingobjects.cpp | 4 ----
indra/newview/llfloaterpathfindingobjects.h | 3 ---
indra/newview/llfloaterproperties.h | 1 -
indra/newview/llfloatersearch.h | 2 --
indra/newview/llfloaterwebprofile.h | 2 --
indra/newview/llfollowcam.h | 2 --
indra/newview/llgesturemgr.h | 4 ----
indra/newview/llgroupmgr.h | 3 ---
indra/newview/llinventorymodel.h | 5 -----
indra/newview/llinventoryobserver.h | 2 --
indra/newview/lllandmarklist.h | 1 -
indra/newview/lllocationhistory.h | 3 ---
indra/newview/llmimetypes.h | 3 ---
indra/newview/llnotificationmanager.h | 4 ----
indra/newview/llnotificationstorage.cpp | 3 ---
indra/newview/llnotificationstorage.h | 2 --
indra/newview/llpanelgrouplandmoney.h | 1 -
indra/newview/llpathfindingcharacter.cpp | 2 --
indra/newview/llpathfindingcharacter.h | 2 --
indra/newview/llpathfindinglinkset.cpp | 3 ---
indra/newview/llpathfindinglinkset.h | 2 --
indra/newview/llpathfindinglinksetlist.cpp | 3 ---
indra/newview/llpathfindingmanager.cpp | 3 ---
indra/newview/llpathfindingmanager.h | 3 ---
indra/newview/llpathfindingnavmesh.cpp | 2 --
indra/newview/llpathfindingnavmesh.h | 2 --
indra/newview/llpathfindingnavmeshstatus.cpp | 2 --
indra/newview/llpathfindingnavmeshstatus.h | 2 --
indra/newview/llpathfindingobject.cpp | 2 --
indra/newview/llpathfindingobject.h | 2 --
indra/newview/llpathfindingobjectlist.cpp | 4 ----
indra/newview/llpathfindingobjectlist.h | 3 ---
indra/newview/llpreview.h | 1 -
indra/newview/llscreenchannel.h | 1 -
indra/newview/llsecapi.cpp | 6 +++---
indra/newview/llsyswellitem.h | 2 --
indra/newview/llteleporthistory.h | 2 --
indra/newview/lltexturefetch.cpp | 6 ------
indra/newview/lltexturefetch.h | 3 ---
indra/newview/lltextureinfo.h | 1 -
indra/newview/lltoastpanel.h | 2 --
indra/newview/lluilistener.h | 1 -
indra/newview/llversioninfo.h | 1 -
indra/newview/llviewerassettype.h | 1 -
indra/newview/llviewercontrol.h | 1 -
indra/newview/llviewerfoldertype.h | 1 -
indra/newview/llviewerhome.h | 2 --
indra/newview/llviewerobject.h | 2 --
indra/newview/llviewerobjectlist.h | 2 --
indra/newview/llvieweroctree.h | 3 ---
indra/newview/llviewerregion.h | 1 -
indra/newview/llviewertexture.h | 3 ---
indra/newview/llviewerwindowlistener.cpp | 3 ---
indra/newview/llvoavatar.h | 5 -----
indra/newview/llvoavatarself.h | 1 -
indra/newview/llvograss.h | 1 -
indra/newview/llvovolume.h | 1 -
indra/newview/llwaterparammanager.h | 2 --
indra/newview/llwaterparamset.h | 3 ---
indra/newview/llweb.h | 2 --
indra/newview/llwindowlistener.cpp | 3 ---
indra/newview/llwlanimator.h | 2 --
indra/newview/llwldaycycle.cpp | 2 --
indra/newview/llwldaycycle.h | 3 ---
indra/newview/llwlparammanager.h | 2 --
indra/newview/llwlparamset.h | 4 ----
indra/newview/llworld.cpp | 4 ----
indra/newview/llworldmipmap.h | 2 --
indra/newview/llxmlrpclistener.cpp | 4 ----
indra/newview/llxmlrpctransaction.h | 2 --
171 files changed, 10 insertions(+), 386 deletions(-)
diff --git a/indra/llappearance/llpolymesh.h b/indra/llappearance/llpolymesh.h
index 83659d9514..22b92fa61d 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 3c2c68079c..ded6e6c7b3 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 f6c467980b..07f8f58c90 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 f1e1b4e308..fecb410370 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 79cbcabdc1..3d152c23d6 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 4840b44dc4..ad148f5e65 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 2abe1d6db1..f0d065eb16 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 b1422b2b90..619ccd4428 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 0fac3724d1..e26961c6cc 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 9bc55ec1f3..e0129f5766 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 2bd5271c4f..4e76c95693 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 92820159d4..fab1e959d6 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 c004a0f3b7..d3f4553625 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 a2f7e59bd2..2aa1625a39 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 2df8085ae6..b2baa0862f 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 a3896cc6e0..bcabc2816c 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 92923ea6fb..13afc34c1d 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 9fbf36f0e2..ab9e5546e4 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 8c71569f43..4b36cf63a8 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 c75906f675..5478322b40 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 af5bcf13a9..ff53156707 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 549708097a..e2677e00c8 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 e0c0555925..96aec37084 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 5fa1216017..d09f36b40b 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 9d1751f588..473f600195 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 0cf52a4151..96a95bff05 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 b9da02cbd7..24223bdc14 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 12a3857a61..bcc73f20dd 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 5363088d79..0522c55c1d 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 77f8bb7da6..0f6b9d9fa9 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 bf5be929f2..8abcd94bd1 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 0f6075e172..19f17ba9a8 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 372a2b292d..98319afa0c 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 0eb39e1545..476a765f60 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 a919370540..9e8971491a 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 2885ed99d2..48653d2af3 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 e5d532d6a4..a3bd0ff20a 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 9c7c1bfde3..d21f0b78de 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 3b3d7fbfbe..cf0c3d5e4e 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 415bd31c26..ed76a7748d 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 9c09aeb44c..f70b06c36e 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 968995edf2..4a82562e54 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 9c98e2c558..1d4bf618b4 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 4f614a4657..6ff39d6851 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 59cb4ae437..49da2a33f9 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 6aad153c24..4eb9fef864 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 88fccd4bf6..1fcb8eb226 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 7db5f0b27f..2e8a7e504e 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 a2fdeab647..205627392b 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 820f62c43c..6fcf5a0354 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 b4c82d3b7b..289a458f17 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 dac0c7af69..ce798b5ee9 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 bdfc632831..6103ff57e3 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 1fe64c472e..0dedef2571 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 7a78700e0f..7110787013 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 0a10877c09..ebd7440c6b 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 24311a2dfa..95eb1c8abf 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 f5364f4863..3ef0b22420 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 18e2ed06c5..b603191b70 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 8e8c7e14fc..0aacaddb46 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 f9f7641de6..a5e54fa1f5 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 a61e743909..e776b1f67a 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 4d4ff4236d..676bff4648 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 a47ce94f08..0892b880c3 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 aabc7ed2e4..a55d85c465 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 c7dc4b04cf..33d737ee02 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 07e02de6d8..32ccb40e7c 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 5f3626490c..6e279bb2de 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 b4fae044bd..5d70fd823a 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 ff699902ca..5a6b57a074 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 5ce4048d5d..90099c6d1a 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 0de3d155c4..3afb14282e 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 49d7c322a3..2592b229e9 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 cdb5c75946..5292110af7 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 07bf844d43..2b5f52d5cc 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 95f3c857c6..52dad45f5c 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 6f2dc87317..a40978c425 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 9b1f49cd1f..319e819ba6 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 0b8da5dc5d..b8a977f362 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 a82fee0416..9347d645f4 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 bb483fb133..754f71cbd2 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 2ceee8f700..25e7a18cee 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 816caaeda6..a6174cf8ea 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 fbb7626a8c..c01d59e57c 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 609cfc3d90..6c8ce65248 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 ef9b910ae5..5ea3032e3d 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 9d91245597..b692d03848 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 a5de8a5327..efa7b67738 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 3ff793b168..79ff238518 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 851fa14de1..05f99d7737 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 cf98b56b4c..9b523ace0f 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 0d8f7f4387..573ab80eef 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 3d2144960d..5077e4bb6b 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 87a0910662..62c19cc1d7 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 a3461d4c01..e279f863a7 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 64ef260c14..c4322917c4 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 1ad27cea19..ab58208985 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 3d4648fdc1..1036143935 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 87f927ff65..7c467b7547 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 1e46d7a402..c3b3cf89f4 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 7149da9215..8346dc81ef 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 f6ff83eaf4..e76978cad9 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 4024e15fd6..8bf42f1ca0 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 aa3fcec337..4bd30eab9a 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 35b268e1b2..1fb557a2d5 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 4c355e401b..aa780d2495 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 f4b7b2723a..de5bde6754 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 26a5924ec3..db96cbbfb2 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 2e94e8d9a0..67258a90bb 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 ac336e347c..f9d6a5261e 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 8cf6a6bdab..e85838c169 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 3356f866ce..cdabfbe0e8 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 9fef42c5df..31e089f55c 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 ab629fd965..b0b7b45116 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 f37c6b833c..f4fee83903 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 3418b33d37..0f2d15edbc 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 21d7123747..11614a1df4 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 3cec6065e7..8f45c73c70 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 00f2ebc4bb..9dd9fa503b 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 7cf9f401b0..7414164610 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 50b76378f5..be8172beab 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 308a3a1e0f..c3adfc2136 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 b886e46765..bcf3217ebe 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 8bc1e6a5cb..32edfffa98 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 c61ff244fc..fb005223c6 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 0287c07f96..1ed9f69ef7 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 87f32b8d56..63b1703d07 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 2eaa6075ca..9e37f88636 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 74533fa484..2a22a997e4 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 900763eae4..21d81c32a8 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 b8d3ca2364..a30c0a6398 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 f1ecb45fc0..d1a6cd9c24 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 61580582d3..3a68650aa8 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 49c114720b..f5645c2a09 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 e5f4807ab7..b20191c297 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 43bb7b1596..f0dea26232 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 d961708a01..f376f5fafd 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 e9c29c39bf..a613b3309c 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 cebec9bcc6..85ac544812 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 27779a31e0..eb1819a9c0 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 176f2cbb74..ed62ae6fc4 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 51630381f2..cc31ca70c3 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 08724024dc..86ba94a436 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 4e75535ec5..013870747c 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 9ad8ea7eeb..513f752c1c 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 d7191f5c8d..2710d3facd 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 13d5a8fbbd..833d0a6c11 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 8e0cdc85ec..993e5b82d7 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 05c87c153b..eb6e44352b 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 7b74f96af0..ec4a908324 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 219ec7e8da..9bfda684eb 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 c04b50f4c3..13dda69ae0 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 d433bd4dd2..5c4dd032f2 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 1fe5fc9800..30ab17ff2f 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 51401ab1fe..7288f4574d 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 b5f8efa2b9..231b08725d 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 3952a6acf9..c395e4362d 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 bbaca316b0..453965a989 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 dc7d41be2a..95f77c7aa6 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 368cb0ccba..d0a2e874f7 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 7c90badbfe..0f0147b522 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 1b321dda2c..8adfc2bec2 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 b2126590d9..265840e483 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 88079c5d26..6fa9201f1a 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 c8585564ed..cffdd82ecf 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 e13aed98ed..ae87d4d98a 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 6e5f1d3a4b..1472e61eb4 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 842b4aa9ff..9b669b77a7 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 963aac1403..fecf7a2993 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 97a9eb7f5f..d10c11e38f 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 f2589c7f41..b7cc106dbc 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)
--
GitLab