diff --git a/Tactical/Boxing.cpp b/Tactical/Boxing.cpp
index dacef732..d6be71e3 100644
--- a/Tactical/Boxing.cpp
+++ b/Tactical/Boxing.cpp
@@ -21,6 +21,7 @@
 	#include "GameSettings.h" // added by SANDRO
 #include <Font Control.h>
 #include <message.h>
+#include "Soldier macros.h"
 
 INT32		gsBoxerGridNo[ NUM_BOXERS ] = { 11393, 11233, 11073 };
 SoldierID	gubBoxerID[ NUM_BOXERS ] = { NOBODY, NOBODY, NOBODY };
diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp
index 20c2321a..3f6daf80 100644
--- a/Tactical/Handle UI.cpp	
+++ b/Tactical/Handle UI.cpp	
@@ -519,7 +519,7 @@ void HandleRenderDebugInfoModes()
 				static INT32 previousLocation = NOWHERE;
 				static UINT8 previousStance = 0;
 
-				UINT16 usSoldierIndex = NOBODY;
+				SoldierID usSoldierIndex = NOBODY;
 				UINT32 uiMercFlags;
 				FindSoldierFromMouse(&usSoldierIndex, &uiMercFlags);
 				if (usSoldierIndex == NOBODY)
diff --git a/Tactical/Handle UI.h b/Tactical/Handle UI.h
index acfc4cab..ae12e413 100644
--- a/Tactical/Handle UI.h	
+++ b/Tactical/Handle UI.h	
@@ -184,6 +184,7 @@ extern UINT32		guiCurrentEvent;
 extern INT16			gsSelectedLevel;
 extern BOOLEAN		gfPlotNewMovement;
 extern UINT32		guiPendingOverrideEvent;
+extern UINT8 gRenderDebugInfoMode;
 
 
 // GLOBALS
diff --git a/Tactical/PATHAI.cpp b/Tactical/PATHAI.cpp
index b0bee699..404bdd71 100644
--- a/Tactical/PATHAI.cpp
+++ b/Tactical/PATHAI.cpp
@@ -36,6 +36,9 @@
 #include "BinaryHeap.hpp"
 #include "opplist.h"
 #include "Weapons.h"
+#include "renderworld.h"
+#include "Cheats.h"
+#include "Handle UI.h"
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp
index e2a417d4..beb3a108 100644
--- a/TacticalAI/AIMain.cpp
+++ b/TacticalAI/AIMain.cpp
@@ -463,13 +463,6 @@ BOOLEAN InitAI( void )
 	FILE *		DebugFile;
 #endif
 
-#ifdef _DEBUG
-	if (gfDisplayCoverValues)
-	{
-		//memset( gsCoverValue, 0x7F, sizeof( INT16 ) * WORLD_MAX );
-	}
-#endif
-
 	//If we are not loading a saved game ( if we are, this has already been called )
 	if( !( gTacticalStatus.uiFlags & LOADING_SAVED_GAME ) )
 	{
@@ -849,10 +842,8 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) // FIXME - this function is named
 #ifdef JA2TESTVERSION
 				// display deadlock message
 				gfUIInDeadlock = TRUE;
-				gUIDeadlockedSoldier = pSoldier->ubID;
 				DebugAI(  String("DEADLOCK soldier %d action %s ABC %d", pSoldier->ubID.i, gzActionStr[pSoldier->aiData.bAction], gTacticalStatus.ubAttackBusyCount ) );
 #else
-
 				// If we are in beta version, also report message!
 #ifdef JA2BETAVERSION
 				ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_ERROR, L"Aborting AI deadlock for %d. Please sent DEBUG.TXT file and SAVE.", pSoldier->ubID.i );
diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp
index ad63ae94..7aed3654 100644
--- a/TileEngine/renderworld.cpp
+++ b/TileEngine/renderworld.cpp
@@ -8005,6 +8005,11 @@ void RenderRoomInfo( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStartPoi
 
 
 #ifdef _DEBUG
+// From fov.cpp
+extern UINT8* gubGridNoMarkers;
+extern UINT8 gubGridNoValue;
+extern UINT8* gubFOVDebugInfoInfo;
+
 void RenderFOVDebugInfo( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStartPointX_S, INT16 sStartPointY_S, INT16 sEndXS, INT16 sEndYS )
 {
 	INT8				bXOddFlag = 0;
@@ -8215,6 +8220,17 @@ void RenderGridNoVisibleDebugInfo( INT16 sStartPointX_M, INT16 sStartPointY_M, I
 	UnLockVideoSurface( FRAME_BUFFER );
 
 }
+
+
+void RenderFOVDebug()
+{
+	RenderFOVDebugInfo(gsStartPointX_M, gsStartPointY_M, gsStartPointX_S, gsStartPointY_S, gsEndXS, gsEndYS);
+}
+
+void RenderGridNoVisibleDebug()
+{
+	RenderGridNoVisibleDebugInfo(gsStartPointX_M, gsStartPointY_M, gsStartPointX_S, gsStartPointY_S, gsEndXS, gsEndYS);
+}
 #endif