diff --git a/rogue4/Makefile.in b/rogue4/Makefile.in
index 16fe569..1b7cc01 100644
--- a/rogue4/Makefile.in
+++ b/rogue4/Makefile.in
@@ -51,6 +51,7 @@ CFILES=	vers.c extern.c armor.c chase.c command.c daemon.c daemons.c \
 MISC=	Makefile LICENSE.TXT rogue.6 rogue.me
 
 CFLAGS= -O3
+CPPFLAGS=@DEFS@
 CRLIB = -lcurses
 RM    = rm -f
 TAR   = tar
@@ -67,8 +68,8 @@ NL=
 MACHDEP=
 
 .c.o:
-	@echo $(CC) -c $(CFLAGS) $*.c
-	@$(CC) -c $(CFLAGS) $*.c -o $*.o
+	@echo $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c
+	@$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c -o $*.o
 #	@cpp -P $(CFLAGS) $*.c | ./xstr -v -c -
 #	@cc -c $(CFLAGS) x.c
 #	@mv x.o $*.o
@@ -79,13 +80,13 @@ MACHDEP=
 	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 
 main.o: main.c $(HDRS)
-	$(CC) -c $(CFLAGS) -o $@ main.c
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ main.c
 
 vers.o:
-	$(CC) -c $(CFLAGS) vers.c
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) vers.c
 
 mach_dep.o: mach_dep.c
-	$(CC) -c $(CFLAGS) $(SF) $(NL) $(MACHDEP) mach_dep.c
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(SF) $(NL) $(MACHDEP) mach_dep.c
 
 xs.o: strings
 	./xstr
diff --git a/rogue4/rogue.h b/rogue4/rogue.h
index baa3d82..1c975ec 100644
--- a/rogue4/rogue.h
+++ b/rogue4/rogue.h
@@ -479,7 +479,9 @@ THING	*find_mons(), *find_obj(), *get_item(), *new_item(),
 
 struct room	*roomin();
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include "extern.h"
 
 #ifndef PATH_MAX