diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dfef867..644fc383 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,6 +155,8 @@ endforeach()
 # Create our list of include directories
 set(INCLUDED_DIRECTORIES
 	"dCommon"
+	"dCommon/dClient"
+	"dCommon/dEnums"
 	"dChatFilter"
 	"dGame"
 	"dGame/dBehaviors"
@@ -165,7 +167,6 @@ set(INCLUDED_DIRECTORIES
 	"dGame/dEntity"
 	"dGame/dPropertyBehaviors"
 	"dGame/dUtilities"
-	"dCommon/dClient"
 	"dPhysics"
 	"dNavigation"
 	"dNavigation/dTerrain"
diff --git a/dCommon/AddFriendResponseCode.h b/dCommon/dEnums/AddFriendResponseCode.h
similarity index 100%
rename from dCommon/AddFriendResponseCode.h
rename to dCommon/dEnums/AddFriendResponseCode.h
diff --git a/dCommon/AddFriendResponseType.h b/dCommon/dEnums/AddFriendResponseType.h
similarity index 100%
rename from dCommon/AddFriendResponseType.h
rename to dCommon/dEnums/AddFriendResponseType.h
diff --git a/dGame/dInventory/ItemSetPassiveAbilityID.h b/dCommon/dEnums/ItemSetPassiveAbilityID.h
similarity index 100%
rename from dGame/dInventory/ItemSetPassiveAbilityID.h
rename to dCommon/dEnums/ItemSetPassiveAbilityID.h
diff --git a/dGame/dMission/MissionLockState.h b/dCommon/dEnums/MissionLockState.h
similarity index 100%
rename from dGame/dMission/MissionLockState.h
rename to dCommon/dEnums/MissionLockState.h
diff --git a/dGame/dMission/MissionState.h b/dCommon/dEnums/MissionState.h
similarity index 100%
rename from dGame/dMission/MissionState.h
rename to dCommon/dEnums/MissionState.h
diff --git a/dGame/dMission/MissionTaskType.h b/dCommon/dEnums/MissionTaskType.h
similarity index 100%
rename from dGame/dMission/MissionTaskType.h
rename to dCommon/dEnums/MissionTaskType.h
diff --git a/dGame/dMission/RacingTaskParam.h b/dCommon/dEnums/RacingTaskParam.h
similarity index 100%
rename from dGame/dMission/RacingTaskParam.h
rename to dCommon/dEnums/RacingTaskParam.h
diff --git a/dCommon/dCommonVars.h b/dCommon/dEnums/dCommonVars.h
similarity index 99%
rename from dCommon/dCommonVars.h
rename to dCommon/dEnums/dCommonVars.h
index 4c0e15fa..41d6cb67 100644
--- a/dCommon/dCommonVars.h
+++ b/dCommon/dEnums/dCommonVars.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#ifndef __DCOMMONVARS__H__
+#define __DCOMMONVARS__H__
+
 #include <cstdint>
 #include <string>
 #include <set>
@@ -648,3 +651,5 @@ inline T const& clamp(const T& val, const T& low, const T& high) {
 
 	return val;
 }
+
+#endif  //!__DCOMMONVARS__H__
diff --git a/dNet/dMessageIdentifiers.h b/dCommon/dEnums/dMessageIdentifiers.h
similarity index 100%
rename from dNet/dMessageIdentifiers.h
rename to dCommon/dEnums/dMessageIdentifiers.h
diff --git a/dCommon/dPlatforms.h b/dCommon/dEnums/dPlatforms.h
similarity index 100%
rename from dCommon/dPlatforms.h
rename to dCommon/dEnums/dPlatforms.h
diff --git a/dPhysics/dpCollisionGroups.h b/dCommon/dEnums/dpCollisionGroups.h
similarity index 100%
rename from dPhysics/dpCollisionGroups.h
rename to dCommon/dEnums/dpCollisionGroups.h
diff --git a/dPhysics/dpCommon.h b/dCommon/dEnums/dpCommon.h
similarity index 100%
rename from dPhysics/dpCommon.h
rename to dCommon/dEnums/dpCommon.h
diff --git a/dCommon/eAninmationFlags.h b/dCommon/dEnums/eAninmationFlags.h
similarity index 100%
rename from dCommon/eAninmationFlags.h
rename to dCommon/dEnums/eAninmationFlags.h
diff --git a/dCommon/eItemType.h b/dCommon/dEnums/eItemType.h
similarity index 100%
rename from dCommon/eItemType.h
rename to dCommon/dEnums/eItemType.h
diff --git a/dCommon/eUnequippableActiveType.h b/dCommon/dEnums/eUnequippableActiveType.h
similarity index 100%
rename from dCommon/eUnequippableActiveType.h
rename to dCommon/dEnums/eUnequippableActiveType.h