diff -up ./CSFML/src/SFML/Audio/Makefile.fix ./CSFML/src/SFML/Audio/Makefile
--- ./CSFML/src/SFML/Audio/Makefile.fix	2010-11-01 02:17:36.743874512 +0100
+++ ./CSFML/src/SFML/Audio/Makefile	2010-11-01 03:17:12.644508451 +0100
@@ -1,15 +1,19 @@
-LIB     = libcsfml-audio.so
-SRC     = $(wildcard *.cpp)
-OBJ     = $(SRC:.cpp=.o)
-LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+ROOTDIR     = ../../../..
+CSFMLDIR    = ../../..
+INCLUDEDIR  = -I $(CSFMLDIR)/include -I $(CSFMLDIR)/src -I $(ROOTDIR)/include
+LIBPATH     = $(ROOTDIR)/lib
+LIB         = libcsfml-audio.so
+SRC         = $(wildcard *.cpp)
+OBJ         = $(SRC:.cpp=.o)
+LIBNAME     = $(LIBPATH)/$(LIB).$(VERSION)
 
 all: $(LIB)
 
 libcsfml-audio.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lsfml-audio
 
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
+%.o: %.cpp $(SRC)
+	$(CPP) -o $@ -c $< $(CFLAGS) $(INCLUDEDIR)
 
 .PHONY: clean mrproper
 
diff -up ./CSFML/src/SFML/Graphics/Makefile.fix ./CSFML/src/SFML/Graphics/Makefile
--- ./CSFML/src/SFML/Graphics/Makefile.fix	2010-11-01 02:17:29.855779452 +0100
+++ ./CSFML/src/SFML/Graphics/Makefile	2010-11-01 03:17:16.141177711 +0100
@@ -1,15 +1,19 @@
-LIB     = libcsfml-graphics.so
-SRC     = $(wildcard *.cpp)
-OBJ     = $(SRC:.cpp=.o)
-LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+ROOTDIR     = ../../../..
+CSFMLDIR    = ../../..
+INCLUDEDIR  = -I $(CSFMLDIR)/include -I $(CSFMLDIR)/src -I $(ROOTDIR)/include
+LIBPATH     = $(ROOTDIR)/lib
+LIB         = libcsfml-graphics.so
+SRC         = $(wildcard *.cpp)
+OBJ         = $(SRC:.cpp=.o)
+LIBNAME     = $(LIBPATH)/$(LIB).$(VERSION)
 
 all: $(LIB)
 
 libcsfml-graphics.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system
 
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
+%.o: %.cpp $(SRC)
+	$(CPP) -o $@ -c $< $(CFLAGS) $(INCLUDEDIR)
 
 .PHONY: clean mrproper
 
diff -up ./CSFML/src/SFML/Makefile.fix ./CSFML/src/SFML/Makefile
--- ./CSFML/src/SFML/Makefile.fix	2010-11-01 02:18:08.591125082 +0100
+++ ./CSFML/src/SFML/Makefile	2010-11-01 03:17:37.180181517 +0100
@@ -1,8 +1,7 @@
 export CC         = gcc
 export CPP        = g++
-export CFLAGS     = -W -Wall -pedantic -fPIC -Wno-unused -I../.. -I../../../include -DNDEBUG -DCSFML_EXPORTS -O2
+export CFLAGS     = -W -Wall -pedantic -fPIC -Wno-unused -DNDEBUG -DCSFML_EXPORTS -O2
 export LDFLAGS    = -shared
-export LIBPATH    = ../../../lib
 export VERSION    = 1.7
 export CP         = cp
 export LN         = ln
@@ -10,38 +9,43 @@ export LNFLAGS    = -s -f
 export DESTDIR    = /usr/local
 export DESTLIBDIR = $(DESTDIR)/lib
 export DESTINCDIR = $(DESTDIR)/include
+ROOTDIR           = ../../..
+CSFMLDIR          = ../..
+INCLUDEDIR        = -I $(CSFMLDIR)/include -I $(CSFMLDIR)/src -I $(ROOTDIR)/include
+LIBPATH           = $(ROOTDIR)/lib
 
 all: csfml-system csfml-window csfml-network csfml-graphics csfml-audio
 
 csfml-system:
-	@(mkdir -p ../../lib)
-	@(cd ./System && $(MAKE))
+	@(mkdir -p $(CSFMLDIR)/lib)
+	@(make -C System)
 
 csfml-window:
-	@(mkdir -p ../../lib)
-	@(cd ./Window && $(MAKE))
+	@(mkdir -p $(CSFMLDIR)/lib)
+	@(make -C Window)
 
 csfml-network:
-	@(mkdir -p ../../lib)
-	@(cd ./Network && $(MAKE))
+	@(mkdir -p $(CSFMLDIR)/lib)
+	@(make -C Network)
 
 csfml-graphics:
-	@(mkdir -p ../../lib)
-	@(cd ./Graphics && $(MAKE))
+	@(mkdir -p $(CSFMLDIR)/lib)
+	@(make -C Graphics)
 
 csfml-audio:
-	@(mkdir -p ../../lib)
-	@(cd ./Audio && $(MAKE))
+	@(mkdir -p $(CSFMLDIR)/lib)
+	@(make -C Audio)
 
 .PHONY: clean mrproper
 
 clean:
-	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
+	@(make -C System $@	&& make -C Window $@ && make -C Network $@ && make -C Graphics $@ && make -C Audio)
 
 mrproper: clean
-	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
+	@(make -C System $@	&& make -C Window $@ && make -C Network $@ && make -C Graphics $@ && make -C Audio)
 
 install:
 	@(mkdir -p $(DESTLIBDIR))
 	@(mkdir -p $(DESTINCDIR))
-	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR))
+	@(make -C System $@	&& make -C Window $@ && make -C Network $@ && make -C Graphics $@ && make -C Audio)
+	@($(CP) -r $(ROOTDIR)/include/SFML/ $(DESTINCDIR))
diff -up ./CSFML/src/SFML/Network/Makefile.fix ./CSFML/src/SFML/Network/Makefile
--- ./CSFML/src/SFML/Network/Makefile.fix	2010-11-01 02:18:02.007098262 +0100
+++ ./CSFML/src/SFML/Network/Makefile	2010-11-01 03:17:19.411868077 +0100
@@ -1,15 +1,19 @@
-LIB     = libcsfml-network.so
-SRC     = $(wildcard *.cpp)
-OBJ     = $(SRC:.cpp=.o)
-LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+ROOTDIR     = ../../../..
+CSFMLDIR    = ../../..
+INCLUDEDIR  = -I $(CSFMLDIR)/include -I $(CSFMLDIR)/src -I $(ROOTDIR)/include
+LIBPATH     = $(ROOTDIR)/lib
+LIB         = libcsfml-network.so
+SRC         = $(wildcard *.cpp)
+OBJ         = $(SRC:.cpp=.o)
+LIBNAME     = $(LIBPATH)/$(LIB).$(VERSION)
 
 all: $(LIB)
 
 libcsfml-network.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lsfml-network
 
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
+%.o: %.cpp $(SRC)
+	$(CPP) -o $@ -c $< $(CFLAGS) $(INCLUDEDIR)
 
 .PHONY: clean mrproper
 
diff -up ./CSFML/src/SFML/System/Makefile.fix ./CSFML/src/SFML/System/Makefile
--- ./CSFML/src/SFML/System/Makefile.fix	2010-11-01 02:17:46.199980997 +0100
+++ ./CSFML/src/SFML/System/Makefile	2010-11-01 03:17:23.419488329 +0100
@@ -1,15 +1,19 @@
-LIB     = libcsfml-system.so
-SRC     = $(wildcard *.cpp)
-OBJ     = $(SRC:.cpp=.o)
-LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+ROOTDIR     = ../../../..
+CSFMLDIR    = ../../..
+INCLUDEDIR  = -I $(CSFMLDIR)/include -I $(CSFMLDIR)/src -I $(ROOTDIR)/include
+LIBPATH     = $(ROOTDIR)/lib
+LIB         = libcsfml-system.so
+SRC         = $(wildcard *.cpp)
+OBJ         = $(SRC:.cpp=.o)
+LIBNAME     = $(LIBPATH)/$(LIB).$(VERSION)
 
 all: $(LIB)
 
 libcsfml-system.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lsfml-system
 
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
+%.o: %.cpp $(SRC)
+	$(CPP) -o $@ -c $< $(CFLAGS) $(INCLUDEDIR)
 
 .PHONY: clean mrproper
 
diff -up ./CSFML/src/SFML/Window/Makefile.fix ./CSFML/src/SFML/Window/Makefile
--- ./CSFML/src/SFML/Window/Makefile.fix	2010-11-01 02:17:55.719060604 +0100
+++ ./CSFML/src/SFML/Window/Makefile	2010-11-01 03:17:26.712176045 +0100
@@ -1,15 +1,19 @@
-LIB     = libcsfml-window.so
-SRC     = $(wildcard *.cpp)
-OBJ     = $(SRC:.cpp=.o)
-LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+ROOTDIR     = ../../../..
+CSFMLDIR    = ../../..
+INCLUDEDIR  = -I $(CSFMLDIR)/include -I $(CSFMLDIR)/src -I $(ROOTDIR)/include
+LIBPATH     = $(ROOTDIR)/lib
+LIB         = libcsfml-window.so
+SRC         = $(wildcard *.cpp)
+OBJ         = $(SRC:.cpp=.o)
+LIBNAME     = $(LIBPATH)/$(LIB).$(VERSION)
 
 all: $(LIB)
 
 libcsfml-window.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lsfml-window -lsfml-system
 
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
+%.o: %.cpp $(SRC)
+	$(CPP) -o $@ -c $< $(CFLAGS) $(INCLUDEDIR)
 
 .PHONY: clean mrproper