diff --git a/m-algo.h b/m-algo.h
index c0030c49..245bcdad 100644
--- a/m-algo.h
+++ b/m-algo.h
@@ -25,11 +25,6 @@
 #ifndef __M_ALGO_H
 #define __M_ALGO_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
 #include "m-core.h"
 
 /* Define different kind of algorithms named 'name' over the container
diff --git a/m-array.h b/m-array.h
index bfe548cc..16481099 100644
--- a/m-array.h
+++ b/m-array.h
@@ -25,11 +25,6 @@
 #ifndef __M_ARRAY_H
 #define __M_ARRAY_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
 #include "m-core.h"
 
 /* Define an array of a given type.
diff --git a/m-bitset.h b/m-bitset.h
index 6b82ec70..bff383b3 100644
--- a/m-bitset.h
+++ b/m-bitset.h
@@ -25,12 +25,6 @@
 #ifndef __M_BITSET_H
 #define __M_BITSET_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-#include <limits.h>
-
 #include "m-core.h"
 
 /********************************** INTERNAL ************************************/
diff --git a/m-buffer.h b/m-buffer.h
index 89903714..a60b0109 100644
--- a/m-buffer.h
+++ b/m-buffer.h
@@ -25,11 +25,6 @@
 #ifndef __M_BUFFER_H
 #define __M_BUFFER_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
 #include "m-core.h"
 #include "m-mutex.h"
 #include "m-atomic.h"
diff --git a/m-core.h b/m-core.h
index 0101eb74..390f90fb 100644
--- a/m-core.h
+++ b/m-core.h
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <limits.h>
 #include <string.h>
-
+#include <stdlib.h>
 
 /***************************************************************/
 /************************ Compiler Macro ***********************/
diff --git a/m-deque.h b/m-deque.h
index cd1bcb1b..8fb6c597 100644
--- a/m-deque.h
+++ b/m-deque.h
@@ -25,12 +25,6 @@
 #ifndef __M_DEQUE_H
 #define __M_DEQUE_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
-#include "m-core.h"
 #include "m-i-list.h"
 
 /* Define a deque of a given type.
diff --git a/m-i-list.h b/m-i-list.h
index d61e5406..bb24ecc2 100644
--- a/m-i-list.h
+++ b/m-i-list.h
@@ -25,12 +25,6 @@
 #ifndef __M_I_LIST_H
 #define __M_I_LIST_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stddef.h>
-#include <string.h>
-
 #include "m-core.h"
 
 /* Interface to add to a structure to allow intrusive support.
diff --git a/m-i-shared.h b/m-i-shared.h
index d2e0ffce..62a12eb2 100644
--- a/m-i-shared.h
+++ b/m-i-shared.h
@@ -25,10 +25,6 @@
 #ifndef __M_I_SHARED_PTR__H
 #define __M_I_SHARED_PTR__H
 
-#include <stdlib.h>
-#include <stdbool.h>
-#include <assert.h>
-
 #include "m-core.h"
 #include "m-atomic.h"
 
diff --git a/m-list.h b/m-list.h
index 3599f53f..2ec36b06 100644
--- a/m-list.h
+++ b/m-list.h
@@ -25,11 +25,6 @@
 #ifndef __M_LIST_H
 #define __M_LIST_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
 #include "m-core.h"
 
 /* Define a list of a given type.
diff --git a/m-mempool.h b/m-mempool.h
index e0a31f9d..6c85a975 100644
--- a/m-mempool.h
+++ b/m-mempool.h
@@ -25,8 +25,6 @@
 #ifndef __M_MEMPOOL_H
 #define __M_MEMPOOL_H
 
-#include <stdlib.h>
-#include <assert.h>
 #include "m-core.h"
 
 /* Fast Fixed Size thread unsafe allocator.
diff --git a/m-mutex.h b/m-mutex.h
index 9a455895..83b8d466 100644
--- a/m-mutex.h
+++ b/m-mutex.h
@@ -26,6 +26,7 @@
 #define __M_MUTEX_H
 
 #include <assert.h>
+#include <stdbool.h>
 #include "m-core.h"
 
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L    \
diff --git a/m-rbtree.h b/m-rbtree.h
index b6727dda..4f363b9b 100644
--- a/m-rbtree.h
+++ b/m-rbtree.h
@@ -25,12 +25,6 @@
 #ifndef __M_RBTREE_H
 #define __M_RBTREE_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-#include <limits.h>
-
 #include "m-core.h"
 
 /* Define a Red/Black binary tree of a given type.
diff --git a/m-shared.h b/m-shared.h
index 55ad12b7..779a3051 100644
--- a/m-shared.h
+++ b/m-shared.h
@@ -25,11 +25,6 @@
 #ifndef __M_SHARED_PTR__H
 #define __M_SHARED_PTR__H
 
-#include <stdlib.h>
-#include <stdbool.h>
-#include <assert.h>
-#include <stdint.h>
-
 #include "m-core.h"
 #include "m-atomic.h"
 
diff --git a/m-snapshot.h b/m-snapshot.h
index f3231c1e..9bd0b05e 100644
--- a/m-snapshot.h
+++ b/m-snapshot.h
@@ -25,8 +25,6 @@
 #ifndef __M_SNAPSHOT
 #define __M_SNAPSHOT
 
-#include <assert.h>
-
 #include "m-atomic.h"
 #include "m-core.h"
 
diff --git a/m-string.h b/m-string.h
index 0657e6f9..869d3766 100644
--- a/m-string.h
+++ b/m-string.h
@@ -25,10 +25,6 @@
 #ifndef __M_STRING_H
 #define __M_STRING_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/m-tuple.h b/m-tuple.h
index 053fb57c..875e9f21 100644
--- a/m-tuple.h
+++ b/m-tuple.h
@@ -23,11 +23,6 @@
 #ifndef __M_TUPLE_H
 #define __M_TUPLE_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
 #include "m-core.h"
 
 /********************** External interface *************************/
diff --git a/m-variant.h b/m-variant.h
index 8e179623..fd09c89e 100644
--- a/m-variant.h
+++ b/m-variant.h
@@ -25,11 +25,6 @@
 #ifndef __M_VARIANT_H
 #define __M_VARIANT_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
 #include "m-core.h"