diff --git a/cmp_tool.c b/cmp_tool.c
index e22afc7e16a48161358bfeea7789ab1009ae775d..edae3203a7dd7bd73e1bd1a9e101c386c85b351d 100644
--- a/cmp_tool.c
+++ b/cmp_tool.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <getopt.h>
-#include <time.h>
 
 #include "cmp_tool-config.h"
 #include "cmp_io.h"
diff --git a/lib/cmp_data_types.c b/lib/cmp_data_types.c
index 4437a39bab13d57fe910afaefbd093d5cb87338b..373dd51b1d554a8e2fdf6b94161c91578ac5aa1f 100644
--- a/lib/cmp_data_types.c
+++ b/lib/cmp_data_types.c
@@ -21,6 +21,7 @@
 #include <limits.h>
 
 
+#include <cmp_support.h>
 #include <cmp_data_types.h>
 #include <cmp_debug.h>
 #include <byteorder.h>
diff --git a/lib/cmp_entity.c b/lib/cmp_entity.c
index 1ca2b20873f5ab0815ccb569a82e043c58d82ea7..57fafd8f98af7127844cf19ce43e906305c6f770 100644
--- a/lib/cmp_entity.c
+++ b/lib/cmp_entity.c
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <limits.h>
 #if defined __has_include
 #  if __has_include(<time.h>)
 #    include <time.h>
@@ -2291,7 +2290,7 @@ static time_t my_timegm(struct tm *tm)
 /*
  * @brief Generate a timestamp for the compression header
  *
- * @param ts	pointer to an object of type struct timespec of the 
+ * @param ts	pointer to an object of type struct timespec of the
  *	timestamp time, NULL for now
  *
  * @returns returns compression header timestamp or 0 on error
diff --git a/lib/cmp_guess.c b/lib/cmp_guess.c
index 86387959a262f857cb44208b65762f7377a48edf..b13fe7c5f6980ef990a97174b0ded25bd650d4ce 100644
--- a/lib/cmp_guess.c
+++ b/lib/cmp_guess.c
@@ -21,7 +21,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <cmp_data_types.h>
 #include <cmp_icu.h>
diff --git a/lib/decmp.c b/lib/decmp.c
index 536080282c81edf5c48734436fdb2844adead3a1..18ebe5dce70961fee74c8794b4bbb4e7cf98a167 100644
--- a/lib/decmp.c
+++ b/lib/decmp.c
@@ -22,7 +22,6 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <limits.h>
 #include <string.h>
 
diff --git a/lib/rdcu_cmd.c b/lib/rdcu_cmd.c
index 21548353a68a4aa01862ef6821bae2a2bbae3edd..39c7c6ded87666120d275ef5c14bc87903fd2299 100644
--- a/lib/rdcu_cmd.c
+++ b/lib/rdcu_cmd.c
@@ -18,9 +18,7 @@
  */
 
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <rmap.h>
 #include <rdcu_cmd.h>
diff --git a/lib/rdcu_ctrl.c b/lib/rdcu_ctrl.c
index 6f743c68c09bc656bef11a941845d1d9cb7847ea..ba892ac0826f54f4e97efbfcbad44d5fcd878f05 100644
--- a/lib/rdcu_ctrl.c
+++ b/lib/rdcu_ctrl.c
@@ -59,10 +59,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 
 #include <byteorder.h>
-#include <rmap.h>
 #include <rdcu_cmd.h>
 #include <rdcu_ctrl.h>
 #include <rdcu_rmap.h>
diff --git a/lib/rdcu_pkt_to_file.c b/lib/rdcu_pkt_to_file.c
index 9e80125f0335a9576dc56194c79479155a906368..61088db20957f9850157973c98e18cd326d2f3f5 100644
--- a/lib/rdcu_pkt_to_file.c
+++ b/lib/rdcu_pkt_to_file.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include <cmp_support.h>
 #include <rdcu_pkt_to_file.h>
 #include <cmp_rdcu_extended.h>
 #include <rdcu_rmap.h>
diff --git a/test/cmp_entity/test_cmp_entity.c b/test/cmp_entity/test_cmp_entity.c
index 70b50009561a30aef35b4aaa30795e3073109775..f4eb523bf9b223f7f2944371bcee0c7d8cdbc95e 100644
--- a/test/cmp_entity/test_cmp_entity.c
+++ b/test/cmp_entity/test_cmp_entity.c
@@ -17,7 +17,7 @@
  */
 
 
-#include <stdlib.h>
+#include <string.h>
 #if defined __has_include
 #  if __has_include(<time.h>)
 #    include <time.h>
@@ -29,8 +29,6 @@
 #include <unity.h>
 
 #include <cmp_entity.h>
-#include <cmp_io.h>
-#include <cmp_icu.h>
 #include <cmp_data_types.h>