diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp
index 02ae07e9..a8ed6cb5 100644
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp
@@ -55,6 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsResMgr.h"
 
 // other
+#include "plInterp/plAnimEaseTypes.h"
 #include "plMessage/plAnimCmdMsg.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp
index 7c8159f5..506a054b 100644
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp
@@ -55,6 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plgDispatch.h"
 
 // other
+#include "plInterp/plAnimEaseTypes.h"
 #include "plMessage/plAnimCmdMsg.h"
 #include "pnMessage/plSDLModifierMsg.h"
 #include "pnMessage/plSDLNotificationMsg.h"
diff --git a/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt
index 848f0fbc..66cfd9b4 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt
+++ b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt
@@ -13,7 +13,6 @@ set(plMessage_SOURCES
     plCaptureRenderMsg.cpp
     plCCRMsg.cpp
     plClimbMsg.cpp
-    plCollideMsg.cpp
     plDynaDecalEnableMsg.cpp
     plDynamicEnvMapMsg.cpp
     plDynamicTextMsg.cpp
@@ -29,7 +28,6 @@ set(plMessage_SOURCES
     plLOSRequestMsg.cpp
     plMatrixUpdateMsg.cpp
     plMultistageMsg.cpp
-    plNetCommMsgs.cpp
     plNetVoiceListMsg.cpp
     plOneShotCallbacks.cpp
     plOneShotMsg.cpp
@@ -67,7 +65,6 @@ set(plMessage_HEADERS
     plDynaDecalEnableMsg.h
     plDynamicEnvMapMsg.h
     plDynamicTextMsg.h
-    plElementRefMsg.h
     plExcludeRegionMsg.h
     plInputEventMsg.h
     plInputIfaceMgrMsg.h
@@ -117,10 +114,10 @@ set(plMessage_HEADERS
     plTimerCallbackMsg.h
     plTransitionMsg.h
     plTriggerMsg.h
-    plUniqueIdsMsg.h
     plVaultNotifyMsg.h
 )
 
+use_precompiled_header(Pch.h Pch.cpp plMessage_HEADERS plMessage_SOURCES)
 add_library(plMessage STATIC ${plMessage_SOURCES} ${plMessage_HEADERS})
 
 source_group("Source Files" FILES ${plMessage_SOURCES})
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/Pch.cpp
similarity index 98%
rename from Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.cpp
rename to Sources/Plasma/PubUtilLib/plMessage/Pch.cpp
index 19828919..e0496da4 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/Pch.cpp
@@ -39,3 +39,5 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+
+#include "Pch.h"
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.cpp b/Sources/Plasma/PubUtilLib/plMessage/Pch.h
similarity index 79%
rename from Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.cpp
rename to Sources/Plasma/PubUtilLib/plMessage/Pch.h
index 6b304f94..35421a24 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/Pch.h
@@ -39,10 +39,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-/*****************************************************************************
-*
-*   $/Plasma20/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.cpp
-*   
-***/
 
-#include "plNetCommMsgs.h"
+// Plasma CoreLib
+#include "HeadSpin.h"
+#include "hsBitVector.h"
+#include "hsColorRGBA.h"
+#include "hsFastMath.h"
+#include "hsGeometry3.h"
+#include "hsStream.h"
+#include "plString.h"
+#include "hsTemplates.h"
+
+// Plasma Nucleus
+#include "plgDispatch.h"
+#include "hsResMgr.h"
+
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plUoid.h"
+#include "pnMessage/plMessage.h"
+#include "pnNetCommon/plNetApp.h"
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp
index d131b40f..100286fa 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp
@@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef SERVER // we use stuff the server doesn't link with
 #ifndef NO_AV_MSGS
 
-#include "plAIMsg.h"
-
-#include "hsResMgr.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plAIMsg.h"
 
 #include "plAvatar/plArmatureMod.h"
 
@@ -60,8 +60,6 @@ plAIMsg::plAIMsg(const plKey& sender, const plKey& receiver): plMessage(sender,
     plArmatureMod* armMod = plArmatureMod::ConvertNoRef(sender->ObjectIsLoaded());
     if (armMod)
         fBrainUserStr = armMod->GetUserStr();
-    else
-        fBrainUserStr = "";
 }
 
 void plAIMsg::Read(hsStream* stream, hsResMgr* mgr)
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.cpp
index 38cc831b..f0383da7 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.cpp
@@ -39,18 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plAccountUpdateMsg.h"
+
 #include "hsStream.h"
+#pragma hdrstop
 
-plAccountUpdateMsg::plAccountUpdateMsg()
-{
-    fUpdateType = 0;
-}
+#include "plAccountUpdateMsg.h"
 
-plAccountUpdateMsg::plAccountUpdateMsg(unsigned updateType)
-{
-    fUpdateType = updateType;
-}
 
 void plAccountUpdateMsg::Read(hsStream* stream, hsResMgr* mgr)
 {
@@ -67,34 +61,3 @@ void plAccountUpdateMsg::Write(hsStream* stream, hsResMgr* mgr)
     stream->WriteLE32(fResult);
     stream->WriteLE32(fPlayerInt);
 }
-
-unsigned plAccountUpdateMsg::GetUpdateType()
-{
-    return fUpdateType;
-}
-
-void plAccountUpdateMsg::SetUpdateType(unsigned type)
-{
-    fUpdateType = type;
-}
-
-unsigned plAccountUpdateMsg::GetResult()
-{
-    return fResult;
-}
-
-void plAccountUpdateMsg::SetResult(unsigned result)
-{
-    fResult = result;
-}
-
-unsigned plAccountUpdateMsg::GetPlayerInt()
-{
-    return fPlayerInt;
-}
-
-void plAccountUpdateMsg::SetPlayerInt(unsigned playerInt)
-{
-    fPlayerInt = playerInt;
-}
-
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h
index fe44001f..b1902d2d 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h
@@ -61,28 +61,28 @@ public:
         kChangePassword,
     };
 
-    plAccountUpdateMsg();
-    plAccountUpdateMsg(unsigned updateType);
+    plAccountUpdateMsg() : fUpdateType(0), fResult(0), fPlayerInt(0) { }
+    plAccountUpdateMsg(uint32_t updateType) : fUpdateType(updateType), fResult(0), fPlayerInt(0) { }
+
+    CLASSNAME_REGISTER(plAccountUpdateMsg);
+    GETINTERFACE_ANY(plAccountUpdateMsg, plMessage);
 
-    CLASSNAME_REGISTER( plAccountUpdateMsg );
-    GETINTERFACE_ANY( plAccountUpdateMsg, plMessage );
-    
     void Read(hsStream* stream, hsResMgr* mgr);
     void Write(hsStream* stream, hsResMgr* mgr);
 
-    unsigned    GetUpdateType();
-    void        SetUpdateType(unsigned type);
+    uint32_t    GetUpdateType() const { return fUpdateType; }
+    void        SetUpdateType(uint32_t type) { fUpdateType = type; }
 
-    unsigned    GetResult();
-    void        SetResult(unsigned result);
+    uint32_t    GetResult() const { return fResult; }
+    void        SetResult(uint32_t result) { fResult = result; }
 
-    unsigned    GetPlayerInt();
-    void        SetPlayerInt(unsigned playerInt);
+    uint32_t    GetPlayerInt() const { return fPlayerInt; }
+    void        SetPlayerInt(uint32_t playerInt) { fPlayerInt = playerInt; }
 
 private:
-    unsigned fUpdateType;
-    unsigned fResult;
-    unsigned fPlayerInt;
+    uint32_t fUpdateType;
+    uint32_t fResult;
+    uint32_t fPlayerInt;
 };
 
 #endif // plAccountUpdateMsg_inc
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp
index be79b06a..5d3d9f42 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp
@@ -40,9 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 
-#include "HeadSpin.h"
-#include "plAnimCmdMsg.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plAnimCmdMsg.h"
 
 plAnimCmdMsg::~plAnimCmdMsg()
 {
@@ -114,16 +115,6 @@ plAGCmdMsg::~plAGCmdMsg()
     ClearCmd();
 }
 
-void plAGCmdMsg::SetAnimName(const plString &name)
-{
-    fAnimName = name;
-}
-
-plString plAGCmdMsg::GetAnimName()
-{
-    return fAnimName;
-}
-
 void plAGCmdMsg::Read(hsStream* stream, hsResMgr* mgr)
 {
     plMessage::IMsgRead(stream, mgr);
@@ -150,14 +141,3 @@ void plAGCmdMsg::Write(hsStream* stream, hsResMgr* mgr)
     stream->WriteSafeString(fAnimName);
 }
 
-/////////////////////////////////////////////////////////////////////////////////////
-
-void plAGDetachCallbackMsg::SetAnimName(const plString &name)
-{
-    fAnimName = name;
-}
-
-plString plAGDetachCallbackMsg::GetAnimName()
-{
-    return fAnimName;
-}
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h
index 0cffb8c3..bc465842 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h
@@ -45,11 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pnMessage/plMessageWithCallbacks.h"
 #include "hsBitVector.h"
-#include "hsTemplates.h"
-#include "hsGeometry3.h"
 #include "plString.h"
-#include "plInterp/plAnimEaseTypes.h"
-#include "plInterp/plAnimTimeConvert.h"
 
 class plAGAnimInstance;
 
@@ -112,7 +108,7 @@ public:
     void SetCmd(int n) { fCmd.SetBit(n); }
     void ClearCmd();
     void SetAnimName(const plString &name) { fAnimName = name; }
-    plString GetAnimName() { return fAnimName; }
+    plString GetAnimName() const { return fAnimName; }
     bool CmdChangesAnimTime(); // Will this command cause an update to the current anim time?
 
     void SetLoopName(const plString &name) { fLoopName = name; }
@@ -166,8 +162,8 @@ public:
     bool Cmd(int n) const { return fCmd.IsBitSet(n); }
     void SetCmd(int n) { fCmd.SetBit(n); }
     void ClearCmd() { fCmd.Clear(); }
-    void SetAnimName(const plString &name);
-    plString GetAnimName();
+    void SetAnimName(const plString& name) { fAnimName = name; }
+    plString GetAnimName() const { return fAnimName; }
 
     float fBlend;
     float fBlendRate;
@@ -209,13 +205,13 @@ public:
 
     CLASSNAME_REGISTER( plAGDetachCallbackMsg );
     GETINTERFACE_ANY( plAGDetachCallbackMsg, plEventCallbackMsg );
-    
+
     // These aren't meant to go across the net, so no IO necessary.
     void Read(hsStream* stream, hsResMgr* mgr) {}
     void Write(hsStream* stream, hsResMgr* mgr) {}
-    
-    void SetAnimName(const plString &name);
-    plString GetAnimName();
+
+    void SetAnimName(const plString& name) { fAnimName = name; }
+    plString GetAnimName() const { return fAnimName; }
 };
 
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp
index 8c20a89a..a7f01148 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp
@@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef SERVER
 #ifndef NO_AV_MSGS
 
-// singular
-#include "plAvCoopMsg.h"
-
-// global
 #include "hsStream.h"
 #include "hsResMgr.h"
+#pragma hdrstop
+
+// singular
+#include "plAvCoopMsg.h"
 
 // other
 #include "plAvatar/plAvatarMgr.h"
@@ -100,7 +100,7 @@ void plAvCoopMsg::Read(hsStream *stream, hsResMgr *mgr)
     plMessage::IMsgRead(stream, mgr);
 
     if(stream->ReadBool())
-        fCoordinator = reinterpret_cast<plCoopCoordinator *>(mgr->ReadCreatable(stream));
+        fCoordinator = plCoopCoordinator::ConvertNoRef(mgr->ReadCreatable(stream));
 
     fInitiatorID = stream->ReadLE32();
     fInitiatorSerial = stream->ReadLE16();
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
index 12b47c4a..11509173 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
@@ -41,17 +41,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #ifndef NO_AV_MSGS
 
-#include "plAvatarMsg.h"
-
 #include "hsResMgr.h"
+#pragma hdrstop
 
-#include "pnKeyedObject/plKey.h"
-#include "pnSceneObject/plSceneObject.h"
+#include "plAvatarMsg.h"
 
 #include "plMessage/plOneShotCallbacks.h"
+#include "pnSceneObject/plSceneObject.h"
 
 #ifndef SERVER
-#include "plAvatar/plAvBrain.h"
+#   include "plAvatar/plAvBrain.h"
 #endif
 
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h
index d9447179..c2a51236 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h
@@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plAvatarMsg_inc
 #define plAvatarMsg_inc
 
-#include "pnMessage/plMessage.h"
 #include "hsBitVector.h"
 #include "plAvatar/plArmatureMod.h"
 #include "pnMessage/plEventCallbackMsg.h"
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.cpp
index 0f5c5ae8..23ce97a1 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.cpp
@@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 
 #include "HeadSpin.h"
-
+#include "hsFastMath.h"
 #include "hsStream.h"
+#pragma hdrstop
 
 #include "plBulletMsg.h"
-#include "hsFastMath.h"
 
 void plBulletMsg::Read(hsStream* stream, hsResMgr* mgr) 
 { 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp
index d1ecefec..03d771bb 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp
@@ -39,11 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "hsStream.h"
-#include "plCCRMsg.h"
 
+#include "hsResMgr.h"
+#include "hsStream.h"
 #include "pnNetCommon/plNetApp.h"
-#include "plResMgr/plResManager.h"
+#pragma hdrstop
+
+#include "plCCRMsg.h"
 #include "plNetCommon/plNetCommon.h"
 
 void plCCRPetitionMsg::Read(hsStream* stream, hsResMgr* mgr) 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp
index 8d33fcff..be40d2a5 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp
@@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 
 #include "HeadSpin.h"
+#pragma hdrstop
+
 #include "plCaptureRenderMsg.h"
 #include "plGImage/plMipmap.h"
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.cpp
index 17980360..cc673adc 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.cpp
@@ -39,12 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-// singular
-#include "plClimbMsg.h"
 
-// global
 #include "hsResMgr.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plClimbMsg.h"
+
 
 plClimbMsg::plClimbMsg()
 : fCommand(kNoCommand),
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.cpp
index 54985659..0393b7bc 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.cpp
@@ -41,10 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 
 #include "HeadSpin.h"
-#include "plDynaDecalEnableMsg.h"
-
 #include "hsResMgr.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plDynaDecalEnableMsg.h"
+
 
 plDynaDecalEnableMsg::plDynaDecalEnableMsg()
 :   plMessage(nil, nil, nil),
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.cpp
index e4ff5e6b..f1c4eabc 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.cpp
@@ -40,9 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 
-#include "plDynamicEnvMapMsg.h"
-
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plDynamicEnvMapMsg.h"
 
 void plDynamicEnvMapMsg::Read(hsStream* s, hsResMgr* mgr)
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.cpp
index aeef41aa..de8b22b3 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.cpp
@@ -47,9 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //////////////////////////////////////////////////////////////////////////////
 
 #include "HeadSpin.h"
-#include "plDynamicTextMsg.h"
-#include "hsResMgr.h"
 #include "hsBitVector.h"
+#include "hsResMgr.h"
+#pragma hdrstop
+
+#include "plDynamicTextMsg.h"
 
 void    plDynamicTextMsg::SetTextColor( hsColorRGBA &c, bool blockRGB )
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plElementRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plElementRefMsg.h
deleted file mode 100644
index f5b09e78..00000000
--- a/Sources/Plasma/PubUtilLib/plMessage/plElementRefMsg.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-// Nuked file. Delete from your source file
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h
index 98bf4a6f..dd77a4c6 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h
@@ -69,7 +69,7 @@ public:
     GETINTERFACE_ANY(plExcludeRegionMsg, plMessage);
     
     void SetCmd(CmdType cmd) { fCmd = cmd; }
-    uint8_t GetCmd() { return fCmd; }
+    uint8_t GetCmd() const { return fCmd; }
 
     uint32_t fSynchFlags;
     // IO 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp
index 1d7e3b57..c9c375cb 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp
@@ -41,10 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 
 #include "HeadSpin.h"
-#include "plInputEventMsg.h"
+#include "hsBitVector.h"
 #include "pnKeyedObject/plKey.h"
 #include "hsResMgr.h"
-#include "hsBitVector.h"
+#pragma hdrstop
+
+#include "plInputEventMsg.h"
 
 plInputEventMsg::plInputEventMsg() :
 fEvent(-1)
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp
index 6f04c68a..2215fe14 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp
@@ -39,28 +39,44 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-//////////////////////////////////////////////////////////////////////////////
-//                                                                          //
-//  plInputIfaceMgrMsg                                                      //
-//  Message wrapper for commands to plDynamicTextMap.                       //
-//                                                                          //
-//////////////////////////////////////////////////////////////////////////////
-
-#include "HeadSpin.h"
+
+#include "hsResMgr.h"
+#pragma hdrstop
+
 #include "plInputIfaceMgrMsg.h"
 #include "plInputCore/plInputInterface.h"
-#include "hsResMgr.h"
-#include "hsRefCnt.h"
 
+plInputIfaceMgrMsg::~plInputIfaceMgrMsg()
+{
+    hsRefCnt_SafeUnRef(fInterface);
+}
 
-plInputIfaceMgrMsg::~plInputIfaceMgrMsg() 
+void    plInputIfaceMgrMsg::SetIFace(plInputInterface* iface)
 {
-    if( fInterface != nil )
-        hsRefCnt_SafeUnRef( fInterface );
+    fInterface = iface;
+    hsRefCnt_SafeRef(fInterface);
 }
 
-void    plInputIfaceMgrMsg::SetIFace( plInputInterface *iface )
+void plInputIfaceMgrMsg::Read(hsStream* s, hsResMgr* mgr)
 {
-    fInterface = iface; 
-    hsRefCnt_SafeRef( fInterface );
+    plMessage::IMsgRead(s, mgr);
+
+    s->ReadLE(&fCommand);
+    s->ReadLE(&fPageID);
+    ageName = s->ReadSafeString();
+    ageFileName = s->ReadSafeString();
+    spawnPoint = s->ReadSafeString();
+    fAvKey = mgr->ReadKey(s);
+}
+
+void plInputIfaceMgrMsg::Write(hsStream* s, hsResMgr* mgr)
+{
+    plMessage::IMsgWrite(s, mgr);
+
+    s->WriteLE(fCommand);
+    s->WriteLE(fPageID);
+    s->WriteSafeString(ageName);
+    s->WriteSafeString(ageFileName);
+    s->WriteSafeString(spawnPoint);
+    mgr->WriteKey(s, fAvKey);
 }
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h
index 9499da28..43c1a188 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h
@@ -50,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "HeadSpin.h"
 #include "hsStream.h"
-#include "hsResMgr.h"
 #include "pnMessage/plMessage.h"
 #include "pnUUID/pnUUID.h"
 
@@ -97,43 +96,23 @@ class plInputIfaceMgrMsg : public plMessage
         CLASSNAME_REGISTER( plInputIfaceMgrMsg );
         GETINTERFACE_ANY( plInputIfaceMgrMsg, plMessage );
 
-        virtual void Read(hsStream* s, hsResMgr* mgr) 
-        { 
-            plMessage::IMsgRead( s, mgr ); 
-            s->ReadLE( &fCommand );
-            s->ReadLE( &fPageID );
-            ageName = s->ReadSafeString();
-            ageFileName = s->ReadSafeString();
-            spawnPoint = s->ReadSafeString();
-            fAvKey = mgr->ReadKey(s);
-        }
-        
-        virtual void Write(hsStream* s, hsResMgr* mgr) 
-        { 
-            plMessage::IMsgWrite( s, mgr ); 
-            s->WriteLE( fCommand );
-            s->WriteLE( fPageID );
-            s->WriteSafeString(ageName);
-            s->WriteSafeString(ageFileName);
-            s->WriteSafeString(spawnPoint);
-            mgr->WriteKey(s,fAvKey);
-        }
-
-        void        SetAgeName(const plString& s) { ageName = s; }
-        plString    GetAgeName() const { return ageName; }
-        void        SetAgeFileName(const plString& s) { ageFileName = s; }
-        plString    GetAgeFileName() const { return ageFileName; }
-        void        SetSpawnPoint(const plString& s) { spawnPoint = s; }
-        plString    GetSpawnPoint() const { return spawnPoint; }
-        void        SetAgeInstanceGuid(const plUUID& guid) { ageInstanceGuid = guid; }
-        const plUUID& GetAgeInstanceGuid() const { return ageInstanceGuid; }
-        uint8_t       GetCommand() const { return fCommand; }
-        uint32_t      GetPageID() const { return fPageID; }
-        void                SetIFace( plInputInterface *iface );
-        plInputInterface    *GetIFace() const { return fInterface; }
-        plKey&      GetAvKey( void ) { return fAvKey; }
-        const plKey&    GetAvKey( void ) const { return fAvKey; }
-        void        SetAvKey( plKey& k ) { fAvKey = k; }
+        virtual void Read(hsStream* s, hsResMgr* mgr);
+        virtual void Write(hsStream* s, hsResMgr* mgr);
+
+        void              SetAgeName(const plString& s) { ageName = s; }
+        plString          GetAgeName() const { return ageName; }
+        void              SetAgeFileName(const plString& s) { ageFileName = s; }
+        plString          GetAgeFileName() const { return ageFileName; }
+        void              SetSpawnPoint(const plString& s) { spawnPoint = s; }
+        plString          GetSpawnPoint() const { return spawnPoint; }
+        void              SetAgeInstanceGuid(const plUUID& guid) { ageInstanceGuid = guid; }
+        const plUUID&     GetAgeInstanceGuid() const { return ageInstanceGuid; }
+        uint8_t           GetCommand() const { return fCommand; }
+        uint32_t          GetPageID() const { return fPageID; }
+        void              SetIFace(plInputInterface *iface);
+        plInputInterface* GetIFace() const { return fInterface; }
+        plKey             GetAvKey() const { return fAvKey; }
+        void              SetAvKey(const plKey& k ) { fAvKey = k; }
 };
 
 #endif // _plInputIfaceMgrMsg_h
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.cpp
index c277d098..42ae4c1d 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.cpp
@@ -40,19 +40,30 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 
-#include "HeadSpin.h"
+#include "hsResMgr.h"
+#include "hsStream.h"
+#pragma hdrstop
+
 #include "plLOSHitMsg.h"
 
-plLOSHitMsg::plLOSHitMsg()
+void plLOSHitMsg::Read(hsStream* stream, hsResMgr* mgr)
 {
-    SetBCastFlag(plMessage::kPropagateToModifiers);
-    fHitFlags = 0;
+    plMessage::IMsgRead(stream, mgr);
+
+    fObj = mgr->ReadKey(stream);
+    fHitPoint.Read(stream);
+    fNoHit = stream->ReadBool();
+    stream->ReadLE(&fRequestID);
+    stream->ReadLE(&fHitFlags);
 }
-plLOSHitMsg::plLOSHitMsg(const plKey &s, 
-                const plKey &r, 
-                const double* t)
-: plMessage(s, r, t)
+
+void plLOSHitMsg::Write(hsStream* stream, hsResMgr* mgr)
 {
-    SetBCastFlag(plMessage::kPropagateToModifiers);
-    fHitFlags = 0;
+    plMessage::IMsgWrite(stream, mgr);
+
+    mgr->WriteKey(stream, fObj);
+    fHitPoint.Write(stream);
+    stream->WriteBool(fNoHit);
+    stream->WriteLE(fRequestID);
+    stream->WriteLE(fHitFlags);
 }
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h
index 3fac1d5d..b40a9efb 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h
@@ -44,54 +44,34 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plLOSHitMsg_inc
 
 #include "pnMessage/plMessage.h"
-#include "hsStream.h"
-#include "hsResMgr.h"
 #include "hsGeometry3.h"
 
-
 class plLOSHitMsg : public plMessage
 {
-protected:
-
 public:
-    
     plKey               fObj;
     hsPoint3            fHitPoint;
     bool                fNoHit;
-    uint32_t              fRequestID;
-    uint32_t              fHitFlags;
+    uint32_t            fRequestID;
+    uint32_t            fHitFlags;
     hsVector3           fNormal;
     float               fDistance;
 
-    plLOSHitMsg();
-    plLOSHitMsg(const plKey &s, 
-                    const plKey &r, 
-                    const double* t);
-    ~plLOSHitMsg(){;}
-
-    CLASSNAME_REGISTER( plLOSHitMsg );
-    GETINTERFACE_ANY( plLOSHitMsg, plMessage );
+    plLOSHitMsg() : fHitFlags(0) { SetBCastFlag(plMessage::kPropagateToModifiers); }
 
-    // IO 
-    void Read(hsStream* stream, hsResMgr* mgr)
+    plLOSHitMsg(const plKey& s, const plKey& r, const double* t) :
+        fHitFlags(0),
+        plMessage(s, r, t)
     {
-        plMessage::IMsgRead(stream, mgr);
-        fObj = mgr->ReadKey(stream);
-        fHitPoint.Read(stream);
-        fNoHit = stream->ReadBool();
-        stream->ReadLE(&fRequestID);
-        stream->ReadLE(&fHitFlags);
+        SetBCastFlag(plMessage::kPropagateToModifiers);
     }
 
-    void Write(hsStream* stream, hsResMgr* mgr)
-    {
-        plMessage::IMsgWrite(stream, mgr);
-        mgr->WriteKey(stream, fObj);
-        fHitPoint.Write(stream);
-        stream->WriteBool(fNoHit);
-        stream->WriteLE(fRequestID);
-        stream->WriteLE(fHitFlags);
-    }
+    CLASSNAME_REGISTER( plLOSHitMsg );
+    GETINTERFACE_ANY( plLOSHitMsg, plMessage );
+
+    // IO
+    void Read(hsStream* stream, hsResMgr* mgr);
+    void Write(hsStream* stream, hsResMgr* mgr);
 };
 
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp
index 9f49126e..399f87f3 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp
@@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plLOSRequestMsg.h"
+
 #include "hsResMgr.h"
 #include "pnKeyedObject/plUoid.h"
+#pragma hdrstop
+
+#include "plLOSRequestMsg.h"
 
 plLOSRequestMsg::plLOSRequestMsg()
     : fRequestID(0),
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.cpp
index 437f3611..40d3e475 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.cpp
@@ -41,8 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 
 #include "HeadSpin.h"
-#include "plLayRefMsg.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plLayRefMsg.h"
 
 void plLayRefMsg::Read(hsStream* stream, hsResMgr* mgr)
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp
index f01a4100..b305e194 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp
@@ -39,14 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "hsStream.h"
-#include "plLinkToAgeMsg.h"
-#include "hsResMgr.h"
 
 #include "plgDispatch.h"
+#include "hsResMgr.h"
+#include "hsStream.h"
+#pragma hdrstop
+
+#include "plLinkToAgeMsg.h"
 #include "plNetCommon/plNetServerSessionInfo.h"
 #include "plNetCommon/plNetCommon.h"
-#include "hsBitVector.h"
 #include "pnNetCommon/plNetApp.h"
 
 /////////////////////////////////////////////////////////////////////////
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h
index 625f5ca5..8aa45ed2 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h
@@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plLinkToAgeMsg_INC
 #define plLinkToAgeMsg_INC
 
-#include "pnMessage/plMessageWithCallbacks.h"
 #include "pnMessage/plEventCallbackMsg.h"
 #include "plNetCommon/plNetServerSessionInfo.h"
 #include "plNetCommon/plNetCommonHelpers.h"
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp
index 72d36c96..03af2e54 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp
@@ -41,11 +41,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 
 #include "HeadSpin.h"
-#include "hsStream.h"
-#include "plListenerMsg.h"
 #include "hsResMgr.h"
+#include "hsStream.h"
+
 #include "pnKeyedObject/plUoid.h"
 #include "pnKeyedObject/plFixedKey.h"
+#pragma hdrstop
+
+#include "plListenerMsg.h"
 
 
 void plListenerMsg::Read(hsStream* s, hsResMgr* mgr) 
@@ -74,10 +77,6 @@ plSetListenerMsg::plSetListenerMsg( uint8_t type, const plKey &srcKey, bool bind
     Set( srcKey, type, binding );
 }
 
-plSetListenerMsg::~plSetListenerMsg()
-{
-}
-
 void plSetListenerMsg::Read( hsStream *s, hsResMgr *mgr )
 {
     plMessage::IMsgRead(s, mgr); 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h
index e0402958..669d0f7e 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h
@@ -104,8 +104,7 @@ public:
 
     plSetListenerMsg() : plMessage( nil, nil, nil ) { fType = 0; fBinding = false; }
     plSetListenerMsg( uint8_t type, const plKey &srcKey, bool binding );
-    ~plSetListenerMsg();
-    
+
     CLASSNAME_REGISTER( plSetListenerMsg );
     GETINTERFACE_ANY( plSetListenerMsg, plMessage );
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.cpp
index 0c607028..c7379a90 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.cpp
@@ -39,14 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "hsStream.h"
-#include "plLoadAgeMsg.h"
-#include "hsResMgr.h"
 
 #include "hsBitVector.h"
+#include "hsResMgr.h"
+#include "hsStream.h"
+#pragma hdrstop
 
-void plLoadAgeMsg::Read(hsStream* stream, hsResMgr* mgr)    
-{   
+#include "plLoadAgeMsg.h"
+
+void plLoadAgeMsg::Read(hsStream* stream, hsResMgr* mgr)
+{
     plMessage::IMsgRead(stream, mgr);   
 
     // read agename
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp
index d9c82a0c..b7cd7a66 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp
@@ -42,12 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef NO_AV_MSGS
 #ifndef SERVER
 
-#include "hsStream.h"
-#include "plLoadAvatarMsg.h"
 #include "hsResMgr.h"
+#include "hsStream.h"
+
 #include "pnNetCommon/plNetApp.h"
-#include "pnNetCommon/plSynchedObject.h"
+#pragma hdrstop
 
+#include "plLoadAvatarMsg.h"
 #include "plAvatar/plAvatarTasks.h"
 
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp
index 321c0464..afff0163 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp
@@ -42,17 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef NO_AV_MSGS
 #ifndef SERVER
 
-// singular
-#include "plLoadAvatarMsg.h"
-
-// global
+#include "HeadSpin.h"
 #include "hsResMgr.h"
-
-// other
 #include "pnNetCommon/plNetApp.h"
-#include "HeadSpin.h"
-
+#pragma hdrstop
 
+#include "plLoadAvatarMsg.h"
 
 // CTOR / default
 plLoadCloneMsg::plLoadCloneMsg()
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.cpp
index fa5ae34f..5d25ac49 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.cpp
@@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 
-#include "HeadSpin.h"
-#include "plMatrixUpdateMsg.h"
 #include "hsResMgr.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plMatrixUpdateMsg.h"
 
 void plMatrixUpdateMsg::Read(hsStream* stream, hsResMgr* mgr)
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.cpp
index 46cc0c35..9bc32f22 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.cpp
@@ -39,8 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plMultistageMsg.h"
+
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plMultistageMsg.h"
 
 void plMultistageModMsg::Read(hsStream *stream, hsResMgr *mgr)
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h
index 59da9b9c..aa342541 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h
@@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 
 #include "pnUtils/pnUtils.h"
-#include "pnNetBase/pnNetBase.h"
-#include "pnMessage/plMessage.h"
+#include "pnNetBase/pnNbError.h"
 #include "pnNetProtocol/pnNetProtocol.h"
+#include "pnMessage/plMessage.h"
 
 class plNetCommReplyMsg : public plMessage {
 public:
@@ -162,14 +162,4 @@ public:
     GETINTERFACE_ANY(plNetCommUnregisterAgeMsg, plMessage);
 };
 
-class plNetCommDisconnectedMsg : public plMessage {
-public:
-    ENetProtocol    protocol;
-
-    void Read (hsStream * s, hsResMgr * mgr) { plMessage::IMsgRead(s, mgr); }
-    void Write (hsStream * s, hsResMgr * mgr) { plMessage::IMsgWrite(s, mgr); }
-};
-
-
-
 #endif // plNetCommMsgs_inc
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.cpp
index 0f48e6d5..e07876f3 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.cpp
@@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 
-#include "HeadSpin.h"
-#include "plNetVoiceListMsg.h"
-#include "hsStream.h"
 #include "hsResMgr.h"
+#include "hsStream.h"
+#pragma hdrstop
+
+#include "plNetVoiceListMsg.h"
 
 void plNetVoiceListMsg::Read(hsStream* stream, hsResMgr* mgr)
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.cpp b/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.cpp
index 2136648d..bd8b14a9 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.cpp
@@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plOneShotCallbacks.h"
-#include "hsStream.h"
 
 #include "hsResMgr.h"
+#include "hsStream.h"
+#pragma hdrstop
+
+#include "plOneShotCallbacks.h"
 
 plOneShotCallbacks::plOneShotCallbacks()
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plOneShotMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plOneShotMsg.cpp
index 240bfe1e..78c38b34 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plOneShotMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plOneShotMsg.cpp
@@ -39,6 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+
+#pragma hdrstop
+
 #include "plOneShotMsg.h"
 #include "plOneShotCallbacks.h"
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp
index 6304aae2..4cd6e9b5 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp
@@ -41,11 +41,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 
 #include "HeadSpin.h"
-#include "plRenderRequestMsg.h"
-#include "pnKeyedObject/plUoid.h"
-#include "pnKeyedObject/plFixedKey.h"
 #include "hsResMgr.h"
 
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plUoid.h"
+#pragma hdrstop
+
+#include "plRenderRequestMsg.h"
+
 
 plRenderRequestMsg::plRenderRequestMsg(plKey sender, plRenderRequestBase* req)
 :   plMessage(sender, nil, nil),
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h
index e0e5794c..c956ad50 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h
@@ -44,18 +44,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _plResMgrHelperMsg_h
 
 #include "HeadSpin.h"
-#include "hsStream.h"
 #include "pnMessage/plMessage.h"
-#include "plResMgr/plResManagerHelper.h"
 
 class plResManagerHelper;
+class plResPageKeyRefList;
+
 class plResMgrHelperMsg : public plMessage
 {
 protected:
 
     friend class plResManagerHelper;
 
-    plResPageKeyRefList *fKeyList;
+    plResPageKeyRefList* fKeyList;
 
     uint8_t       fCommand;
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.cpp
index c9b844c9..864e4172 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.cpp
@@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plRideAnimatedPhysMsg.h"
-// global
+
 #include "hsResMgr.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plRideAnimatedPhysMsg.h"
 
 plRideAnimatedPhysMsg::plRideAnimatedPhysMsg()
 :fRegion(nil)
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.cpp
index b6ed5e1e..a8c58bee 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.cpp
@@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 
 #include "HeadSpin.h"
-#include "plRippleShapeMsg.h"
-
 #include "hsResMgr.h"
 #include "hsStream.h"
+#pragma hdrstop
 
+#include "plRippleShapeMsg.h"
 
 plRippleShapeMsg::plRippleShapeMsg()
 :   fShape(nil)
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp
index e7049b7c..ae69625e 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp
@@ -39,8 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plMessage/plSimStateMsg.h"
+
 #include "hsResMgr.h"
+#pragma hdrstop
+
+#include "plMessage/plSimStateMsg.h"
 
 void plSubWorldMsg::Read(hsStream *stream, hsResMgr *mgr)
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.cpp
index d29ef620..c35e7a3b 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.cpp
@@ -39,12 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-// singular
-#include "plSwimMsg.h"
 
-// global
 #include "hsResMgr.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plSwimMsg.h"
+
 
 // ctor default ------
 // -------------
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp
index 9746d0e8..19b624a8 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp
@@ -39,8 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plSynchEnableMsg.h"
+
 #include "pnNetCommon/plNetApp.h"
+#pragma hdrstop
+
+#include "plSynchEnableMsg.h"
 
 plSynchEnableMsg::plSynchEnableMsg(bool push, bool enable) : fPush(push), fEnable(enable)
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.cpp
index 129b5d33..dc06c4ff 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.cpp
@@ -39,6 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+
+#pragma hdrstop
+
 #include "plTransitionMsg.h"
 
 plTransitionMsg::~plTransitionMsg()
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plUniqueIdsMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plUniqueIdsMsg.h
deleted file mode 100644
index 19828919..00000000
--- a/Sources/Plasma/PubUtilLib/plMessage/plUniqueIdsMsg.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.cpp
index 4963ac9e..3f102a42 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.cpp
@@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+
 #include "hsStream.h"
-#include "plVaultNotifyMsg.h"
+#pragma hdrstop
 
+#include "plVaultNotifyMsg.h"
 
 plVaultNotifyMsg::plVaultNotifyMsg()
 : fType( kNothing )
diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp
index c15310e0..09f6e6f4 100644
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp
@@ -45,6 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *   
 ***/
 
+#include "hsResMgr.h"
+
 #include "plNetCliAgeLeaver.h"
 #include "plNetClientMgr.h"
 #include "plNetLinkingMgr.h"
diff --git a/Sources/Tools/MaxComponent/plClickDragComponent.cpp b/Sources/Tools/MaxComponent/plClickDragComponent.cpp
index 96eb1c0a..f60a4b9b 100644
--- a/Sources/Tools/MaxComponent/plClickDragComponent.cpp
+++ b/Sources/Tools/MaxComponent/plClickDragComponent.cpp
@@ -74,6 +74,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnMessage/plCursorChangeMsg.h"
 #include "pnMessage/plEventCallbackMsg.h"
 #include "plMessage/plAnimCmdMsg.h"
+#include "plInterp/plAnimEaseTypes.h"
 
 #include "MaxConvert/plConvert.h"
 
diff --git a/Sources/Tools/MaxComponent/plResponderAnim.cpp b/Sources/Tools/MaxComponent/plResponderAnim.cpp
index 92b210c8..bce70669 100644
--- a/Sources/Tools/MaxComponent/plResponderAnim.cpp
+++ b/Sources/Tools/MaxComponent/plResponderAnim.cpp
@@ -69,6 +69,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnSceneObject/plAudioInterface.h"
 #include "pnMessage/plSoundMsg.h"
 
+#include "plInterp/plAnimEaseTypes.h"
 #include "MaxMain/plPlasmaRefMsgs.h"
 
 enum
diff --git a/Sources/Tools/MaxConvert/hsControlConverter.cpp b/Sources/Tools/MaxConvert/hsControlConverter.cpp
index 39cfa8d1..2d4dda62 100644
--- a/Sources/Tools/MaxConvert/hsControlConverter.cpp
+++ b/Sources/Tools/MaxConvert/hsControlConverter.cpp
@@ -61,6 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "MaxMain/plMaxNode.h"
 
 #include "hsMaxLayerBase.h"
+#include "plInterp/plAnimEaseTypes.h"
 #include "plInterp/plController.h"
 #include "plInterp/hsInterp.h"
 #include "MaxExport/plErrorMsg.h"