diff --git a/Testing/Makefile.in b/Testing/Makefile.in
index b2d8bc4a5..6d718ee37 100644
--- a/Testing/Makefile.in
+++ b/Testing/Makefile.in
@@ -131,9 +131,12 @@ DIST_FILES = $(RCS_FILES)
 all: $(EXCS)
 
 # This works for GNU make, but not others.
-%: %$(OEXT) $(srcdir)/../src/lib$(LIBRARY_NAME)(LIBEXT)
+%: %$(OEXT) ../src/lib$(LIBRARY_NAME)$(LIBEXT)
 	$(CC) $(ALL_CFLAGS) $@$(OEXT) -o $@ $(ALL_LDFLAGS)
 
+foo:
+	echo $(OEXT)
+
 install:
 uninstall:
 
diff --git a/Testing/beh.m b/Testing/beh.m
index 89f92473e..1508e4fc1 100644
--- a/Testing/beh.m
+++ b/Testing/beh.m
@@ -1,4 +1,4 @@
-#include <gnustep/base/stdall.h>
+#include <gnustep/base/preface.h>
 #include <gnustep/base/behavior.h>
 #include <Foundation/NSCoder.h>
 
diff --git a/Testing/server.h b/Testing/server.h
index 9264326f0..ec9303a86 100644
--- a/Testing/server.h
+++ b/Testing/server.h
@@ -1,7 +1,7 @@
 #ifndef _server_h
 #define _server_h
 
-#include <gnustep/base/stdall.h>
+#include <gnustep/base/preface.h>
 #include <gnustep/base/Connection.h>
 #include <gnustep/base/Array.h>
 
diff --git a/Testing/server.m b/Testing/server.m
index d0ac6b89a..0aae6b949 100644
--- a/Testing/server.m
+++ b/Testing/server.m
@@ -1,4 +1,4 @@
-#include <gnustep/base/stdall.h>
+#include <gnustep/base/preface.h>
 #include <stdio.h>
 #include <gnustep/base/SocketPort.h>
 #include <gnustep/base/BinaryCStream.h>