Compile fix. Keep StdInc consistent.

lib/CBattleCallback.cpp

@@ -1289,6 +1289,7 @@ AttackableTiles CBattleInfoCallback::getPotentiallyAttackableHexes(const CStack*
 
 	const int WN = GameConstants::BFIELD_WIDTH;
 	ui16 hex = (attackerPos != BattleHex::INVALID) ? attackerPos.hex : attacker->position.hex; //real or hypothetical (cursor) position
+	//FIXME: dragons or cerbers can rotate before attack, making their base hex different (#1124)
 	if (attacker->hasBonusOfType(Bonus::ATTACKS_ALL_ADJACENT))
 	{
 		boost::copy(attacker->getSurroundingHexes(attackerPos), vstd::set_inserter(at.hostileCreaturePositions));

lib/Map/CMap.cpp

@@ -1,3 +1,4 @@
+#include "StdInc.h"
 #include "CMap.h"
 
 #include "../CArtHandler.h"

lib/Map/CMap.h

@@ -11,8 +11,6 @@
 
 #pragma once
 
-#include "StdInc.h"
-
 #include "../ConstTransitivePtr.h"
 #include "../CObjectHandler.h"
 #include "../ResourceSet.h"

lib/Map/CMapInfo.cpp

@@ -1,3 +1,4 @@
+#include "StdInc.h"
 #include "CMapInfo.h"
 
 #include "../StartInfo.h"

lib/Map/CMapInfo.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "StdInc.h"
-
 // Forward class declarations aren't enough here. The compiler
 // generated CMapInfo d-tor, generates the unique_ptr d-tor as well here
 // as a inline method. The unique_ptr d-tor requires a complete type. Defining

lib/Map/CMapService.cpp

@@ -1,3 +1,4 @@
+#include "StdInc.h"
 #include "CMapService.h"
 
 #include "../Filesystem/CResourceLoader.h"

lib/Map/CMapService.h

@@ -11,8 +11,6 @@
 
 #pragma once
 
-#include "StdInc.h"
-
 class CMap;
 class CMapHeader;
 class CInputStream;

lib/RMG/CMapGenOptions.cpp

@@ -1,3 +1,4 @@
+#include "StdInc.h"
 #include "CMapGenOptions.h"
 
 CMapGenOptions::CMapGenOptions() : width(72), height(72), hasTwoLevels(true),

lib/RMG/CMapGenOptions.h

@@ -11,8 +11,6 @@
 
 #pragma once
 
-#include "StdInc.h"
-
 namespace EWaterContent
 {
 	enum EWaterContent