diff -ur ../npp-0.5.1-src-WIP2/src/externs.h ./src/externs.h
--- ../npp-0.5.1-src-WIP2/src/externs.h	2010-08-21 09:41:06.000000000 -0400
+++ ./src/externs.h	2010-08-22 18:29:27.000000000 -0400
@@ -423,7 +423,7 @@
 extern void do_cmd_pickup_from_pile(void);
 extern byte py_pickup(int pickup);
 extern s16b move_player(int dir, int jumping);
-extern void run_step(int dir);
+/*extern void run_step(int dir);*/
 
 /* cmd2.c */
 extern void do_cmd_go_up(cmd_code code, cmd_arg args[]);
@@ -1109,7 +1109,7 @@
 extern bool fire_swarm(int num, int typ, int dir, int dam, int rad);
 extern bool fire_bolt(int typ, int dir, int dam);
 extern bool fire_beam(int typ, int dir, int dam, u32b flg);
-extern bool fire_bolt_or_beam(int prob, int typ, int dir, int dam);
+/*extern bool fire_bolt_or_beam(int prob, int typ, int dir, int dam);*/
 extern bool light_line(int dir, int dam);
 extern bool strong_light_line(int dir);
 extern bool drain_life(int dir, int dam);
@@ -1373,9 +1373,9 @@
 #ifdef SET_UID
 # ifndef HAVE_USLEEP
 /* util.c */
-extern int usleep(unsigned long usecs);
+/*extern int usleep(unsigned long usecs);*/
 # endif /* HAVE_USLEEP */
-extern void user_name(char *buf, size_t len, int id);
+/*extern void user_name(char *buf, size_t len, int id);*/
 #endif /* SET_UID */
 
 
diff -ur ../npp-0.5.1-src-WIP2/src/main.c ./src/main.c
--- ../npp-0.5.1-src-WIP2/src/main.c	2010-08-15 08:33:14.000000000 -0400
+++ ./src/main.c	2010-08-22 18:28:59.000000000 -0400
@@ -199,7 +199,7 @@
  * Pass the appropriate "Initialisation screen" command to the game,
  * getting user input if needed.
  */
-static errr get_init_cmd()
+static errr get_init_cmd(void)
 {
 	/* Wait for response */
 	pause_line(Term->hgt - 1);
diff -ur ../npp-0.5.1-src-WIP2/src/main-gcu.c ./src/main-gcu.c
--- ../npp-0.5.1-src-WIP2/src/main-gcu.c	2010-08-21 08:27:36.000000000 -0400
+++ ./src/main-gcu.c	2010-08-22 19:04:53.000000000 -0400
@@ -190,6 +190,12 @@
 
 #endif
 
+/* XYZ */
+void get_gcu_term_size(int i, int *rows, int *cols, int *y, int *x);
+void do_gcu_resize(void);
+void set_256color_table(int i, int fg);
+
+
 
 
 /*
@@ -1062,7 +1068,7 @@
 
 			/* Set up the colormap */
 			colortable[i] = (COLOR_PAIR(i + 1) | A_NORMAL);
-			colortable[i + (MAX / 2)] = (COLOR_PAIR(i + 1) | A_BRIGHT);
+			colortable[i + (MAX_COLORS / 2)] = (COLOR_PAIR(i + 1) | A_BRIGHT);
 		}
 
 		/* Take account of "gamma correction" XXX XXX XXX */
diff -ur ../npp-0.5.1-src-WIP2/src/Makefile.src ./src/Makefile.src
--- ../npp-0.5.1-src-WIP2/src/Makefile.src	2010-08-15 12:11:12.000000000 -0400
+++ ./src/Makefile.src	2010-08-22 18:22:02.000000000 -0400
@@ -16,7 +16,7 @@
 	externs.h \
 	game-cmd.h \
 	game-event.h \
-	$(GTKHEADERS) \
+	##$(GTKHEADERS) \
 	h-basic.h \
 	init.h \
 	main.h \
@@ -42,18 +42,20 @@
 	z-util.h \
 	z-virt.h
 
-GTKHEADERS = \
-	gtk/cairo-utils.h \
-	gtk/main-gtk.h \
+#GTKHEADERS = \
+#	gtk/cairo-utils.h \
+#	gtk/main-gtk.h \
 
 ZFILES = z-msg.o z-quark.o z-rand.o z-term.o z-type.o \
          z-util.o z-virt.o
-MAINFILES = main.o main-crb.o main-gcu.o $(GTKMAINFILES) \
+#MAINFILES = main.o main-crb.o main-gcu.o $(GTKMAINFILES) \
+#            main-ros.o main-sdl.o main-win.o main-x11.o snd-sdl.o
+MAINFILES = main.o main-crb.o main-gcu.o \
             main-ros.o main-sdl.o main-win.o main-x11.o snd-sdl.o
 
-GTKMAINFILES = \
-	gtk/main-gtk.o \
-	gtk/cairo-utils.o
+#GTKMAINFILES = \
+#	gtk/main-gtk.o \
+#	gtk/cairo-utils.o
 
 ANGFILES = \
 	attack.o \
diff -ur ../npp-0.5.1-src-WIP2/src/Makefile.std ./src/Makefile.std
--- ../npp-0.5.1-src-WIP2/src/Makefile.std	2009-02-01 09:16:42.000000000 -0500
+++ ./src/Makefile.std	2010-08-22 19:05:39.000000000 -0400
@@ -36,7 +36,7 @@
 #SYS_gtk = -rdynamic -export-dynamic -DUSE_GTK $(shell pkg-config libglade-2.0 gtk+-2.0 --libs --cflags)
 
 # Support SDL frontend
-SYS_sdl = -DUSE_SDL $(shell sdl-config --cflags) $(shell sdl-config --libs) -lSDL_ttf -lSDL_image
+##SYS_sdl = -DUSE_SDL $(shell sdl-config --cflags) $(shell sdl-config --libs) -lSDL_ttf -lSDL_image
 
 
 
@@ -72,14 +72,16 @@
 
 
 # Extract CFLAGS and LIBS from the system definitions
-MODULES = $(SYS_x11) $(SYS_gcu) $(SYS_gtk) $(SYS_sdl) $(SOUND_sdl)
+###MODULES = $(SYS_x11) $(SYS_gcu) $(SYS_gtk) $(SYS_sdl) $(SOUND_sdl)
+MODULES = $(SYS_x11) $(SYS_gcu)
 CFLAGS += $(patsubst -l%,,$(MODULES)) $(INCLUDES)
 LIBS += $(patsubst -D%,,$(patsubst -I%,, $(MODULES)))
 
 
 # Object definitions
-GTKOBJS = gtk/main-gtk.o gtk/cairo-utils.o
-MAINOBJS = main.o main-gcu.o main-x11.o main-sdl.o snd-sdl.o $(GTKOBJS)
+##GTKOBJS = gtk/main-gtk.o gtk/cairo-utils.o
+##MAINOBJS = main.o main-gcu.o main-x11.o main-sdl.o snd-sdl.o $(GTKOBJS)
+MAINOBJS = main.o main-gcu.o main-x11.o
 OBJS = $(BASEOBJS) $(MAINOBJS)
 
 
diff -ur ../npp-0.5.1-src-WIP2/src/z-file.h ./src/z-file.h
--- ../npp-0.5.1-src-WIP2/src/z-file.h	2010-08-15 07:17:24.000000000 -0400
+++ ./src/z-file.h	2010-08-22 17:52:26.000000000 -0400
@@ -10,8 +10,8 @@
  *
  * Only relevant to POSIX systems that use main.c, and set there.
  */
-extern int player_uid;
-extern int player_egid;
+/*extern int player_uid;
+extern int player_egid;*/
 
 /**
  * Drop or grab privileges.
diff -ur ../npp-0.5.1-src-WIP2/src/z-util.h ./src/z-util.h
--- ../npp-0.5.1-src-WIP2/src/z-util.h	2010-08-15 07:43:14.000000000 -0400
+++ ./src/z-util.h	2010-08-22 17:54:18.000000000 -0400
@@ -76,8 +76,8 @@
 
 /* Sorting functions */
 /* TODO: make ang_sort() take comp and swap hooks rather than use globals */
-void ang_sort(void *u, void *v, int n);
-void ang_sort_aux(void *u, void *v, int p, int q);
+/*void ang_sort(void *u, void *v, int n);
+void ang_sort_aux(void *u, void *v, int p, int q);*/
 
 extern bool (*ang_sort_comp)(const void *u, const void *v, int a, int b);
 extern void (*ang_sort_swap)(void *u, void *v, int a, int b);