diff --git a/client/Makefile b/client/Makefile
index 216ef23ca..19f38785f 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -20,6 +20,9 @@
 #					client program
 # 18/06/14	Mark Riddoch		Addition of conditional for histedit
 
+include ../build_gateway.inc
+include ../makefile.inc
+
 ifeq ($(wildcard /usr/include/histedit.h), )
 HISTLIB=
 HISTFLAG=
@@ -63,14 +66,14 @@ maxadmin: $(OBJ)
 
 
 clean:
-	rm -f $(OBJ) maxadmin
-	- rm *.so
+	$(DEL) $(OBJ) maxadmin
+	$(DEL) *.so
 
 tags:
 	ctags $(SRCS) $(HDRS)
 
 depend:	
-	@rm -f depend.mk
+	@$(DEL) depend.mk
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 install: maxadmin
diff --git a/log_manager/makefile b/log_manager/makefile
index b1386bbcc..a020c7932 100644
--- a/log_manager/makefile
+++ b/log_manager/makefile
@@ -44,7 +44,7 @@ install: liblink
 	install liblog_manager.so.1.0.1 liblog_manager.so $(DEST)/lib
 
 depend:
-	@rm -f depend
+	@$(DEL) depend
 	$(CPP) -M $(CFLAGS) \
 	$(MYSQL_HEADERS) \
 	-I$(UTILS_PATH) -I./ \
diff --git a/query_classifier/makefile b/query_classifier/makefile
index efa456a01..b08f0a9bd 100644
--- a/query_classifier/makefile
+++ b/query_classifier/makefile
@@ -62,7 +62,7 @@ install: liblink
 	install ./libquery_classifier.so.1.0.1 ./libquery_classifier.so $(DEST)/lib
 
 depend:
-	@rm -f depend
+	@$(DEL) depend
 	$(CPP) -M $(CFLAGS) \
 	$(MYSQL_HEADERS) \
 	-I$(LOG_MANAGER_PATH) \
diff --git a/server/Makefile b/server/Makefile
index 09120da07..fda9d14c1 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -24,6 +24,9 @@
 # 08/07/13	Mark Riddoch		Addition of monitor modules
 # 16/07/13	Mark Riddoch		Renamed things to match the new naming
 
+include ../build_gateway.inc
+include ../makefile.inc
+
 DEST=$(HOME)/usr/local/skysql
 
 all:
@@ -45,7 +48,7 @@ testall:
 	$(MAKE) -C test HAVE_SRV=$(HAVE_SRV) testall
 
 clean:
-	(cd Documentation; rm -rf html)
+	(cd Documentation; $(DEL) html)
 	(cd core; touch depend.mk ; make clean)
 	(cd modules/routing; touch depend.mk ; make clean)
 	(cd modules/protocol; touch depend.mk ; make clean)
diff --git a/server/core/Makefile b/server/core/Makefile
index 9bf650c34..9a807a925 100644
--- a/server/core/Makefile
+++ b/server/core/Makefile
@@ -108,14 +108,14 @@ maxpasswd: $(POBJS)
 	echo '#define MAXSCALE_VERSION "'`cat ../../VERSION`'"' > ../include/version.h
 
 clean:
-	rm -f $(OBJ) maxscale
-	- rm *.so
+	$(DEL) $(OBJ) maxscale
+	$(DEL) *.so
 
 tags:
 	ctags $(SRCS) $(HDRS)
 
 depend:	../include/version.h
-	@rm -f depend.mk
+	@$(DEL) depend.mk
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 install: maxscale maxkeys maxpasswd
diff --git a/server/modules/filter/Makefile b/server/modules/filter/Makefile
index 931c35ab1..8e6036e91 100644
--- a/server/modules/filter/Makefile
+++ b/server/modules/filter/Makefile
@@ -69,13 +69,13 @@ libtee.so: $(TEEOBJ)
 	$(CC) $(CFLAGS) $< -o $@
 
 clean:
-	rm -f $(OBJ) $(MODULES)
+	$(DEL) $(OBJ) $(MODULES)
 
 tags:
 	ctags $(SRCS) $(HDRS)
 
 depend:
-	@rm -f depend.mk
+	@$(DEL) depend.mk
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 install: $(MODULES)
diff --git a/server/modules/monitor/Makefile b/server/modules/monitor/Makefile
index 7fdbc5843..8b60824ea 100644
--- a/server/modules/monitor/Makefile
+++ b/server/modules/monitor/Makefile
@@ -19,6 +19,8 @@
 # 08/07/13	Mark Riddoch		Initial implementation
 
 include ../../../build_gateway.inc
+include ../../../makefile.inc
+
 LOGPATH := $(ROOT_PATH)/log_manager
 UTILSPATH := $(ROOT_PATH)/utils
 
@@ -55,13 +57,13 @@ libgaleramon.so: $(GALERAOBJ)
 	$(CC) $(CFLAGS) $< -o $@
 
 clean:
-	rm -f $(OBJ) $(MODULES)
+	$(DEL) $(OBJ) $(MODULES)
 
 tags:
 	ctags $(SRCS) $(HDRS)
 
 depend:
-	@rm -f depend.mk
+	@$(DEL) depend.mk
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 install: $(MODULES)
diff --git a/server/modules/protocol/Makefile b/server/modules/protocol/Makefile
index 54a8f8c38..0b41d329e 100644
--- a/server/modules/protocol/Makefile
+++ b/server/modules/protocol/Makefile
@@ -76,7 +76,7 @@ libmaxscaled.so: $(MAXSCALEDOBJ)
 	$(CC) $(CFLAGS) $< -o $@
 
 clean:
-	rm -f $(OBJ) $(MODULES)
+	$(DEL) $(OBJ) $(MODULES)
 
 tags:
 	ctags $(SRCS) $(HDRS)
@@ -85,7 +85,7 @@ install: $(MODULES)
 	install -D $(MODULES) $(DEST)/modules
 
 depend: 
-	rm -f depend.mk
+	@$(DEL) depend.mk
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 include depend.mk
diff --git a/server/modules/routing/Makefile b/server/modules/routing/Makefile
index 4feac68fb..8287bdaea 100644
--- a/server/modules/routing/Makefile
+++ b/server/modules/routing/Makefile
@@ -71,7 +71,7 @@ libreadwritesplit.so:
 	$(CC) $(CFLAGS) $< -o $@
 
 clean:
-	rm -f $(OBJ) $(MODULES)
+	$(DEL) $(OBJ) $(MODULES)
 	(cd readwritesplit; touch depend.mk; make clean)
 
 tags:
@@ -79,7 +79,7 @@ tags:
 	(cd readwritesplit; make tags)
 
 depend:
-	@rm -f depend.mk
+	@$(DEL) depend.mk
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 	(cd readwritesplit; touch depend.mk ; make depend)
 
diff --git a/server/modules/routing/readwritesplit/Makefile b/server/modules/routing/readwritesplit/Makefile
index c60f2ffd1..80f2ec572 100644
--- a/server/modules/routing/readwritesplit/Makefile
+++ b/server/modules/routing/readwritesplit/Makefile
@@ -50,13 +50,13 @@ libreadwritesplit.so: $(OBJ)
 	$(CC) $(CFLAGS) $< -o $@
 
 clean:
-	rm -f $(OBJ) $(MODULES)
+	$(DEL) $(OBJ) $(MODULES)
 
 tags:
 	ctags $(SRCS) $(HDRS)
 
 depend:
-	@rm -f depend.mk
+	@$(DEL) depend.mk
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 install: $(MODULES)