Index: main-ami.c
===================================================================
RCS file: /home/rr9/angband/angband/src/main-ami.c,v
retrieving revision 1.18
diff -u -p -r1.18 main-ami.c
--- main-ami.c	5 Mar 2005 11:03:23 -0000	1.18
+++ main-ami.c	28 Oct 2005 16:56:02 -0000
@@ -17,6 +17,10 @@
 	WWW			: http://www.angband.pwp.blueyonder.co.uk
 */
 
+#include "angband.h"
+
+#ifdef USE_AMI
+
 /* Variant name and version */
 #define VARIANT "Angband 3.0.1"
 
@@ -26,8 +30,6 @@
 #define CGXSUPPORT		/* Define for RTG support. Leave on */
 
 #ifndef __CEXTRACT__
-#include "angband.h"
-
 #include "main.h"
 
 #include "vers.h"
@@ -5482,3 +5484,5 @@ static void quick_BltMaskBitMapRastPort(
 }
 
 #endif
+
+#endif /* USE_AMI */
Index: readdib.c
===================================================================
RCS file: /home/rr9/angband/angband/src/readdib.c,v
retrieving revision 1.10
diff -u -p -r1.10 readdib.c
--- readdib.c	1 Nov 2002 14:05:42 -0000	1.10
+++ readdib.c	28 Oct 2005 16:56:04 -0000
@@ -17,6 +17,8 @@
  *   Sample Application Files which are modified.
  */
 
+#if defined(USE_WIN) || defined(WINDOWS) || defined(WIN32)
+
 #include <windows.h>
 
 #include "readdib.h"
@@ -346,3 +348,4 @@ void FreeDIB(DIBINIT *dib)
 	dib->hDIB = NULL;
 }
 
+#endif /* USE_WIN || WINDOWS || WIN32 */