--- a/test/automated/Makefile	Sun Nov 22 06:37:43 2009 +0000
+++ b/test/automated/Makefile	Sun Nov 22 06:42:58 2009 +0000
@@ -1,10 +1,10 @@
 
 
-CFLAGS  := -W -Wall -Wextra -g -I. `sdl-config --cflags`
+CFLAGS  := -W -Wall -Wextra -g `sdl-config --cflags`
 LDFLAGS := `sdl-config --libs`
 
 # If it doesn't pick up defaults
-#CFLAGS  := -I. -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include/SDL
+#CFLAGS  := -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include/SDL
 #LDFLAGS := -lm -ldl -lesd -lpthread
 
 SRC         	:= testsdl.c \

--- a/test/automated/audio/audio.c	Sun Nov 22 06:37:43 2009 +0000
+++ b/test/automated/audio/audio.c	Sun Nov 22 06:42:58 2009 +0000
@@ -8,7 +8,7 @@
 
 
 #include "SDL.h"
-#include "SDL_at.h"
+#include "../SDL_at.h"
 
 
 /**

--- a/test/automated/common/common.c	Sun Nov 22 06:37:43 2009 +0000
+++ b/test/automated/common/common.c	Sun Nov 22 06:42:58 2009 +0000
@@ -8,9 +8,9 @@
 
 
 #include "SDL.h"
-#include "SDL_at.h"
+#include "../SDL_at.h"
 
-#include "common/common.h"
+#include "common.h"
 
 
 /**

--- a/test/automated/common/images.h	Sun Nov 22 06:37:43 2009 +0000
+++ b/test/automated/common/images.h	Sun Nov 22 06:42:58 2009 +0000
@@ -4,17 +4,17 @@
 #  define IMAGES_H
 
 
-#include "common/common.h"
+#include "common.h"
 
 
 /*
  * Pull in images for testcases.
  */
-#include "common/img_primitives.c"
-#include "common/img_primitivesblend.c"
-#include "common/img_face.c"
-#include "common/img_blit.c"
-#include "common/img_blitblend.c"
+#include "img_primitives.c"
+#include "img_primitivesblend.c"
+#include "img_face.c"
+#include "img_blit.c"
+#include "img_blitblend.c"
 
 
 #endif /* IMAGES_H */

--- a/test/automated/platform/platform.c	Sun Nov 22 06:37:43 2009 +0000
+++ b/test/automated/platform/platform.c	Sun Nov 22 06:42:58 2009 +0000
@@ -12,9 +12,9 @@
 
 
 #include "SDL.h"
-#include "SDL_at.h"
 #include "SDL_endian.h"
 #include "SDL_cpuinfo.h"
+#include "../SDL_at.h"
 
 
 /*

--- a/test/automated/render/render.c	Sun Nov 22 06:37:43 2009 +0000
+++ b/test/automated/render/render.c	Sun Nov 22 06:42:58 2009 +0000
@@ -8,15 +8,15 @@
 
 
 #include "SDL.h"
-#include "SDL_at.h"
+#include "../SDL_at.h"
 
-#include "common/common.h"
+#include "../common/common.h"
 
 
 /*
  * Pull in images for testcases.
  */
-#include "common/images.h"
+#include "../common/images.h"
 
 
 #define SCREEN_W     80

--- a/test/automated/rwops/rwops.c	Sun Nov 22 06:37:43 2009 +0000
+++ b/test/automated/rwops/rwops.c	Sun Nov 22 06:42:58 2009 +0000
@@ -8,7 +8,7 @@
 
 
 #include "SDL.h"
-#include "SDL_at.h"
+#include "../SDL_at.h"
 
 
 #define RWOPS_READ      "rwops/read"

--- a/test/automated/surface/surface.c	Sun Nov 22 06:37:43 2009 +0000
+++ b/test/automated/surface/surface.c	Sun Nov 22 06:42:58 2009 +0000
@@ -10,15 +10,15 @@
 #include "SDL.h"
 #include "SDL_surface.h"
 #include "SDL_video.h"
-#include "SDL_at.h"
+#include "../SDL_at.h"
 
-#include "common/common.h"
+#include "../common/common.h"
 
 
 /*
  * Pull in images for testcases.
  */
-#include "common/images.h"
+#include "../common/images.h"
 
 
 /*