[ZH] Fix header include errors/mistakes for Zero Hour build (#426)

Author: xezon

GeneralsMD/Code/GameEngine/Include/Common/Overridable.h

@@ -31,6 +31,8 @@
 #ifndef _OVERRIDABLE_H_
 #define _OVERRIDABLE_H_
 
+#include "Common/GameMemory.h"
+
 /*
 	In order for something to live in an OVERRIDE<> object, it must be derived from Overridable 
 	(publicly). 

GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h

@@ -36,6 +36,7 @@
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
 #include "Common/Snapshot.h"
+#include "Common/BitFlags.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Player;

GeneralsMD/Code/GameEngine/Include/Common/Xfer.h

@@ -35,8 +35,6 @@
 #define __XFER_H_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/STLTypedefs.h"
-#include "Common/ModelState.h"
 #include "Common/Science.h"
 #include "Common/Upgrade.h"
 

GeneralsMD/Code/GameEngine/Include/Common/crc.h

@@ -32,10 +32,11 @@
 #define _CRC_H_
 
 #include "Lib/BaseType.h"
-#include "winsock2.h" // for htonl
 
 #ifdef _DEBUG
 
+//#include "winsock2.h" // for htonl
+
 class CRC
 {
 public:

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp

@@ -47,7 +47,6 @@
 
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 
-#include "Windows.h"
 #include "mbstring.h"
 
 #include "Common/Debug.h"

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp

@@ -28,8 +28,6 @@
 
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 
-#include "windows.h"
-
 #include "Common/GameType.h"
 #include "Common/MessageStream.h"
 #include "Common/Player.h"

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp

@@ -34,6 +34,8 @@
 
 #define NO_DEBUG_CRC
 
+#include <Windows.h>
+
 #include "Common/CRC.h"
 #include "Common/CRCDebug.h"
 #include "Common/GameState.h"
@@ -43,7 +45,6 @@
 #include "Common/ThingTemplate.h"
 #include "Common/GameLOD.h"
 #include "Common/Xfer.h"
-#include "Common/GameState.h"
 #include "Common/QuickTrig.h"
 #include "GameClient/Drawable.h"
 #include "GameClient/FXList.h"

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/pointgr.cpp

@@ -86,7 +86,7 @@
 #include "rinfo.h"
 #include "camera.h"
 #include "dx8fvf.h"
-#include "D3DXMath.h"
+#include "D3DX8Math.h"
 #include "sortingrenderer.h"
 
 // Upgraded to DX8 2/2/01 HY

GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/FTP.CPP

@@ -33,7 +33,6 @@
 #include <time.h>
 #include "assert.h"
 #include "ftp.h"
-#include "winsock.h"
 #include <time.h>
 #include <direct.h>
 #include <errno.h>

GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/always.h

@@ -41,6 +41,7 @@
 #define ALWAYS_H
 
 #include <assert.h>
+#include <new>
 
 // Disable warning about exception handling not being enabled. It's used as part of STL - in a part of STL we don't use.
 #pragma warning(disable : 4530)