diff --git a/libs/gtkutil/Makefile b/libs/gtkutil/Makefile
index 60f6a4a..a531157 100644
--- a/libs/gtkutil/Makefile
+++ b/libs/gtkutil/Makefile
@@ -1,6 +1,6 @@
 # WorldSpawn Makefile 
 
-GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) $(shell pkg-config --cflags cairo)
+GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
 GLEXT_CFLAGS=$(shell pkg-config --cflags gtkglext-1.0)
 
 LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(GLEXT_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2
diff --git a/plugins/archivezip/Makefile b/plugins/archivezip/Makefile
index 3ed8f78..3832bf7 100644
--- a/plugins/archivezip/Makefile
+++ b/plugins/archivezip/Makefile
@@ -13,7 +13,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libarchivezip.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
+	$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
 
 # object files
 archive.o: archive.cpp archive.h
diff --git a/plugins/brushexport/Makefile b/plugins/brushexport/Makefile
index f39c470..f263686 100644
--- a/plugins/brushexport/Makefile
+++ b/plugins/brushexport/Makefile
@@ -16,7 +16,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libbrushexport.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a
+	$(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a $(PLUGIN_LDFLAGS)
 
 # object files
 callbacks.o: callbacks.cpp callbacks.h
diff --git a/plugins/entity/Makefile b/plugins/entity/Makefile
index 31b2b1c..949b0b0 100644
--- a/plugins/entity/Makefile
+++ b/plugins/entity/Makefile
@@ -26,7 +26,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libentity.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
+	$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
 
 # object files
 eclassmodel.o: eclassmodel.cpp eclassmodel.h
diff --git a/plugins/image/Makefile b/plugins/image/Makefile
index f9dc760..3855413 100644
--- a/plugins/image/Makefile
+++ b/plugins/image/Makefile
@@ -19,7 +19,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libimage.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libddslib.a ../../libs/libetclib.a
+	$(CXX) -o $@ $(WS_OBJS) ../../libs/libddslib.a ../../libs/libetclib.a $(PLUGIN_LDFLAGS)
 
 # object files
 bmp.o: bmp.cpp bmp.h
diff --git a/plugins/iqmmodel/Makefile b/plugins/iqmmodel/Makefile
index a6f8158..704c39e 100644
--- a/plugins/iqmmodel/Makefile
+++ b/plugins/iqmmodel/Makefile
@@ -16,8 +16,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libiqmmodel.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
-
+	$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
 
 # object files
 iqm.o: iqm.cpp iqm.h
diff --git a/plugins/mapq3/Makefile b/plugins/mapq3/Makefile
index e2ae3ef..bd4dfbc 100644
--- a/plugins/mapq3/Makefile
+++ b/plugins/mapq3/Makefile
@@ -16,8 +16,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libmapq3.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
-
+	$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
 
 # object files
 parse.o: parse.cpp parse.h
diff --git a/plugins/model/Makefile b/plugins/model/Makefile
index a363387..34b6a8a 100644
--- a/plugins/model/Makefile
+++ b/plugins/model/Makefile
@@ -16,8 +16,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libmodel.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libpicomodel.a
-
+	$(CXX) -o $@ $(WS_OBJS) ../../libs/libpicomodel.a $(PLUGIN_LDFLAGS)
 
 # object files
 model.o: model.cpp model.h
diff --git a/plugins/prtview/Makefile b/plugins/prtview/Makefile
index 4671c7b..57db968 100644
--- a/plugins/prtview/Makefile
+++ b/plugins/prtview/Makefile
@@ -16,7 +16,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libprtview.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a ../../libs/libprofile.a
+	$(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a ../../libs/libprofile.a $(PLUGIN_LDFLAGS)
 
 # object files
 AboutDialog.o: AboutDialog.cpp AboutDialog.h
diff --git a/plugins/shaders/Makefile b/plugins/shaders/Makefile
index f68a381..a7e045f 100644
--- a/plugins/shaders/Makefile
+++ b/plugins/shaders/Makefile
@@ -16,8 +16,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libshaders.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
-
+	$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
 
 # object files
 shaders.o: shaders.cpp shaders.h
diff --git a/plugins/vfspk3/Makefile b/plugins/vfspk3/Makefile
index 55e5c82..a893dd7 100644
--- a/plugins/vfspk3/Makefile
+++ b/plugins/vfspk3/Makefile
@@ -16,8 +16,7 @@ WS_OBJS = \
 
 # binary target
 ../../build/plugins/libvfspk3.so: $(WS_OBJS)
-	$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libfilematch.a
-
+	$(CXX) -o $@ $(WS_OBJS) ../../libs/libfilematch.a $(PLUGIN_LDFLAGS)
 
 # object files
 archive.o: archive.cpp archive.h
diff --git a/src/Makefile b/src/Makefile
index 85ef96c..1565818 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 # WorldSpawn Makefile 
 
-GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) $(shell pkg-config --cflags cairo)
-GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) $(shell pkg-config --libs cairo)
+GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
+GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
 
 XML_CFLAGS=$(shell pkg-config --cflags libxml-2.0)
 XML_LDFLAGS=$(shell pkg-config --libs libxml-2.0)