--- a/src/macros.h	Wed Jan 24 19:19:12 2007 +0000
+++ b/src/macros.h	Wed Jan 24 21:23:35 2007 +0000
@@ -3,8 +3,6 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "map.h"
-
 /// Fetch n bits starting at bit s from x
 #define GB(x, s, n) (((x) >> (s)) & ((1U << (n)) - 1))
 /// Set n bits starting at bit s in x to d

--- a/src/strgen/strgen.cpp	Wed Jan 24 19:19:12 2007 +0000
+++ b/src/strgen/strgen.cpp	Wed Jan 24 21:23:35 2007 +0000
@@ -27,14 +27,6 @@
 #define stderr stdout
 #endif /* __MORPHOS__ */
 
-#ifdef __WATCOMC__
-	uint _map_log_x;     // an unpleasant hack required because Watcom is insisting on
-	uint _map_size_x;    // these variables being valid references in map.h
-	uint _map_size_y;
-	uint _map_tile_mask;
-	uint _map_size;
-#endif /* __WATCOMC__ */
-
 /* Compiles a list of strings into a compiled string list */
 
 typedef void (*ParseCmdProc)(char *buf, int value);