Precompiled Headers for pfPython

Also did some work on decreasing header bloat. No promises on a complete job--this was just enough to allow PCH to actually help us out (and boy does it!) With an Intel Core 2 Duo (4GB DDR2 800) With PCH: 50.51 seconds Without: 4 minutes, 17.14 seconds :D
2025-07-14 10:37:41 -04:00 · 2012-06-15 22:23:48 -04:00
parent b8ffef0c25
commit d43073949b
290 changed files with 1169 additions and 837 deletions
--- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include "../../pyKey.h"
+#pragma hdrstop
+
 #include "pyBlueSpiralGame.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h
@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the BlueSpiral game client
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
-#include "../../pyKey.h"

 class pyBlueSpiralGame : public pyGameCli
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGameGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGameGlue.cpp
@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyBlueSpiralGame.h"

 #include <Python.h>
+#include "../../pyKey.h"
+#pragma hdrstop
+
+#include "pyBlueSpiralGame.h"
 #include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#pragma hdrstop
+
 #include "pyBlueSpiralMsg.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h
@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for BlueSpiral game messages
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
--- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyBlueSpiralMsg.h"
-#include "../../pyEnum.h"

 #include <Python.h>
+#pragma hdrstop
+
+#include "pyBlueSpiralMsg.h"
+#include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include "../../pyKey.h"
+#pragma hdrstop
+
 #include "pyClimbingWallGame.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h
@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the climbing wall game client
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
-#include "../../pyKey.h"

 class pyClimbingWallGame : public pyGameCli
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGameGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGameGlue.cpp
@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyClimbingWallGame.h"

 #include <Python.h>
+#include "../../pyKey.h"
+#pragma hdrstop
+
+#include "pyClimbingWallGame.h"
 #include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#pragma hdrstop
+
 #include "pyClimbingWallMsg.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h
@ -48,9 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for ClimbingWall game messages
 //
-#include <Python.h>

-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
--- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsgGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsgGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyClimbingWallMsg.h"
-#include "../../pyEnum.h"

 #include <Python.h>
+#pragma hdrstop
+
+#include "pyClimbingWallMsg.h"
+#include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include "../../pyKey.h"
+#pragma hdrstop
+
 #include "pyHeekGame.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h
@ -49,12 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper for the Heek game client
 //

-#include <Python.h>
-#include "pfGameMgr/pfGameMgr.h"
-
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
-#include "../../pyKey.h"

 class pyHeekGame : public pyGameCli
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGameGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGameGlue.cpp
@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyHeekGame.h"

 #include <Python.h>
+#include "../../pyKey.h"
+#pragma hdrstop
+
+#include "pyHeekGame.h"
 #include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#pragma hdrstop
+
 #include "pyHeekMsg.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h
@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for Heek game messages
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsgGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsgGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyHeekMsg.h"
-#include "../../pyEnum.h"

 #include <Python.h>
+#pragma hdrstop
+
+#include "pyHeekMsg.h"
+#include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.cpp
@ -39,7 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#include "../../pyKey.h"
+#pragma hdrstop
+
 #include "pyMarkerGame.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h
@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the Marker game client
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
-#include "../../pyKey.h"

 class pyMarkerGame : public pyGameCli
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGameGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGameGlue.cpp
@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyMarkerGame.h"

 #include <Python.h>
+#include "../../pyKey.h"
+#pragma hdrstop
+
+#include "pyMarkerGame.h"
 #include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#pragma hdrstop
+
 #include "pyMarkerMsg.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h
@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for Marker game messages
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
--- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsgGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsgGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyMarkerMsg.h"
-#include "../../pyEnum.h"

 #include <Python.h>
+#pragma hdrstop
+
+#include "pyMarkerMsg.h"
+#include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include "../../pyKey.h"
+#pragma hdrstop
+
 #include "pyTTTGame.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h
@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the TTT game client
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
-#include "../../pyKey.h"

 class pyTTTGame : public pyGameCli
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGameGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGameGlue.cpp
@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyTTTGame.h"

 #include <Python.h>
+#include "../../pyKey.h"
+#pragma hdrstop
+
+#include "pyTTTGame.h"
 #include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#pragma hdrstop
+
 #include "pyTTTMsg.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h
@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for TTT game messages
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
--- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsgGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsgGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyTTTMsg.h"
-#include "../../pyEnum.h"

 #include <Python.h>
+#pragma hdrstop
+
+#include "pyTTTMsg.h"
+#include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include "../../pyKey.h"
+#pragma hdrstop
+
 #include "pyVarSyncGame.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h
@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the VarSync game client
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
-#include "../../pyKey.h"

 class pyVarSyncGame : public pyGameCli
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGameGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGameGlue.cpp
@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyVarSyncGame.h"

 #include <Python.h>
+#include "../../pyKey.h"
+#pragma hdrstop
+
+#include "pyVarSyncGame.h"
 #include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#pragma hdrstop
+
 #include "pyVarSyncMsg.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h
@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for VarSync game messages
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
--- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsgGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsgGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyVarSyncMsg.h"
-#include "../../pyEnum.h"

 #include <Python.h>
+#pragma hdrstop
+
+#include "pyVarSyncMsg.h"
+#include "../../pyEnum.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp
@ -39,7 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#include "../pyKey.h"
+#pragma hdrstop
+
 #include "pyGameCli.h"
+#include "pfGameMgr/pfGameMgr.h"

 #include "TicTacToe/pyTTTGame.h"
 #include "Heek/pyHeekGame.h"
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h
@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper for the game client base class
 //

-#include <Python.h>
-#include "pfGameMgr/pfGameMgr.h"
-
 #include "../pyGlueHelpers.h"
-#include "../pyKey.h"
+#include <string>
+#include <vector>
+
+class pfGameCli;

 class pyGameCli
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyGameCli.h"
-#include "../pyEnum.h"

 #include <Python.h>
+#include "../pyKey.h"
+#pragma hdrstop
+
+#include "pyGameCli.h"
+#include "../pyEnum.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp
@ -39,9 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#pragma hdrstop
+
 #include "pyGameCliMsg.h"
 #include "pyGameCli.h"

+#include "pfGameMgr/pfGameMgr.h"
 #include "TicTacToe/pyTTTMsg.h"
 #include "Heek/pyHeekMsg.h"
 #include "Marker/pyMarkerMsg.h"
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h
@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for game client messages
 //
-#include <Python.h>
-
-#include "pfGameMgr/pfGameMgr.h"

 #include "../pyGlueHelpers.h"
+#include "pnGameMgr/pnGameMgr.h" // :(
+
+class pfGameCliMsg;

 class pyGameCliMsg
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsgGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsgGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyGameCliMsg.h"
-#include "../pyEnum.h"

 #include <Python.h>
+#pragma hdrstop
+
+#include "pfGameMgr/pfGameMgr.h"
+#include "pyGameCliMsg.h"
+#include "../pyEnum.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp
@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
+
+#include <Python.h>
+#pragma hdrstop
+
 #include "pyGameMgrMsg.h"
+#include "pfGameMgr/pfGameMgr.h"

 ///////////////////////////////////////////////////////////////////////////////
 //
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h
@ -49,11 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper for game manager messages
 //

-#include <Python.h>
-#include "hsStlUtils.h"
-#include "pfGameMgr/pfGameMgr.h"
-
 #include "../pyGlueHelpers.h"
+#include <string>
+
+class pfGameMgrMsg;

 class pyGameMgrMsg
 {
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsgGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsgGlue.cpp
@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "pyGameMgrMsg.h"
-#include "../pyEnum.h"

 #include <Python.h>
+#pragma hdrstop
+
+#include "pyGameMgrMsg.h"
+#include "pfGameMgr/pfGameMgr.h"
+#include "../pyEnum.h"

 ///////////////////////////////////////////////////////////////////////////////
 //