diff --git a/lib/config/config.c b/lib/config/config.c
index 67c0832dc..f3b561d2b 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -28,10 +28,6 @@
  *
  */
 
-#include "config.h"
-#include "mm/pool.h"
-#include "log/log.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -41,6 +37,10 @@
 #include <string.h>
 #include <errno.h>
 
+#include "config.h"
+#include "mm/pool.h"
+#include "log/log.h"
+
 enum {
         TOK_INT,
         TOK_FLOAT,
diff --git a/lib/dev-mgr/dev-manager.c b/lib/dev-mgr/dev-manager.c
index a6e018761..e8def9d2a 100644
--- a/lib/dev-mgr/dev-manager.c
+++ b/lib/dev-mgr/dev-manager.c
@@ -39,6 +39,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <string.h>
 #include <linux/kdev_t.h>
 #include "hash.h"
 #include "mm/pool.h"