Remove unused headers from hsStlUtils.h (and push them downstream where needed)

Also fix a couple of plString and header issues identified by Paradox on GCC/Clang
12 years ago · f510b529f8
55 changed files with 83 additions and 46 deletions
--- a/Sources/Plasma/Apps/plClient/plClient.h
+++ b/Sources/Plasma/Apps/plClient/plClient.h
@ -48,10 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //#define NEW_CAMERA_CODE

 #include "HeadSpin.h"
+#include <list>
+
 #include "hsBitVector.h"
 #include "hsTemplates.h"

-#include "hsStlUtils.h"
 #include "pnKeyedObject/hsKeyedObject.h"
 #include "pnKeyedObject/plUoid.h"
 #include "plScene/plRenderRequest.h"
--- a/Sources/Plasma/CoreLib/hsStlUtils.cpp
+++ b/Sources/Plasma/CoreLib/hsStlUtils.cpp
@ -282,6 +282,7 @@ bool formatv(std::wstring & out, const wchar_t * fmt, va_list args)
    return success;
 }

+/*
 typedef std::vector<std::string> StringVector;
 typedef std::vector<std::wstring> WStringVector;
 typedef std::list<std::string> StringList;
@ -295,6 +296,7 @@ template bool GetStringGroup<StringVector>(const std::string& s, StringVector& g
 template bool GetStringGroup<WStringVector>(const std::wstring& s, WStringVector& group, wchar_t sep);
 template bool GetStringGroup<StringSet>(const std::string& s, StringSet& group, char sep);
 template bool GetStringGroup<WStringSet>(const std::wstring& s, WStringSet& group, wchar_t sep);
+*/

 template <typename T> bool GetStringGroup(const std::string& s, T& group, char sep)
 {
@ -337,13 +339,14 @@ template <typename T> bool GetStringGroup(const std::wstring& s, T& group, wchar
    return ret;
 }

-
+/*
 template bool GetStringGroupAsString<StringList>(const StringList& group, std::string& s, char sep);
 template bool GetStringGroupAsString<WStringList>(const WStringList& group, std::wstring& s, wchar_t sep);
 template bool GetStringGroupAsString<StringVector>(const StringVector& group, std::string& s, char sep);
 template bool GetStringGroupAsString<WStringVector>(const WStringVector& group, std::wstring& s, wchar_t sep);
 template bool GetStringGroupAsString<StringSet>(const StringSet& group, std::string& s, char sep);
 template bool GetStringGroupAsString<WStringSet>(const WStringSet& group, std::wstring& s, wchar_t sep);
+*/

 template <typename T> bool GetStringGroupAsString(const T& group, std::string& s, char sep)
 {
--- a/Sources/Plasma/CoreLib/hsStlUtils.h
+++ b/Sources/Plasma/CoreLib/hsStlUtils.h
@ -44,13 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com


 #include "HeadSpin.h"
-#include <functional>
-#include <algorithm>
 #include <string>
-#include <vector>
-#include <map>
-#include <list>
-#include <set>


 /*****************************************************************************
--- a/Sources/Plasma/CoreLib/plString.cpp
+++ b/Sources/Plasma/CoreLib/plString.cpp
@ -367,7 +367,7 @@ plStringBuffer<wchar_t> plString::ToWchar() const
    return *reinterpret_cast<plStringBuffer<wchar_t>*>(&utf16);
 #else
    plUnicodeBuffer utf32 = GetUnicodeArray();
-    return *reinterpret_cast<plStringBuffer<wchar_t>*)(&utf32);
+    return *reinterpret_cast<plStringBuffer<wchar_t>*>(&utf32);
 #endif
 }

--- a/Sources/Plasma/CoreLib/plString.h
+++ b/Sources/Plasma/CoreLib/plString.h
@ -172,7 +172,7 @@ public:
    plString &operator=(const char *cstr) { IConvertFromUtf8(cstr, kSizeAuto); return *this; }
    plString &operator=(const plString &copy) { fUtf8Buffer = copy.fUtf8Buffer; return *this; }
    plString &operator=(const plStringBuffer<char> &init);
-    plString &operator=(const plUnicodeBuffer &init) { IConvertFromUtf32(init.GetData(), init.GetSize()); }
+    plString &operator=(const plUnicodeBuffer &init) { IConvertFromUtf32(init.GetData(), init.GetSize()); return *this; }

    plString &operator+=(const char *cstr) { return operator=(*this + cstr); }
    plString &operator+=(const plString &str) { return operator=(*this + str); }
--- a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
+++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
@ -40,6 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 *==LICENSE==*/
 #include "HeadSpin.h"
+#include <cmath>

 #include "plCameraBrain.h"
 #include "hsTimer.h"
--- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
+++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/

 #include "HeadSpin.h"
+#include <algorithm>
+
 #include "plVirtualCamNeu.h"
 #include "plCameraModifier.h"
 #include "plCameraBrain.h"
--- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h
+++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h
@ -56,7 +56,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _pfConsoleDirSrc_h

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <vector>
+
 #include "pfConsoleCore/pfConsoleEngine.h"

 //// pfConsoleDirSrc Class Definition ////////////////////////////////////////
--- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h
+++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h
@ -165,7 +165,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //////////////////////////////////////////////////////////////////////////////

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <map>
+
 #include "hsTemplates.h"
 #include "hsColorRGBA.h"

--- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.h
+++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.h
@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _pfLocalizationDataMgr_h

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <map>

 #include "pfLocalizedString.h"

--- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.cpp
+++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.cpp
@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include "HeadSpin.h"

-
 #include "pfLocalizedString.h"

 // MinGW sucks
--- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.h
+++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.h
@ -51,7 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _pfLocalizedString_h

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <vector>
+#include <string>


 //// pfLocalizedString Class Definition //////////////////////////////
--- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h
+++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h
@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //

 #include <vector>
+#include <string>

 typedef struct _object PyObject;
 typedef struct PyMethodDef PyMethodDef;
--- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h
+++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h
@ -46,7 +46,7 @@ class plPythonFileMod;
 class plStateDataRecord;
 class plSimpleStateVariable;

-#include "hsStlUtils.h"
+#include <map>
 #include "plModifier/plSDLModifier.h"

 #include "pyGlueHelpers.h"
--- a/Sources/Plasma/FeatureLib/pfPython/pySDL.h
+++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.h
@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //////////////////////////////////////////////////////////////////////

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <vector>
+
 #include "pyGlueHelpers.h"

 class plStateDataRecord;
--- a/Sources/Plasma/NucleusLib/inc/plProfileManager.h
+++ b/Sources/Plasma/NucleusLib/inc/plProfileManager.h
@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plProfileManager_h_inc

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <vector>
+
 #include "plProfile.h"

 class plProfileManager 
--- a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h
+++ b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h
@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #ifndef plDispatch_inc
 #define plDispatch_inc
+#include <list>
 #include "hsTemplates.h"
-#include "hsStlUtils.h"
 #include "plgDispatch.h"
 #include "hsThread.h"
 #include "pnKeyedObject/hsKeyedObject.h"
--- a/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.h
+++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.h
@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plMsgForwarder_h_inc
 #define plMsgForwarder_h_inc

+#include <map>
 #include "hsKeyedObject.h"
 #include "hsTemplates.h"
-#include "hsStlUtils.h"


 class plMessageWithCallbacks;
--- a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp
+++ b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp
@ -39,6 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+#include <string>
 #include "pnNetCommon.h"
 #include "hsWindows.h"

--- a/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.h
+++ b/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.h
@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef _plDSoundBuffer_h
 #define _plDSoundBuffer_h

-#include "hsStlUtils.h"
+#include <list>
 #include "hsTemplates.h"
 #include "plEAXEffects.h"
 #define STREAMING_BUFFERS 16
--- a/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h
+++ b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h
@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include "HeadSpin.h"

-#include "hsStlUtils.h"
+#include <vector>
 #include "hsWindows.h" // FIXME
 #include <mmsystem.h>
 #include "plAudioFileReader.h"
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h
@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 */
 #pragma warning(disable: 4786)      // don't care if mangled names are longer than 255 characters

+#include <map>
 #include "pnNetCommon/plSynchedObject.h"
-#include "hsStlUtils.h"
 #include "hsStlSortUtils.h"

 class plTMController;
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h
@ -53,8 +53,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // disable warning C4786: symbol greater than 255 characters,
 #pragma warning(disable: 4503 4786)

-// templates
-#include "hsStlUtils.h"
+#include "HeadSpin.h"
+#include <map>
+
 #include "hsStlSortUtils.h"

 // local
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
@ -59,6 +59,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTimer.h"

 #include <cstdio>
+#include <cmath>

 // other
 #include "pnSceneObject/plSceneObject.h"
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h
@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef PL_ANIM_STAGE_INC
 #define PL_ANIM_STAGE_INC

+#include <vector>
 #include "hsMatrix44.h"
-#include "hsStlUtils.h"
 #include "pnFactory/plCreatable.h"

 class plMessage;
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp
@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+#include <cmath>
+
 #include "plAvBehaviors.h"
 #include "plAvBrainHuman.h"
 #include "plArmatureMod.h"
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h
@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef PL_AV_BRAIN_CRITTER_H
 #define PL_AV_BRAIN_CRITTER_H

+#include <map>
 #include "plAvBrain.h"
 #include "hsTemplates.h"
 #include "pnKeyedObject/plKey.h"
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp
@ -41,6 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/

 #include "HeadSpin.h"
+#include <cmath>

 #include "plPhysicalControllerCore.h"
 #include "plAvBrainHuman.h"
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp
@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 /////////////////////////////////////////////////////////////////////////////////////////

+#include <cmath>
+
 // singular
 #include "plAvBrainSwim.h"

--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp
@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPhysicalControllerCore.h"

 #include "HeadSpin.h"
+#include <cmath>

 // singular
 #include "plAvLadderModifier.h"
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp
@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 /////////////////////////////////////////////////////////////////////////////////////////

+#include <cmath>
+
 // singular
 #include "plAvTaskSeek.h"

--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h
@ -45,7 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef PLAVATARMGR_INC
 #define PLAVATARMGR_INC

-#include "hsStlUtils.h"
+#include "HeadSpin.h"
+#include <map>
+
 #include "hsStlSortUtils.h"
 #include "hsGeometry3.h"

--- a/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp
@ -50,6 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //#include <hkmath/quaternion.h>
 //#include <hkmath/quaternion.h>

+#include <cmath>
+
 // singular
 #include "plMatrixChannel.h"

--- a/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp
@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+#include <cmath>
+
 #include "plPhysicalControllerCore.h"

 #include "plArmatureMod.h"
--- a/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp
@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+#include <cmath>
+
 #include "hsGeometry3.h"
 #include "hsResMgr.h"

--- a/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h
+++ b/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h
@ -43,8 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plKeysAndValues_h_inc

 #include "HeadSpin.h"
+#include <map>
+#include <list>

-#include "hsStlUtils.h"
 #include "hsStream.h"

 #pragma warning(disable:4284)
--- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h
+++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h
@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plDynaDecalMgr_inc
 #define plDynaDecalMgr_inc

+#include <map>
 #include "pnNetCommon/plSynchedObject.h"
 #include "hsTemplates.h"
 #include "hsGeometry3.h"
 #include "hsMatrix44.h"
-#include "hsStlUtils.h"


 class plParticleSystem;
--- a/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h
+++ b/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h
@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plStreamSource_h_inc
 #define plStreamSource_h_inc

+#include <map>
 #include "hsStream.h"
 #include "hsStlUtils.h"

--- a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h
+++ b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h
@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plAnimTimeConvert_inc
 #define plAnimTimeConvert_inc

+#include <list>
 #include "pnFactory/plCreatable.h"
 #include "hsTemplates.h"
 #include "pnNetCommon/plSynchedValue.h"
--- a/Sources/Plasma/PubUtilLib/plMath/plAvg.h
+++ b/Sources/Plasma/PubUtilLib/plMath/plAvg.h
@ -43,8 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define PL_AVG_H

 #include "HeadSpin.h"
+#include <list>
+
 #include "hsThread.h"
-#include "hsStlUtils.h"


 // A Time based Value Averaging class
--- a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h
+++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plResponderModifier_inc
 #define plResponderModifier_inc

-#include "hsStlUtils.h"
+#include <map>
 #include "pnModifier/plSingleModifier.h"
 #include "pnMessage/plMessage.h"

--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plNetClientGroup_h
 #define plNetClientGroup_h

-#include "hsStlUtils.h"
+#include <set>
 #include "pnNetCommon/plNetGroup.h"

 //
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define PL_NET_CLIENT_inc

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <list>

 #include "plNetClientGroup.h"
 #include "plNetVoiceList.h"
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp
@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+#include <cmath>
+
 #include "plNetClientMgr.h"
 #include "plNetLinkingMgr.h"

--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp
@ -252,10 +252,10 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgSDLState)
    {
        std::string err;
        if (!sdRec)
-            err = xtl::format( "SDL descriptor %s missing, v=%d", descName, ver);
+            err = xtl::format( "SDL descriptor %s missing, v=%d", descName.c_str(), ver);
        else
            err = xtl::format( "SDL descriptor %s, version mismatch, server v=%d, client v=%d",
-                descName, ver, sdRec->GetDescriptor()->GetVersion());
+                descName.c_str(), ver, sdRec->GetDescriptor()->GetVersion());

        hsAssert(false, err.c_str());
        nc->ErrorMsg(const_cast<char*>(err.c_str()));
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h
@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plNetCommonHelpers_h_inc

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <map>
+
 #include "hsTimer.h"
 #include "pnNetCommon/pnNetCommon.h"
 #include "pnNetCommon/plNetApp.h"
--- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h
+++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h
@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plNetTransport_h

 #include "HeadSpin.h"
-#include "hsStlUtils.h"
+#include <vector>

 //
 // The transport class handles the details of sending net msgs to
--- a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h
+++ b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plSimulationMgr_H
 #define plSimulationMgr_H

-#include "hsStlUtils.h"
+#include <map>
 #include "pnKeyedObject/hsKeyedObject.h"
 #include "hsTemplates.h"

--- a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp
+++ b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp
@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/

 #include "HeadSpin.h"
+#include <cmath>
+
 #include "plCollisionDetector.h"
 #include "plMessage/plCollideMsg.h"
 #include "plgDispatch.h"
--- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h
+++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plPhysicsSoundMgr_h_inc
 #define plPhysicsSoundMgr_h_inc

-#include "hsStlUtils.h"
+#include <set>
 #include "plPhysical.h"
 #include "hsGeometry3.h"

--- a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h
+++ b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h
@ -42,7 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plLocalization_h_inc
 #define plLocalization_h_inc

-#include "hsStlUtils.h"
+#include <vector>
+#include <string>

 class plLocalization
 {
--- a/Sources/Plasma/PubUtilLib/plSDL/plSDL.h
+++ b/Sources/Plasma/PubUtilLib/plSDL/plSDL.h
@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // Code for the State Description Language (SDL)
 //

-#include "plSDLDescriptor.h"
+#include <list>

-#include "hsStlUtils.h"
+#include "plSDLDescriptor.h"

 #include "pnFactory/plCreatable.h"
 #include "pnKeyedObject/plKey.h"
--- a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h
+++ b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h
@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plProfileManagerFull_h_inc
 #define plProfileManagerFull_h_inc

-#include "plProfileManager.h"
+#include <set>

-#include "hsStlUtils.h"
+#include "plProfileManager.h"

 #include "hsStlSortUtils.h"

--- a/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h
+++ b/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h
@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef PL_STREAM_LOGGER
 #define PL_STREAM_LOGGER

+#include <list>
 #include "hsStream.h"
-#include "hsStlUtils.h"
 #include "pnNetCommon/plGenericVar.h"

 class plStreamLogger
--- a/Sources/Tools/MaxMain/plMtlCollector.h
+++ b/Sources/Tools/MaxMain/plMtlCollector.h
@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plMtlCollector_h_inc
 #define plMtlCollector_h_inc

+#include <set>
 #include "hsStlSortUtils.h"

 class PBBitmap;