diff --git a/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt
index ee506969..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
@@ -119,6 +117,7 @@ set(plMessage_HEADERS
     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 bc71ac71..100286fa 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp
@@ -42,9 +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 "hsStream.h"
+#pragma hdrstop
+
+#include "plAIMsg.h"
 
 #include "plAvatar/plArmatureMod.h"
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.cpp
index 981c2ab1..f0383da7 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.cpp
@@ -39,8 +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
+
+#include "plAccountUpdateMsg.h"
+
 
 void plAccountUpdateMsg::Read(hsStream* stream, hsResMgr* mgr)
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp
index 25fc21a3..5d3d9f42 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp
@@ -40,8 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 
-#include "plAnimCmdMsg.h"
 #include "hsStream.h"
+#pragma hdrstop
+
+#include "plAnimCmdMsg.h"
 
 plAnimCmdMsg::~plAnimCmdMsg()
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp
index bfbf3476..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"
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
index 66c10785..9c68a04f 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/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/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 e2b94fa2..2215fe14 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp
@@ -39,16 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-//////////////////////////////////////////////////////////////////////////////
-//                                                                          //
-//  plInputIfaceMgrMsg                                                      //
-//  Message wrapper for commands to plDynamicTextMap.                       //
-//                                                                          //
-//////////////////////////////////////////////////////////////////////////////
+
+#include "hsResMgr.h"
+#pragma hdrstop
 
 #include "plInputIfaceMgrMsg.h"
 #include "plInputCore/plInputInterface.h"
-#include "hsResMgr.h"
 
 plInputIfaceMgrMsg::~plInputIfaceMgrMsg()
 {
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.cpp
index 77bf26c0..42ae4c1d 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.cpp
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.cpp
@@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsResMgr.h"
 #include "hsStream.h"
+#pragma hdrstop
 
 #include "plLOSHitMsg.h"
 
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/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/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/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/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 )