diff --git a/src/b_bot.cpp b/src/b_bot.cpp
index 90acee11c..a7b0e1ffa 100644
--- a/src/b_bot.cpp
+++ b/src/b_bot.cpp
@@ -111,7 +111,7 @@ void InitBotStuff()
 	if (done) return;
 	done = true;
 
-	struct BotInit
+	static struct BotInit
 	{
 		const char *type;
 		int movecombatdist;
@@ -158,7 +158,7 @@ void InitBotStuff()
 		{ "StrifeGrenadeLauncher2", 18350080, WIF_BOT_REACTION_SKILL_THING|WIF_BOT_EXPLOSIVE, "PhosphorousGrenade" },
 	};
 
-	for(int i=0;i<countof(botinits);i++)
+	for(unsigned i=0;i<sizeof(botinits)/sizeof(botinits[0]);i++)
 	{
 		const PClass *cls = PClass::FindClass(botinits[i].type);
 		if (cls != NULL && cls->IsDescendantOf(RUNTIME_CLASS(AWeapon)))
@@ -173,8 +173,8 @@ void InitBotStuff()
 		}
 	}
 
-	static char *warnbotmissiles[] = { "PlasmaBall", "Ripper", "HornRodFX1" };
-	for(int i=0;i<countof(warnbotmissiles);i++)
+	static const char *warnbotmissiles[] = { "PlasmaBall", "Ripper", "HornRodFX1" };
+	for(unsigned i=0;i<countof(warnbotmissiles);i++)
 	{
 		AActor *a = GetDefaultByName (warnbotmissiles[i]);
 		if (a != NULL)
diff --git a/src/g_hexen/a_heresiarch.cpp b/src/g_hexen/a_heresiarch.cpp
index 6d24a69c9..69b3749be 100644
--- a/src/g_hexen/a_heresiarch.cpp
+++ b/src/g_hexen/a_heresiarch.cpp
@@ -71,6 +71,16 @@ static FRandom pr_heresiarch ("Heresiarch");
 
 // The Heresiarch him/itself ------------------------------------------------
 
+class AHeresiarch : public AActor
+{
+	DECLARE_ACTOR (AHeresiarch, AActor)
+public:
+	const PClass *StopBall;
+
+	void Serialize (FArchive &arc);
+	void Die (AActor *source, AActor *inflictor);
+};
+
 FState AHeresiarch::States[] =
 {
 #define S_SORC_SPAWN1 0
diff --git a/src/g_hexen/a_hexenglobal.h b/src/g_hexen/a_hexenglobal.h
index bd8a1b025..96acbe14c 100644
--- a/src/g_hexen/a_hexenglobal.h
+++ b/src/g_hexen/a_hexenglobal.h
@@ -3,16 +3,6 @@
 
 #include "d_player.h"
 
-class AHeresiarch : public AActor
-{
-	DECLARE_ACTOR (AHeresiarch, AActor)
-public:
-	const PClass *StopBall;
-
-	void Serialize (FArchive &arc);
-	void Die (AActor *source, AActor *inflictor);
-};
-
 class AHolySpirit : public AActor
 {
 	DECLARE_CLASS (AHolySpirit, AActor)