diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am
index c1be62df..8f1db832 100644
--- a/src/ebusd/Makefile.am
+++ b/src/ebusd/Makefile.am
@@ -8,6 +8,10 @@ bin_PROGRAMS = ebusd
 
 ebusd_SOURCES = network.cpp \
 		network.h \
+		dump.cpp \
+		dump.h \
+		buscommand.cpp \
+		buscommand.h \
 		ebusloop.cpp \
 		ebusloop.h \
 		baseloop.cpp \
diff --git a/src/lib/ebus/buscommand.cpp b/src/ebusd/buscommand.cpp
similarity index 100%
rename from src/lib/ebus/buscommand.cpp
rename to src/ebusd/buscommand.cpp
diff --git a/src/lib/ebus/buscommand.h b/src/ebusd/buscommand.h
similarity index 95%
rename from src/lib/ebus/buscommand.h
rename to src/ebusd/buscommand.h
index 4da99666..e454e74f 100644
--- a/src/lib/ebus/buscommand.h
+++ b/src/ebusd/buscommand.h
@@ -17,8 +17,8 @@
  * along with ebusd. If not, see http://www.gnu.org/licenses/.
  */
 
-#ifndef LIBEBUS_BUSCOMMAND_H_
-#define LIBEBUS_BUSCOMMAND_H_
+#ifndef BUSCOMMAND_H_
+#define BUSCOMMAND_H_
 
 #include "symbol.h"
 #include "result.h"
@@ -61,5 +61,5 @@ private:
 	pthread_cond_t m_cond;
 };
 
-#endif // LIBEBUS_BUSCOMMAND_H_
+#endif // BUSCOMMAND_H_
 
diff --git a/src/lib/ebus/dump.cpp b/src/ebusd/dump.cpp
similarity index 100%
rename from src/lib/ebus/dump.cpp
rename to src/ebusd/dump.cpp
diff --git a/src/lib/ebus/dump.h b/src/ebusd/dump.h
similarity index 96%
rename from src/lib/ebus/dump.h
rename to src/ebusd/dump.h
index af459dcf..5abbe5f1 100644
--- a/src/lib/ebus/dump.h
+++ b/src/ebusd/dump.h
@@ -17,8 +17,8 @@
  * along with ebusd. If not, see http://www.gnu.org/licenses/.
  */
 
-#ifndef LIBEBUS_DUMP_H_
-#define LIBEBUS_DUMP_H_
+#ifndef DUMP_H_
+#define DUMP_H_
 
 #include <string>
 
@@ -65,4 +65,4 @@ private:
 
 };
 
-#endif // LIBEBUS_DUMP_H_
+#endif // DUMP_H_
diff --git a/src/lib/ebus/Makefile.am b/src/lib/ebus/Makefile.am
index 64fa53d9..570375bf 100644
--- a/src/lib/ebus/Makefile.am
+++ b/src/lib/ebus/Makefile.am
@@ -12,16 +12,12 @@ libebus_a_SOURCES = result.cpp \
 		    data.h \
 		    port.cpp \
 		    port.h \
-		    buscommand.cpp \
-		    buscommand.h \
 		    command.cpp \
 		    command.h \
 		    commands.cpp \
 		    commands.h \
 		    configfile.cpp \
 		    configfile.h \
-		    dump.cpp \
-		    dump.h \
 		    decode.cpp \
 		    decode.h \
 		    encode.cpp \