diff --git a/src/common/ers.h b/src/common/ers.h
index 47a076e6e4..9e120c3134 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -40,9 +40,7 @@
 #ifndef _ERS_H_
 #define _ERS_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
 
 /*****************************************************************************\
  *  (1) All public parts of the Entry Reusage System.                        *
diff --git a/src/common/plugin.h b/src/common/plugin.h
index fd01be7621..a367d25378 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -4,9 +4,7 @@
 #ifndef	_PLUGIN_H_
 #define _PLUGIN_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
 
 ////// Plugin functions ///////////////
 
diff --git a/src/common/plugins.h b/src/common/plugins.h
index e71a4e8c55..c1cf17afd1 100644
--- a/src/common/plugins.h
+++ b/src/common/plugins.h
@@ -4,10 +4,7 @@
 #ifndef	_PLUGINS_H_
 #define _PLUGINS_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
-
 #include "../common/plugin.h"
 
 ////// Dynamic Link Library functions ///////////////
diff --git a/src/common/random.h b/src/common/random.h
index 1bb8ecfb59..59b609464d 100644
--- a/src/common/random.h
+++ b/src/common/random.h
@@ -4,9 +4,7 @@
 #ifndef _RANDOM_H_
 #define _RANDOM_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
 
 void rnd_init(void);
 void rnd_seed(uint32);
diff --git a/src/common/socket.h b/src/common/socket.h
index 2f0ec60819..a5d519d0e4 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -4,9 +4,7 @@
 #ifndef	_SOCKET_H_
 #define _SOCKET_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
 
 #ifdef WIN32
 	#define WIN32_LEAN_AND_MEAN  // otherwise winsock2.h includes full windows.h
diff --git a/src/common/sql.h b/src/common/sql.h
index ef76b2ec51..5b318ab4dc 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -4,9 +4,7 @@
 #ifndef _COMMON_SQL_H_
 #define _COMMON_SQL_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
 #include <stdarg.h>// va_list
 
 
diff --git a/src/common/strlib.h b/src/common/strlib.h
index f5819bbcb7..bbc2c6105d 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -4,9 +4,7 @@
 #ifndef _STRLIB_H_
 #define _STRLIB_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
 #include <stdarg.h>
 
 #define __USE_GNU  // required to enable strnlen on some platforms
diff --git a/src/common/timer.h b/src/common/timer.h
index d27bf4c706..a615a5874a 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -4,9 +4,7 @@
 #ifndef	_TIMER_H_
 #define	_TIMER_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
 
 #define DIFF_TICK(a,b) ((int)((a)-(b)))
 
diff --git a/src/common/utils.h b/src/common/utils.h
index 2fe078615c..8e39f26557 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -4,10 +4,7 @@
 #ifndef _UTILS_H_
 #define _UTILS_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
-
 #include <stdio.h> // FILE*
 
 // generate a hex dump of the first 'length' bytes of 'buffer'
diff --git a/src/map/map.h b/src/map/map.h
index d5c4683d25..d5614354d5 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -4,9 +4,7 @@
 #ifndef _MAP_H_
 #define _MAP_H_
 
-#ifndef _CBASETYPES_H_
 #include "../common/cbasetypes.h"
-#endif
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/mmo.h"
 #include "../common/mapindex.h"