diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 1ec9693ea..221c8a689 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -1145,10 +1145,12 @@ report_computer(FILE * F, faction * f, const faction_list * addresses,
 		fprintf(F, "%d;Max. Immigranten\n", count_maxmigrants(f));
 	}
 
+#if HEROES == 1
   i = countheroes(f);
   if (i>0) fprintf(F, "%d;heroes\n", i);
   i = maxheroes(f);
   if (i>0) fprintf(F, "%d;max_heroes\n", i);
+#endif
 
   if (f->age > 1 && f->lastorders != turn) {
     fprintf(F, "%d;nmr\n", turn-f->lastorders);
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 7ab0305d0..58d704d0a 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -2054,6 +2054,7 @@ report(FILE *F, faction * f, const faction_list * addresses,
 			count_migrants(f), maxmig);
 		centre(F, buf, true);
 	}
+#if HEROES == 1
   {
     int maxh = maxheroes(f);
     if (maxh) {
@@ -2062,6 +2063,7 @@ report(FILE *F, faction * f, const faction_list * addresses,
       centre(F, buf, true);
     }
   }
+#endif
 
 	if (f->age > 1 && f->lastorders != turn) {
 		rnl(F);
diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c
index e2f490cb5..4c4050b64 100644
--- a/src/common/kernel/unit.c
+++ b/src/common/kernel/unit.c
@@ -1128,6 +1128,7 @@ unitlist_insert(struct unit_list **ul, struct unit *u)
   *ul = rl2;
 }
 
+#if HEROES == 1
 int 
 maxheroes(const struct faction * f)
 {
@@ -1146,3 +1147,4 @@ countheroes(const struct faction * f)
   }
   return n;
 }
+#endif
diff --git a/src/common/kernel/unit.h b/src/common/kernel/unit.h
index 697955de2..db823e509 100644
--- a/src/common/kernel/unit.h
+++ b/src/common/kernel/unit.h
@@ -60,8 +60,10 @@ struct skill;
 # define UFL_SAVEMASK (UFL_NOAID | UFL_OWNER | UFL_PARTEITARNUNG | UFL_LOCKED | UFL_HUNGER | FFL_NOIDLEOUT | UFL_TAKEALL | UFL_HERO)
 #endif
 
+#if HEROES == 1
 extern int maxheroes(const struct faction * f);
 extern int countheroes(const struct faction * f);
+#endif
 
 typedef struct unit {
 	struct unit *next; /* needs to be first entry, for region's unitlist */