diff --git a/LCS/Common/include/Common/LofarLog4Cplus.h b/LCS/Common/include/Common/LofarLog4Cplus.h
index 58b020b9d723485311fe057a144dd30b3646d78a..9ea702ff8e68ea68733f14e46beaeaeae9776515 100644
--- a/LCS/Common/include/Common/LofarLog4Cplus.h
+++ b/LCS/Common/include/Common/LofarLog4Cplus.h
@@ -26,18 +26,16 @@
 // \file
 // Interface to the log4cplus logging package.
 
-//# Includes
+//# Never #include <config.h> or #include <lofar_config.h> in a header file!
 #include <Common/lofar_iostream.h>
 #include <Common/lofar_string.h>
 #include <Common/Exception.h>
+
+//# Includes
 #include <log4cplus/logger.h>
 #include <log4cplus/configurator.h>
 #include <log4cplus/global-init.h>
 
-#ifdef ENABLE_TRACER
-# include <Common/StringUtil.h>
-#endif
-
 namespace LOFAR {
 
 // \ingroup Common
diff --git a/LCS/Common/include/Common/LofarLogCout.h b/LCS/Common/include/Common/LofarLogCout.h
index 51b8fe1edda87f06d39a6a4c8d194481abd43280..48e3924b313e73efde9dd6731adb512e163d5fa3 100644
--- a/LCS/Common/include/Common/LofarLogCout.h
+++ b/LCS/Common/include/Common/LofarLogCout.h
@@ -32,10 +32,8 @@
 #include <Common/lofar_string.h>
 #include <Common/lofar_map.h>
 #include <Common/Exception.h>
-
 #ifdef ENABLE_LATENCY_STATS
-# include <Common/StringUtil.h>
-# include <sys/time.h>
+#include <sys/time.h>
 #endif
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/LCS/Common/include/Common/LofarLogger.h b/LCS/Common/include/Common/LofarLogger.h
index 2c039dc7b17ed5e476088c1836ac04e726ff1c1c..ecac7452257c3e45cc96a53713cd932a1ddff439 100644
--- a/LCS/Common/include/Common/LofarLogger.h
+++ b/LCS/Common/include/Common/LofarLogger.h
@@ -26,8 +26,11 @@
 // \file
 // Macro interface to the lofar logging package.
 
-//# Depending of the availability of the log4Cplus package one set of macros
-//# or the other set of macros is included.
+//# Never #include <config.h> or #include <lofar_config.h> in a header file!
+#include <Common/StringUtil.h>
+
+//# Dependent of the availability of the log4Cplus package one set of macro's
+//# or the other set of macro's is included.
 #ifdef HAVE_LOG4CPLUS
 # include <Common/LofarLog4Cplus.h>
 #else