diff --git a/Makefile b/Makefile
index 252b8b3..5513dc7 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-DESTDIR := $(CURDIR)/$(DESTDIR)
-
 .PHONY: build check install clean
 build:
 	$(MAKE) -C src
diff --git a/include/Makefile b/include/Makefile
index 3a941ea..1c759a8 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -4,6 +4,6 @@ install:
 	mkdir -p $(DESTDIR)/usr/include/loki/flex
 	mkdir -p $(DESTDIR)/usr/include/loki/yasli
 	
-	install loki/*.h $(DESTDIR)/usr/include/loki
-	install loki/flex/*.h $(DESTDIR)/usr/include/loki/flex
-	install loki/yasli/*.h $(DESTDIR)/usr/include/loki/yasli
+	install -m 644 loki/*.h $(DESTDIR)/usr/include/loki
+	install -m 644 loki/flex/*.h $(DESTDIR)/usr/include/loki/flex
+	install -m 644 loki/yasli/*.h $(DESTDIR)/usr/include/loki/yasli
diff --git a/src/Makefile b/src/Makefile
index 5125440..ccb514f 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
 OBJ = Singleton.o SmallObj.o OrderedStatic.o
 BIN = ../lib/libloki.a
-CXXFLAGS = -I../include -Wall -O2 -DNDEBUG
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../include -DNDEBUG
 
 $(BIN): $(OBJ)
 	ar rs $(BIN) $(OBJ)
diff --git a/test/Factory/Makefile b/test/Factory/Makefile
index 95c5927..36117ea 100755
--- a/test/Factory/Makefile
+++ b/test/Factory/Makefile
@@ -1,11 +1,10 @@
-OBJ = Factory.o
-BIN = main-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN = Factory
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
 
-$(BIN): $(OBJ)
-	$(CXX) -o $(BIN) $(OBJ) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN)
 clean:
-	rm -f $(OBJ) $(BIN)
+	rm -f $(BIN)
diff --git a/test/Function/Makefile b/test/Function/Makefile
index b185b2e..dc2ab2a 100644
--- a/test/Function/Makefile
+++ b/test/Function/Makefile
@@ -1,11 +1,10 @@
-OBJ = FunctionTest.o
-BIN = main-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN = FunctionTest
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki -lboost_test_exec_monitor
 
-$(BIN): $(OBJ)
-	$(CXX) -o $(BIN) $(OBJ) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN)
 clean:
-	rm -f $(OBJ) $(BIN)
+	rm -f $(BIN)
diff --git a/test/Longevity/Makefile b/test/Longevity/Makefile
index 92fbcd4..8dde83e 100755
--- a/test/Longevity/Makefile
+++ b/test/Longevity/Makefile
@@ -1,20 +1,11 @@
-OBJ1 = main.o
-OBJ2 = main2.o
-BIN1 = main-gcc
-BIN2 = main2-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN1 = main
+BIN2 = main2
+CXXFLAGS = -Wall -fexpensive-optimizations -O3
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
 
-.PHONY: all
-all: $(BIN1) $(BIN2)
-
-$(BIN1): $(OBJ1)
-	$(CXX) -o $(BIN1) $(OBJ1) $(LIBS)
-
-$(BIN2): $(OBJ2)
-	$(CXX) -o $(BIN2) $(OBJ2) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN1) $(BIN2)
 clean:
-	rm -f $(OBJ1) $(BIN1)
-	rm -f $(OBJ2) $(BIN2)
+	rm -f $(BIN1) $(BIN2)
diff --git a/test/OrderedStatic/Makefile b/test/OrderedStatic/Makefile
index 1322b95..57b90e8 100755
--- a/test/OrderedStatic/Makefile
+++ b/test/OrderedStatic/Makefile
@@ -1,11 +1,10 @@
-OBJ = main.o
-BIN = main-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN = main
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
 
-$(BIN): $(OBJ)
-	$(CXX) -o $(BIN) $(OBJ) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN)
 clean:
-	rm -f $(OBJ) $(BIN)
+	rm -f $(BIN)
diff --git a/test/RegressionTest/Makefile b/test/RegressionTest/Makefile
index fdef6c5..1aaf2f0 100755
--- a/test/RegressionTest/Makefile
+++ b/test/RegressionTest/Makefile
@@ -1,11 +1,10 @@
-OBJ = Test.o
-BIN = main-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN = Test
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
 
-$(BIN): $(OBJ)
-	$(CXX) -o $(BIN) $(OBJ) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN)
 clean:
-	rm -f $(OBJ) $(BIN)
+	rm -f $(BIN)
diff --git a/test/SafeFormat/Makefile b/test/SafeFormat/Makefile
index 1537333..769ca23 100755
--- a/test/SafeFormat/Makefile
+++ b/test/SafeFormat/Makefile
@@ -1,11 +1,8 @@
-OBJ = main.o
-BIN = main-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = 
+BIN = main
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
 
-$(BIN): $(OBJ)
-	$(CXX) -o $(BIN) $(OBJ) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN)
 clean:
-	rm -f $(OBJ) $(BIN)
+	rm -f $(BIN)
diff --git a/test/ScopeGuard/Makefile b/test/ScopeGuard/Makefile
index 1322b95..57b90e8 100755
--- a/test/ScopeGuard/Makefile
+++ b/test/ScopeGuard/Makefile
@@ -1,11 +1,10 @@
-OBJ = main.o
-BIN = main-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN = main
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
 
-$(BIN): $(OBJ)
-	$(CXX) -o $(BIN) $(OBJ) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN)
 clean:
-	rm -f $(OBJ) $(BIN)
+	rm -f $(BIN)
diff --git a/test/Singleton/Makefile b/test/Singleton/Makefile
index 93acada..f1c3555 100644
--- a/test/Singleton/Makefile
+++ b/test/Singleton/Makefile
@@ -1,26 +1,12 @@
-OBJ1 = DeletableSingleton.o
-OBJ2 = Dependencies.o
-OBJ3 = Phoenix.o
-BIN1 = deletable-singleton-gcc
-BIN2 = dependencies-gcc
-BIN3 = phoenix-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN1 = DeletableSingleton
+BIN2 = Dependencies
+BIN3 = Phoenix
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
 
-.PHONY: all
-all: $(BIN1) $(BIN2) $(BIN3)
-
-$(BIN1): $(OBJ1)
-	$(CXX) -o $(BIN1) $(OBJ1) $(LIBS)
-
-$(BIN2): $(OBJ2)
-	$(CXX) -o $(BIN2) $(OBJ2) $(LIBS)
-
-$(BIN3): $(OBJ3)
-	$(CXX) -o $(BIN3) $(OBJ3) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN1) $(BIN2) $(BIN3)
 clean:
-	rm -f $(OBJ1) $(BIN1)
-	rm -f $(OBJ2) $(BIN2)
-	rm -f $(OBJ3) $(BIN3)
+	rm -f $(BIN1) $(BIN2) $(BIN3)
diff --git a/test/SmallObj/Makefile b/test/SmallObj/Makefile
index 5d33e22..f2668d6 100755
--- a/test/SmallObj/Makefile
+++ b/test/SmallObj/Makefile
@@ -1,20 +1,11 @@
-OBJ1 = SmallObjBench.o
-OBJ2 = SmallObjSingleton.o
-BIN1 = small-obj-bench-gcc
-BIN2 = small-obj-singleton-gcc
-CXXFLAGS = -I../../include -Wall -fexpensive-optimizations -O3 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN1 = SmallObjBench
+BIN2 = SmallObjSingleton
+CXXFLAGS = -Wall -fexpensive-optimizations -O3
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
 
-.PHONY: all
-all: $(BIN1) $(BIN2)
-
-$(BIN1): $(OBJ1)
-	$(CXX) -o $(BIN1) $(OBJ1) $(LIBS)
-
-$(BIN2): $(OBJ2)
-	$(CXX) -o $(BIN2) $(OBJ2) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN1) $(BIN2)
 clean:
-	rm -f $(OBJ1) $(BIN1)
-	rm -f $(OBJ2) $(BIN2)
+	rm -f $(BIN1) $(BIN2)
diff --git a/test/Visitor/Makefile b/test/Visitor/Makefile
index 1322b95..57b90e8 100755
--- a/test/Visitor/Makefile
+++ b/test/Visitor/Makefile
@@ -1,11 +1,10 @@
-OBJ = main.o
-BIN = main-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
-LIBS = -L../../lib -lloki
+BIN = main
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
 
-$(BIN): $(OBJ)
-	$(CXX) -o $(BIN) $(OBJ) $(LIBS)
-
-.PHONY: clean
+.PHONY: build clean
+build: $(BIN)
 clean:
-	rm -f $(OBJ) $(BIN)
+	rm -f $(BIN)
diff --git a/test/flex_string/Makefile b/test/flex_string/Makefile
index c057976..b061596 100755
--- a/test/flex_string/Makefile
+++ b/test/flex_string/Makefile
@@ -1,6 +1,7 @@
 OBJ = main.o
 BIN = main-gcc
-CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG
+CXXFLAGS = -Wall -O2
+CPPFLAGS = -I../../include -DNDEBUG
 
 $(BIN): $(OBJ)
 	$(CXX) -o $(BIN) $(OBJ)