diff --git a/Common/Makefile b/Common/Makefile
index 54e6ed9..104702c 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -13,7 +13,7 @@ Common.a:	$(OBJECTS)
 		$(AR) rcs Common.a $(OBJECTS)
 
 %.o: %.cpp
-		$(CXX) $(CFLAGS) -c -o $@ $<
+		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -c -o $@ $<
 
 clean:
 		$(RM) Common.a *.o *.d *.bak *~
diff --git a/DStarRepeater/DStarRepeaterApp.cpp b/DStarRepeater/DStarRepeaterApp.cpp
index 94c9634..1d811d3 100644
--- a/DStarRepeater/DStarRepeaterApp.cpp
+++ b/DStarRepeater/DStarRepeaterApp.cpp
@@ -305,8 +305,7 @@ void CDStarRepeaterApp::setPosition(int x, int y)
 
 void CDStarRepeaterApp::OnRemoteCmd(wxThreadEvent& event)
 {
-	wxLogMessage("Request to execute command %s (%d)",
-		m_commandLine[event.GetInt()], event.GetInt());
+	wxLogMessage("Request to execute command %s (%d)", m_commandLine[event.GetInt()], event.GetInt());
 	// XXX sanity check the command line here.
 	wxShell(m_commandLine[event.GetInt()]);
 }
@@ -646,7 +645,7 @@ void CDStarRepeaterApp::createThread()
 #if defined(__WINDOWS__)
 	wxFileName blFilename(wxFileName::GetHomeDir(), PRIMARY_BLACKLIST_FILE_NAME);
 #else
-		wxFileName blFilename(CONF_DIR, PRIMARY_BLACKLIST_FILE_NAME);
+	wxFileName blFilename(CONF_DIR, PRIMARY_BLACKLIST_FILE_NAME);
 #endif
 	exists = blFilename.FileExists();
 
diff --git a/DStarRepeater/Makefile b/DStarRepeater/Makefile
index 67efbe9..4b16794 100644
--- a/DStarRepeater/Makefile
+++ b/DStarRepeater/Makefile
@@ -1,17 +1,17 @@
-OBJECTS = DStarRepeaterApp.o DStarRepeaterFrame.o DStarRepeaterLogger.o DStarRepeaterRXThread.o DStarRepeaterStatusData.o \
+OBJECTS = DStarRepeaterApp.o DStarRepeaterLogger.o DStarRepeaterRXThread.o DStarRepeaterStatusData.o \
 	  DStarRepeaterThread.o DStarRepeaterTRXThread.o DStarRepeaterTXRXThread.o DStarRepeaterTXThread.o
 
 all:		dstarrepeater
 
 dstarrepeater:	$(OBJECTS)
-		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o dstarrepeater
+		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o dstarrepeaterd
 
 %.o: %.cpp
-		$(CXX) $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
 
 install:
-		install -g bin -o root -m 0775 dstarrepeater $(BINDIR)
+		install -g bin -o root -m 0775 dstarrepeaterd $(BINDIR)
 
 clean:
-		$(RM) dstarrepeater *.o *.d *.bak *~
+		$(RM) dstarrepeaterd *.o *.d *.bak *~
 
diff --git a/DStarRepeaterConfig/Makefile b/DStarRepeaterConfig/Makefile
index 5bd019a..feb6a0c 100644
--- a/DStarRepeaterConfig/Makefile
+++ b/DStarRepeaterConfig/Makefile
@@ -8,7 +8,7 @@ OBJECTS = DStarRepeaterConfigActiveHangSet.o DStarRepeaterConfigAnnouncementSet.
 all:		dstarrepeaterconfig
 
 dstarrepeaterconfig:	$(OBJECTS)
-		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(LIBS) -o dstarrepeaterconfig
+		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o dstarrepeaterconfig
 
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../GUICommon -I../Common -c -o $@ $<
diff --git a/Makefile b/Makefile
index 827a627..8bd2eef 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ export BINDIR  := "/usr/bin"
 
 export CXX     := $(shell wx-config --cxx)
 export CFLAGS  := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)'
-export LIBS    := $(shell wx-config --libs adv,core) -lasound -lusb-1.0
+export GUILIBS := $(shell wx-config --libs adv,core,base) -lasound
+export LIBS    := $(shell wx-config --libs base) -lasound -lusb-1.0
 export LDFLAGS := 
 
 all:	DStarRepeater/dstarrepeater DStarRepeaterConfig/dstarrepeaterconfig