diff --git a/m-algo.h b/m-algo.h
index e9f1edb9..7f8ae946 100644
--- a/m-algo.h
+++ b/m-algo.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_ALGO_H
-#define __M_ALGO_H
+#ifndef MSTARLIB_ALGO_H
+#define MSTARLIB_ALGO_H
 
 #include "m-core.h"
 
diff --git a/m-array.h b/m-array.h
index 24728f31..7afa1e04 100644
--- a/m-array.h
+++ b/m-array.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_ARRAY_H
-#define __M_ARRAY_H
+#ifndef MSTARLIB_ARRAY_H
+#define MSTARLIB_ARRAY_H
 
 #include "m-core.h"
 
diff --git a/m-atomic.h b/m-atomic.h
index 7d9fab6e..313ffc6e 100644
--- a/m-atomic.h
+++ b/m-atomic.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_ATOMIC_H
-#define __M_ATOMIC_H
+#ifndef MSTARLIB_ATOMIC_H
+#define MSTARLIB_ATOMIC_H
 
 /* NOTE: Due to the C++ not having recognized stdatomic.h officialy,
    it is hard to use this header directly with a C++ compiler like 
diff --git a/m-bitset.h b/m-bitset.h
index e53d6851..330becbd 100644
--- a/m-bitset.h
+++ b/m-bitset.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_BITSET_H
-#define __M_BITSET_H
+#ifndef MSTARLIB_BITSET_H
+#define MSTARLIB_BITSET_H
 
 #include "m-core.h"
 
@@ -687,9 +687,9 @@ bitset_hash(const bitset_t dest)
 #endif
 
 // NOTE: Define this function only if m-string has been included
-#ifndef __M_BITSET_STRING_H
-#ifdef  __M_STRING_H
-#define __M_BITSET_STRING_H
+#ifndef MSTARLIB_BITSET_STRING_H
+#ifdef  MSTARLIB_STRING_H
+#define MSTARLIB_BITSET_STRING_H
 
 static inline void
 bitset_get_str(string_t str, const bitset_t set, bool append)
diff --git a/m-bptree.h b/m-bptree.h
index 0e460930..5c1f56d4 100644
--- a/m-bptree.h
+++ b/m-bptree.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_BPTREE_H
-#define __M_BPTREE_H
+#ifndef MSTARLIB_BPTREE_H
+#define MSTARLIB_BPTREE_H
 
 #include "m-core.h"
 
diff --git a/m-buffer.h b/m-buffer.h
index 649c77eb..eee2865e 100644
--- a/m-buffer.h
+++ b/m-buffer.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_BUFFER_H
-#define __M_BUFFER_H
+#ifndef MSTARLIB_BUFFER_H
+#define MSTARLIB_BUFFER_H
 
 #include "m-core.h"
 #include "m-mutex.h"
diff --git a/m-core.h b/m-core.h
index a6f57f04..1c550fe1 100644
--- a/m-core.h
+++ b/m-core.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_MACRO_H
-#define __M_MACRO_H
+#ifndef MSTARLIB_MACRO_H
+#define MSTARLIB_MACRO_H
 
 #include <stddef.h>
 #include <stdbool.h>
diff --git a/m-deque.h b/m-deque.h
index 29dfbaf7..e18cf0fa 100644
--- a/m-deque.h
+++ b/m-deque.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_DEQUE_H
-#define __M_DEQUE_H
+#ifndef MSTARLIB_DEQUE_H
+#define MSTARLIB_DEQUE_H
 
 #include "m-i-list.h"
 
diff --git a/m-dict.h b/m-dict.h
index 5d6a4738..38422b3e 100644
--- a/m-dict.h
+++ b/m-dict.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_DICT_H
-#define __M_DICT_H
+#ifndef MSTARLIB_DICT_H
+#define MSTARLIB_DICT_H
 
 #include "m-list.h"
 #include "m-array.h"
diff --git a/m-genint.h b/m-genint.h
index 4001913b..1ab048f1 100644
--- a/m-genint.h
+++ b/m-genint.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_GENINT_H
-#define __M_GENINT_H
+#ifndef MSTARLIB_GENINT_H
+#define MSTARLIB_GENINT_H
 
 #include "m-core.h"
 #include "m-atomic.h"
diff --git a/m-i-list.h b/m-i-list.h
index c4d3d86b..5e0a3e26 100644
--- a/m-i-list.h
+++ b/m-i-list.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_I_LIST_H
-#define __M_I_LIST_H
+#ifndef MSTARLIB_I_LIST_H
+#define MSTARLIB_I_LIST_H
 
 #include "m-core.h"
 
diff --git a/m-i-shared.h b/m-i-shared.h
index da389323..58e12e38 100644
--- a/m-i-shared.h
+++ b/m-i-shared.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_I_SHARED_PTR__H
-#define __M_I_SHARED_PTR__H
+#ifndef MSTARLIB_I_SHARED_PTR__H
+#define MSTARLIB_I_SHARED_PTR__H
 
 #include "m-core.h"
 #include "m-atomic.h"
diff --git a/m-list.h b/m-list.h
index e855a028..da7eea17 100644
--- a/m-list.h
+++ b/m-list.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_LIST_H
-#define __M_LIST_H
+#ifndef MSTARLIB_LIST_H
+#define MSTARLIB_LIST_H
 
 #include "m-core.h"
 
diff --git a/m-mempool.h b/m-mempool.h
index 14c9cc1f..c12f506d 100644
--- a/m-mempool.h
+++ b/m-mempool.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_MEMPOOL_H
-#define __M_MEMPOOL_H
+#ifndef MSTARLIB_MEMPOOL_H
+#define MSTARLIB_MEMPOOL_H
 
 #include "m-core.h"
 
diff --git a/m-mutex.h b/m-mutex.h
index c8860d7c..ce42059a 100644
--- a/m-mutex.h
+++ b/m-mutex.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_MUTEX_H
-#define __M_MUTEX_H
+#ifndef MSTARLIB_MUTEX_H
+#define MSTARLIB_MUTEX_H
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/m-prioqueue.h b/m-prioqueue.h
index e426e883..e4200ae5 100644
--- a/m-prioqueue.h
+++ b/m-prioqueue.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_PRIOQUEUE_H
-#define __M_PRIOQUEUE_H
+#ifndef MSTARLIB_PRIOQUEUE_H
+#define MSTARLIB_PRIOQUEUE_H
 
 #include "m-core.h"
 #include "m-array.h"
diff --git a/m-rbtree.h b/m-rbtree.h
index 1c2bffe0..7bea84a2 100644
--- a/m-rbtree.h
+++ b/m-rbtree.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_RBTREE_H
-#define __M_RBTREE_H
+#ifndef MSTARLIB_RBTREE_H
+#define MSTARLIB_RBTREE_H
 
 #include "m-core.h"
 
diff --git a/m-shared.h b/m-shared.h
index 7fdfb5af..8cfe4e9e 100644
--- a/m-shared.h
+++ b/m-shared.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_SHARED_PTR__H
-#define __M_SHARED_PTR__H
+#ifndef MSTARLIB_SHARED_PTR__H
+#define MSTARLIB_SHARED_PTR__H
 
 #include "m-core.h"
 #include "m-atomic.h"
diff --git a/m-snapshot.h b/m-snapshot.h
index 04c0a6ed..40f35dfb 100644
--- a/m-snapshot.h
+++ b/m-snapshot.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_SNAPSHOT
-#define __M_SNAPSHOT
+#ifndef MSTARLIB_SNAPSHOT
+#define MSTARLIB_SNAPSHOT
 
 #include "m-atomic.h"
 #include "m-core.h"
diff --git a/m-string.h b/m-string.h
index 4667dd30..50f0460a 100644
--- a/m-string.h
+++ b/m-string.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_STRING_H
-#define __M_STRING_H
+#ifndef MSTARLIB_STRING_H
+#define MSTARLIB_STRING_H
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/m-tuple.h b/m-tuple.h
index f98b67fc..c57f3005 100644
--- a/m-tuple.h
+++ b/m-tuple.h
@@ -20,8 +20,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_TUPLE_H
-#define __M_TUPLE_H
+#ifndef MSTARLIB_TUPLE_H
+#define MSTARLIB_TUPLE_H
 
 #include "m-core.h"
 
diff --git a/m-variant.h b/m-variant.h
index f7007487..fd9198d2 100644
--- a/m-variant.h
+++ b/m-variant.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_VARIANT_H
-#define __M_VARIANT_H
+#ifndef MSTARLIB_VARIANT_H
+#define MSTARLIB_VARIANT_H
 
 #include "m-core.h"
 
diff --git a/m-worker.h b/m-worker.h
index d0d78691..8e019979 100644
--- a/m-worker.h
+++ b/m-worker.h
@@ -22,8 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __M_WORKER_H
-#define __M_WORKER_H
+#ifndef MSTARLIB_WORKER_H
+#define MSTARLIB_WORKER_H
 
 #ifndef WORKER_DISABLE