* minor cleanups

client/CGameInfo.h

@@ -2,8 +2,6 @@
 #define __CGAMEINFO_H__
 #include "../global.h"
 
-#include <vector>
-
 
 /*
  * CGameInfo.h, part of VCMI engine

client/Graphics.cpp

@@ -18,6 +18,7 @@
 #include "../hch/CTownHandler.h"
 #include "../hch/CObjectHandler.h"
 #include "../hch/CGeneralTextHandler.h"
+#include "../hch/CCreatureHandler.h"
 
 using namespace boost::assign;
 using namespace CSDL_Ext;

client/SDL_Extensions.h

@@ -1,7 +1,7 @@
 #ifndef __SDL_EXTENSIONS_H__
 #define __SDL_EXTENSIONS_H__
 #include "../global.h"
-#include "SDL.h"
+#include "SDL_Video.h"
 #include "SDL_ttf.h"
 #include <string>
 #include <vector>

hch/CLodHandler.h

@@ -1,11 +1,9 @@
 #ifndef __CLODHANDLER_H__
 #define __CLODHANDLER_H__
 #include "../global.h"
-#include <fstream>
 #include <vector>
 #include <string>
 #include "../nodrze.h"
-#include <SDL_stdinc.h>
 
 /*
  * CLodhandler.h, part of VCMI engine
@@ -31,10 +29,10 @@ namespace NLoadHandlerHelp
 
 struct LodEntry {
 	char filename[16];
-	Uint32 offset;				/* little endian */
-	Uint32 uncompressedSize;	/* little endian */
-	Uint32 unused;				/* little endian */
-	Uint32 size;				/* little endian */
+	ui32 offset;				/* little endian */
+	ui32 uncompressedSize;	/* little endian */
+	ui32 unused;				/* little endian */
+	ui32 size;				/* little endian */
 };
 
 DLL_EXPORT int readNormalNr (const unsigned char * bufor, int pos, int bytCon = 4, bool cyclic = false);

hch/CObjectHandler.cpp

@@ -15,6 +15,7 @@
 #include "CTownHandler.h"
 #include "CArtHandler.h"
 #include "CSoundBase.h"
+#include "CCreatureHandler.h"
 #include "../lib/VCMI_Lib.h"
 #include "../lib/IGameCallback.h"
 #include "../lib/CGameState.h"

hch/CObjectHandler.h

@@ -6,8 +6,6 @@
 #include <set>
 #include <map>
 #include <list>
-#include "CCreatureHandler.h"
-#include "../lib/HeroBonus.h"
 #ifndef _MSC_VER
 #include "CHeroHandler.h"
 #include "CTownHandler.h"

hch/CSpellHandler.h

@@ -6,7 +6,6 @@
 #include <set>
 
 #include "CSoundBase.h"
-//#include "map.h"
 
 /*
  * CSpellHandler.h, part of VCMI engine

lib/NetPacksLib.cpp

@@ -8,6 +8,7 @@
 #include "VCMI_Lib.h"
 #include "map.h"
 #include "../hch/CSpellHandler.h"
+#include "../hch/CCreatureHandler.h"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>

server/CGameHandler.cpp

@@ -8,6 +8,7 @@
 #include "../hch/CSpellHandler.h"
 #include "../hch/CGeneralTextHandler.h"
 #include "../hch/CTownHandler.h"
+#include "../hch/CCreatureHandler.h"
 #include "../lib/CGameState.h"
 #include "../lib/CondSh.h"
 #include "../lib/NetPacks.h"

server/CVCMIServer.cpp

@@ -12,6 +12,7 @@
 #include "../hch/CObjectHandler.h"
 #include "../hch/CBuildingHandler.h"
 #include "../hch/CSpellHandler.h"
+#include "../hch/CCreatureHandler.h"
 #include "zlib.h"
 #ifndef __GNUC__
 #include <tchar.h>