--- xscreensaver-5.12/driver/test-xdpms.c.extra	2002-03-19 08:57:42.000000000 +0900
+++ xscreensaver-5.12/driver/test-xdpms.c	2011-04-03 22:05:01.000000000 +0900
@@ -29,7 +29,6 @@
 
 #include <X11/Xproto.h>
 #include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
 
 extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
 extern Bool DPMSCapable (Display *dpy);
--- xscreensaver-5.12/driver/Makefile.in	2011-04-03 22:49:32.000000000 +0900
+++ xscreensaver-5.12/driver/Makefile.in.save	2011-04-03 22:49:32.000000000 +0900
@@ -850,7 +850,7 @@
 test-mlstring: test-mlstring.o
 	$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
 
-TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
+TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
 test-fade: test-fade.o $(UTILS_BIN)/fade.o
 	$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)