diff --git a/src/ebusd/CMakeLists.txt b/src/ebusd/CMakeLists.txt
index 9195e7d6..88de0d1a 100644
--- a/src/ebusd/CMakeLists.txt
+++ b/src/ebusd/CMakeLists.txt
@@ -1,16 +1,11 @@
 add_definitions(-Wconversion -Wno-unused-parameter)
 
 set(ebusd_SOURCES
-    bushandler.cpp
-    bushandler.h
-    datahandler.h
-    datahandler.cpp
-    network.cpp
-    network.h
-    mainloop.cpp
-    mainloop.h
-    main.h
-    main.cpp
+    bushandler.h bushandler.cpp
+    datahandler.h datahandler.cpp
+    network.h network.cpp
+    mainloop.h mainloop.cpp
+    main.h main.cpp
 )
 
 if(HAVE_MQTT)
diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am
index 12064bd7..e449dd3a 100644
--- a/src/ebusd/Makefile.am
+++ b/src/ebusd/Makefile.am
@@ -6,16 +6,12 @@ AM_CXXFLAGS = -I$(top_srcdir)/src \
 
 bin_PROGRAMS = ebusd
 
-ebusd_SOURCES = bushandler.cpp \
-		bushandler.h \
-		datahandler.cpp \
-		datahandler.h \
-		network.cpp \
-		network.h \
-		mainloop.cpp \
-		mainloop.h \
-		main.h \
-		main.cpp
+ebusd_SOURCES = \
+		bushandler.h bushandler.cpp \
+		datahandler.h datahandler.cpp \
+		network.h network.cpp \
+		mainloop.h mainloop.cpp \
+		main.h main.cpp
 
 if MQTT
 ebusd_SOURCES += mqtthandler.cpp mqtthandler.h
diff --git a/src/lib/ebus/CMakeLists.txt b/src/lib/ebus/CMakeLists.txt
index 5a2f51ea..cf69c5e3 100644
--- a/src/lib/ebus/CMakeLists.txt
+++ b/src/lib/ebus/CMakeLists.txt
@@ -7,8 +7,7 @@ set(libebus_a_SOURCES
     datatype.h datatype.cpp
     data.h data.cpp
     device.h device.cpp
-    message.cpp
-    message.h
+    message.h message.cpp
     stringhelper.h stringhelper.cpp
 )
 
diff --git a/src/lib/ebus/Makefile.am b/src/lib/ebus/Makefile.am
index aa81fd31..245ad754 100644
--- a/src/lib/ebus/Makefile.am
+++ b/src/lib/ebus/Makefile.am
@@ -4,20 +4,14 @@ AM_CXXFLAGS = -I$(top_srcdir)/src \
 
 noinst_LIBRARIES = libebus.a
 
-libebus_a_SOURCES = result.cpp \
-		    result.h \
-		    symbol.cpp \
-		    symbol.h \
-		    filereader.h \
-		    filereader.cpp \
-		    datatype.cpp \
-		    datatype.h \
-		    data.cpp \
-		    data.h \
-		    device.cpp \
-		    device.h \
-		    message.cpp \
-		    message.h \
+libebus_a_SOURCES = \
+		    result.h result.cpp \
+		    symbol.h symbol.cpp \
+		    filereader.h filereader.cpp \
+		    datatype.h datatype.cpp \
+		    data.h data.cpp \
+		    device.h device.cpp \
+		    message.h message.cpp \
 		    stringhelper.h stringhelper.cpp
 
 if CONTRIB
diff --git a/src/lib/ebus/contrib/CMakeLists.txt b/src/lib/ebus/contrib/CMakeLists.txt
index 8bfe5533..b9285248 100644
--- a/src/lib/ebus/contrib/CMakeLists.txt
+++ b/src/lib/ebus/contrib/CMakeLists.txt
@@ -1,10 +1,8 @@
 add_definitions(-Wno-unused-parameter)
 
 set(libebuscontrib_a_SOURCES
-    contrib.cpp
-    contrib.h
-    tem.cpp
-    tem.h
+    contrib.h contrib.cpp
+    tem.h tem.cpp
 )
 
 include_directories(..)
diff --git a/src/lib/ebus/contrib/Makefile.am b/src/lib/ebus/contrib/Makefile.am
index b5b79daa..c898fabf 100644
--- a/src/lib/ebus/contrib/Makefile.am
+++ b/src/lib/ebus/contrib/Makefile.am
@@ -4,7 +4,9 @@ AM_CXXFLAGS = -I$(top_srcdir)/src \
 
 noinst_LIBRARIES = libebuscontrib.a
 
-libebuscontrib_a_SOURCES = contrib.h contrib.cpp tem.h tem.cpp
+libebuscontrib_a_SOURCES = \
+        contrib.h contrib.cpp \
+        tem.h tem.cpp
 
 distclean-local:
 	-rm -f Makefile.in
diff --git a/src/lib/utils/Makefile.am b/src/lib/utils/Makefile.am
index 561d1b04..b4814602 100755
--- a/src/lib/utils/Makefile.am
+++ b/src/lib/utils/Makefile.am
@@ -4,7 +4,8 @@ AM_CXXFLAGS = -I$(top_srcdir)/src \
 
 noinst_LIBRARIES = libutils.a
 
-libutils_a_SOURCES = log.h log.cpp \
+libutils_a_SOURCES = \
+		     log.h log.cpp \
 		     tcpsocket.h tcpsocket.cpp \
 		     thread.h thread.cpp \
 		     clock.h clock.cpp \