diff --git a/APRSTransmit/Makefile b/APRSTransmit/Makefile
index 8814c53..20e9521 100644
--- a/APRSTransmit/Makefile
+++ b/APRSTransmit/Makefile
@@ -1,16 +1,22 @@
 OBJECTS = APRSParser.o APRSTransmitAppD.o APRSTransmit.o
 
+.PHONY: all
 all:		aprstransmitd
 
 aprstransmitd:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o aprstransmitd
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 aprstransmitd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) aprstransmitd *.o *.d *.bak *~
 
diff --git a/Common/Makefile b/Common/Makefile
index 8643148..b818a62 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -9,14 +9,19 @@ OBJECTS = AMBEData.o AnnouncementUnit.o APRSCollector.o APRSWriter.o APRSWriterT
 	  TCPReaderWriterClient.o TCPReaderWriterServer.o TextCollector.o TextData.o Timer.o UDPReaderWriter.o UserCache.o Utils.o \
 	  VersionUnit.o XLXHostsFileDownloader.o
 
+.PHONY:		all
 all:		Common.a
 
 Common.a:	$(OBJECTS)
 		$(AR) rcs Common.a $(OBJECTS)
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../ircDDB -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../ircDDB $< > $*.d
 
+.PHONY: clean
 clean:
 		$(RM) Common.a *.o *.d *.bak *~
 
diff --git a/Data/Makefile b/Data/Makefile
index 4350c30..c115445 100644
--- a/Data/Makefile
+++ b/Data/Makefile
@@ -1,3 +1,4 @@
+.PHONY: install
 install:
 	install -d -g bin -o root -m 0775 $(DATADIR)
 	install -g bin -o root -m 0664 CCS_Hosts.txt    $(DATADIR)
diff --git a/GUICommon/Makefile b/GUICommon/Makefile
index 4a837a3..9c4717c 100644
--- a/GUICommon/Makefile
+++ b/GUICommon/Makefile
@@ -1,14 +1,19 @@
 OBJECTS = AddressTextCtrl.o CallsignTextCtrl.o DCSSet.o DescriptionTextCtrl.o DExtraSet.o DPlusSet.o DPRSSet.o PortTextCtrl.o RemoteSet.o \
 	  RepeaterDataSet.o RepeaterInfoSet.o RestrictedTextCtrl.o StarNetSet.o XLXSet.o
 
+.PHONY: all
 all:		GUICommon.a
 
 GUICommon.a:	$(OBJECTS)
 		$(AR) rcs GUICommon.a $(OBJECTS)
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: clean
 clean:
 		$(RM) GUICommon.a *.o *.d *.bak *~
 
diff --git a/RemoteControl/Makefile b/RemoteControl/Makefile
index 48a2a54..978286d 100644
--- a/RemoteControl/Makefile
+++ b/RemoteControl/Makefile
@@ -1,17 +1,23 @@
 OBJECTS = RemoteControlAppD.o RemoteControlCallsignData.o RemoteControlConfig.o RemoteControlLinkData.o RemoteControlRemoteControlHandler.o \
 	  RemoteControlRepeaterData.o RemoteControlStarNetGroup.o RemoteControlStarNetUser.o
 
+.PHONY: all
 all:		remotecontrold
 
 remotecontrold:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o remotecontrold
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 remotecontrold $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) remotecontrold *.o *.d *.bak *~
 
diff --git a/RemoteControl/MakefileGUI b/RemoteControl/MakefileGUI
index 316607f..566a990 100644
--- a/RemoteControl/MakefileGUI
+++ b/RemoteControl/MakefileGUI
@@ -2,17 +2,23 @@ OBJECTS = RemoteControlApp.o RemoteControlCallsignData.o RemoteControlConfig.o R
 		  RemoteControlPreferences.o RemoteControlRemoteControlHandler.o RemoteControlRemoteSet.o RemoteControlRepeaterData.o \
 		  RemoteControlRepeaterPanel.o RemoteControlStarNetGroup.o RemoteControlStarNetPanel.o RemoteControlStarNetUser.o
 
+.PHONY: all
 all:		remotecontrol
 
 remotecontrol:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o remotecontrol
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 remotecontrol $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) remotecontrol *.o *.d *.bak *~
 
diff --git a/StarNetServer/Makefile b/StarNetServer/Makefile
index f49f112..cffdda5 100644
--- a/StarNetServer/Makefile
+++ b/StarNetServer/Makefile
@@ -1,16 +1,22 @@
 OBJECTS = StarNetServerAppD.o StarNetServerConfig.o StarNetServerThread.o StarNetServerThreadHelper.o
 
+.PHONY: all
 all:		starnetserverd
 
 starnetserverd:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o starnetserverd
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 starnetserverd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) starnetserverd *.o *.d *.bak *~
 
diff --git a/StarNetServer/MakefileGUI b/StarNetServer/MakefileGUI
index 9073dab..3f45261 100644
--- a/StarNetServer/MakefileGUI
+++ b/StarNetServer/MakefileGUI
@@ -2,17 +2,23 @@ OBJECTS = StarNetServerApp.o StarNetServerCallsignSet.o StarNetServerConfig.o St
 		  StarNetServerLogRedirect.o StarNetServerMiscellaneousSet.o StarNetServerPreferences.o StarNetServerThread.o \
 		  StarNetServerThreadHelper.o
 
+.PHONY: all
 all:		starnetserver
 
 starnetserver:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(GUILIBS) -o starnetserver
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 starnetserver $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) starnetserver *.o *.d *.bak *~
 
diff --git a/TextTransmit/Makefile b/TextTransmit/Makefile
index c4e70bc..14ddb89 100644
--- a/TextTransmit/Makefile
+++ b/TextTransmit/Makefile
@@ -1,16 +1,22 @@
 OBJECTS = TextTransmit.o
 
+.PHONY: all
 all:		texttransmitd
 
 texttransmitd:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o texttransmitd
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 texttransmitd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) texttransmitd *.o *.d *.bak *~
 
diff --git a/TimeServer/Makefile b/TimeServer/Makefile
index 69b2339..88119ee 100644
--- a/TimeServer/Makefile
+++ b/TimeServer/Makefile
@@ -1,16 +1,22 @@
 OBJECTS = TimeServerD.o TimeServerConfig.o TimeServerThread.o TimeServerThreadHelper.o
 
+.PHONY: all
 all:		timeserverd
 
 timeserverd:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timeserverd
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 timeserverd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) timeserverd *.o *.d *.bak *~
 
diff --git a/TimeServer/MakefileGUI b/TimeServer/MakefileGUI
index 9ac2e11..3f902cf 100644
--- a/TimeServer/MakefileGUI
+++ b/TimeServer/MakefileGUI
@@ -1,17 +1,23 @@
 OBJECTS = TimeServerApp.o TimeServerAnnouncementsSet.o TimeServerConfig.o TimeServerFrame.o TimeServerGatewaySet.o TimeServerLogRedirect.o \
 		  TimeServerPreferences.o TimeServerThread.o TimeServerThreadHelper.o
 
+.PHONY: all
 all:		timeserver
 
 timeserver:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o timeserver
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 timeserver $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) timeserver *.o *.d *.bak *~
 
diff --git a/TimerControl/Makefile b/TimerControl/Makefile
index 53877ff..eebb6a6 100644
--- a/TimerControl/Makefile
+++ b/TimerControl/Makefile
@@ -1,17 +1,23 @@
 OBJECTS = TimerControlAppD.o TimerControlConfig.o TimerControlItemFile.o TimerControlRemoteControlHandler.o TimerControlThread.o \
 	  TimerControlThreadHelper.o
 
+.PHONY: all
 all:		timercontrold
 
 timercontrold:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timercontrold
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 timercontrold $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) timercontrold *.o *.d *.bak *~
 
diff --git a/TimerControl/MakefileGUI b/TimerControl/MakefileGUI
index 0012a10..58646ea 100644
--- a/TimerControl/MakefileGUI
+++ b/TimerControl/MakefileGUI
@@ -2,17 +2,23 @@ OBJECTS = TimerControlApp.o TimerControlConfig.o TimerControlFrame.o TimerContro
 		  TimerControlRemoteControlHandler.o TimerControlRemoteSet.o TimerControlRepeaterPanel.o TimerControlThread.o \
 		  TimerControlThreadHelper.o
 
+.PHONY: all
 all:		timercontrol
 
 timercontrol:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o timercontrol
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 timercontrol $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) timercontrol *.o *.d *.bak *~
 
diff --git a/VoiceTransmit/Makefile b/VoiceTransmit/Makefile
index 71cb8ef..ee651bf 100644
--- a/VoiceTransmit/Makefile
+++ b/VoiceTransmit/Makefile
@@ -1,16 +1,22 @@
 OBJECTS = VoiceStore.o VoiceTransmit.o
 
+.PHONY: all
 all:		voicetransmitd
 
 voicetransmitd:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o voicetransmitd
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 voicetransmitd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) voicetransmitd *.o *.d *.bak *~
 
diff --git a/ircDDB/Makefile b/ircDDB/Makefile
index b841a5e..5a6602c 100644
--- a/ircDDB/Makefile
+++ b/ircDDB/Makefile
@@ -1,14 +1,19 @@
 OBJECTS = IRCClient.o IRCDDBApp.o IRCDDBClient.o IRCDDB.o IRCDDBMultiClient.o IRCMessage.o IRCMessageQueue.o IRCProtocol.o IRCReceiver.o \
 	  IRCutils.o
 
+.PHONY: all
 all:		IRCDDB.a
 
 IRCDDB.a:	$(OBJECTS)
 		$(AR) rcs IRCDDB.a $(OBJECTS)
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) $< > $*.d
 
+.PHONY: clean
 clean:
 		$(RM) IRCDDB.a *.o *.d *.bak *~
 
diff --git a/ircDDBGateway/Makefile b/ircDDBGateway/Makefile
index 3bf974e..9a43de0 100644
--- a/ircDDBGateway/Makefile
+++ b/ircDDBGateway/Makefile
@@ -1,16 +1,22 @@
 OBJECTS = IRCDDBGatewayAppD.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o IRCDDBGatewayThreadHelper.o
 
+.PHONY: all
 all:		ircddbgatewayd
 
 ircddbgatewayd:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o ircddbgatewayd
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 ircddbgatewayd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) ircddbgatewayd *.o *.d *.bak *~
 
diff --git a/ircDDBGateway/MakefileGUI b/ircDDBGateway/MakefileGUI
index 8ebf8fa..e6c2a86 100644
--- a/ircDDBGateway/MakefileGUI
+++ b/ircDDBGateway/MakefileGUI
@@ -1,17 +1,23 @@
 OBJECTS = IRCDDBGatewayApp.o IRCDDBGatewayFrame.o IRCDDBGatewayLogRedirect.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o \
 	  IRCDDBGatewayThreadHelper.o
 
+.PHONY: all
 all:		ircddbgateway
 
 ircddbgateway:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(GUILIBS) -o ircddbgateway
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 ircddbgateway $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) ircddbgateway *.o *.d *.bak *~
 
diff --git a/ircDDBGatewayConfig/Makefile b/ircDDBGatewayConfig/Makefile
index bdc24ef..9099d00 100644
--- a/ircDDBGatewayConfig/Makefile
+++ b/ircDDBGatewayConfig/Makefile
@@ -1,17 +1,23 @@
 OBJECTS = IRCDDBGatewayConfigApp.o IRCDDBGatewayConfigFrame.o IRCDDBGatewayConfigGatewaySet.o IRCDDBGatewayConfigIrcDDBSet.o \
 	  IRCDDBGatewayConfigMiscellaneousSet.o
 
+.PHONY: all
 all:		ircddbgatewayconfig
 
 ircddbgatewayconfig:	$(OBJECTS)
 		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o ircddbgatewayconfig
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../GUICommon $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 ircddbgatewayconfig $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) ircddbgatewayconfig *.o *.d *.bak *~