diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c
index df69b9888..d60a7ff06 100644
--- a/src/common/kernel/reports.c
+++ b/src/common/kernel/reports.c
@@ -599,8 +599,7 @@ bufunit_ugroupleader(const faction * f, const unit * u, int indent, int mode)
 #endif
 
 void
-spskill(const struct locale * lang, const struct unit * u, skill_t sk, int *dh,
-		  boolean days)
+spskill(const struct locale * lang, const struct unit * u, skill_t sk, int *dh, int days)
 {
 	char * sbuf = buf+strlen(buf);
 	int i, effsk;
diff --git a/src/config.h b/src/config.h
index e6a330cb7..dc8050d0e 100644
--- a/src/config.h
+++ b/src/config.h
@@ -46,7 +46,7 @@
 # include <dmalloc.h>
 #endif
 
-#if defined(__GCC__)
+#if defined(__GNUC__)
 # include <stdbool.h>
 # define HAS_BOOLEAN
 # define boolean bool
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index 42bcbb9c5..71c07d107 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -1404,7 +1404,7 @@ setminmax(void)
 	MINY -= 20;
 }
 
-extern boolean quiet;
+extern int quiet;
 
 extern char * g_reportdir;
 extern char * g_datadir;
@@ -1503,7 +1503,9 @@ main(int argc, char *argv[])
 				maxregions = atoi(argv[++i]);
 				maxregions = (maxregions*81+80) / 81;
 				break;
-			case 'q': quiet = true; break;
+			case 'q': 
+				quiet = 1; 
+				break;
 			case 'l':
 				logging = true;
 				break;