diff --git a/Core/Libraries/Include/Lib/BaseTypeCore.h b/Core/Libraries/Include/Lib/BaseTypeCore.h
index 193271d9bc..b88babac74 100644
--- a/Core/Libraries/Include/Lib/BaseTypeCore.h
+++ b/Core/Libraries/Include/Lib/BaseTypeCore.h
@@ -36,6 +36,7 @@
 #include <string.h>
 // TheSuperHackers @compile feliwir 07/04/2025 Adds utility macros for cross-platform compatibility
 #include <Utility/compat.h>
+#include <Utility/CppMacros.h>
 
 /*
 **	Turn off some unneeded warnings.
diff --git a/Dependencies/Utility/Utility/CppMacros.h b/Dependencies/Utility/Utility/CppMacros.h
index 7a6c1be907..a3f2531ac5 100644
--- a/Dependencies/Utility/Utility/CppMacros.h
+++ b/Dependencies/Utility/Utility/CppMacros.h
@@ -24,3 +24,9 @@
 #else
 #define NOEXCEPT_17
 #endif
+
+#if __cplusplus >= 201103L
+    #define CPP_11(code) code
+#else
+    #define CPP_11(code)
+#endif
diff --git a/Generals/Code/GameEngine/Include/Common/ActionManager.h b/Generals/Code/GameEngine/Include/Common/ActionManager.h
index acedf2eafd..bf7ca2be78 100644
--- a/Generals/Code/GameEngine/Include/Common/ActionManager.h
+++ b/Generals/Code/GameEngine/Include/Common/ActionManager.h
@@ -44,12 +44,12 @@
 class Object;
 class Player;
 class SpecialPowerTemplate;
-enum SpecialPowerType;
-enum WeaponSlotType;
-enum CommandSourceType;
-enum CanAttackResult;
+enum SpecialPowerType CPP_11(: Int);
+enum WeaponSlotType CPP_11(: Int);
+enum CommandSourceType CPP_11(: Int);
+enum CanAttackResult CPP_11(: Int);
 
-enum CanEnterType
+enum CanEnterType CPP_11(: Int)
 {
 	CHECK_CAPACITY,
 	DONT_CHECK_CAPACITY,
diff --git a/Generals/Code/GameEngine/Include/Common/AudioAffect.h b/Generals/Code/GameEngine/Include/Common/AudioAffect.h
index aeb50560c9..6613abaef4 100644
--- a/Generals/Code/GameEngine/Include/Common/AudioAffect.h
+++ b/Generals/Code/GameEngine/Include/Common/AudioAffect.h
@@ -30,9 +30,11 @@
 #ifndef _AUDIOAFFECT_H_
 #define _AUDIOAFFECT_H_
 
+#include <Lib/BaseType.h>
+
 // if it is set by the options panel, use the system setting parameter. Otherwise, this will be 
 // appended to whatever the current system volume is.
-enum AudioAffect
+enum AudioAffect CPP_11(: Int)
 {
 	AudioAffect_Music		= 0x01,
 	AudioAffect_Sound		= 0x02,
diff --git a/Generals/Code/GameEngine/Include/Common/AudioEventInfo.h b/Generals/Code/GameEngine/Include/Common/AudioEventInfo.h
index 1a1401f2db..fcc0804ba8 100644
--- a/Generals/Code/GameEngine/Include/Common/AudioEventInfo.h
+++ b/Generals/Code/GameEngine/Include/Common/AudioEventInfo.h
@@ -41,7 +41,7 @@
 struct FieldParse;
 
 // USEFUL DECLARATIONS ////////////////////////////////////////////////////////////////////////////
-enum AudioType
+enum AudioType CPP_11(: Int)
 {
 	AT_Music,
 	AT_Streaming,
@@ -49,7 +49,7 @@ enum AudioType
 };
 
 extern const char *theAudioPriorityNames[];
-enum AudioPriority
+enum AudioPriority CPP_11(: Int)
 {
 	AP_LOWEST,
 	AP_LOW,
@@ -59,7 +59,7 @@ enum AudioPriority
 };
 
 extern const char *theSoundTypeNames[];
-enum SoundType
+enum SoundType CPP_11(: Int)
 {
 	ST_UI										= 0x0001,
 	ST_WORLD								= 0x0002,
@@ -73,7 +73,7 @@ enum SoundType
 };
 
 extern const char *theAudioControlNames[];
-enum AudioControl
+enum AudioControl CPP_11(: Int)
 {
 	AC_LOOP									= 0x0001,
 	AC_RANDOM								= 0x0002,
diff --git a/Generals/Code/GameEngine/Include/Common/AudioEventRTS.h b/Generals/Code/GameEngine/Include/Common/AudioEventRTS.h
index ee3fe5f6fa..4bf690e604 100644
--- a/Generals/Code/GameEngine/Include/Common/AudioEventRTS.h
+++ b/Generals/Code/GameEngine/Include/Common/AudioEventRTS.h
@@ -38,7 +38,7 @@
 // forward declarations ///////////////////////////////////////////////////////////////////////////
 struct AudioEventInfo;
 
-enum OwnerType
+enum OwnerType CPP_11(: Int)
 {
 	OT_Positional,
 	OT_Drawable,
@@ -47,7 +47,7 @@ enum OwnerType
 	OT_INVALID
 };
 
-enum PortionToPlay
+enum PortionToPlay CPP_11(: Int)
 {
 	PP_Attack,
 	PP_Sound,
@@ -55,7 +55,7 @@ enum PortionToPlay
 	PP_Done
 };
 
-enum AudioPriority;
+enum AudioPriority CPP_11(: Int);
 
 // This is called AudioEventRTS because AudioEvent is a typedef in ww3d
 // You might want this to be memory pooled (I personally do), but it can't
diff --git a/Generals/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h b/Generals/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
index b3a05e56ba..3893609f4d 100644
--- a/Generals/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
+++ b/Generals/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
@@ -31,7 +31,7 @@
 #ifndef _AUDIOHANDLESPECIALVALUES_H_
 #define _AUDIOHANDLESPECIALVALUES_H_
 
-enum AudioHandleSpecialValues
+enum AudioHandleSpecialValues CPP_11(: Int)
 {
 	AHSV_Error					= 0x00,
 	AHSV_NoSound,
diff --git a/Generals/Code/GameEngine/Include/Common/AudioRequest.h b/Generals/Code/GameEngine/Include/Common/AudioRequest.h
index 3f6b2e8b49..18c3085acb 100644
--- a/Generals/Code/GameEngine/Include/Common/AudioRequest.h
+++ b/Generals/Code/GameEngine/Include/Common/AudioRequest.h
@@ -36,7 +36,7 @@
 
 class AudioEventRTS;
 
-enum RequestType
+enum RequestType CPP_11(: Int)
 {
 	AR_Play,
 	AR_Pause,
diff --git a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h
index 2f7bca7474..2934918bb4 100644
--- a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h
+++ b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h
@@ -72,7 +72,7 @@ typedef ObjectSellList::iterator ObjectSellListIterator;
 //-------------------------------------------------------------------------------------------------
 /** Return codes for queries about being able to build */
 //-------------------------------------------------------------------------------------------------
-enum CanMakeType
+enum CanMakeType CPP_11(: Int)
 {
 	CANMAKE_OK,
 	CANMAKE_NO_PREREQ,
@@ -86,7 +86,7 @@ enum CanMakeType
 //-------------------------------------------------------------------------------------------------
 /** Return codes for queries about legal build locations */
 //-------------------------------------------------------------------------------------------------
-enum LegalBuildCode
+enum LegalBuildCode CPP_11(: Int)
 {
 	LBC_OK = 0,
 	LBC_RESTRICTED_TERRAIN,
diff --git a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h
index a0b75a1c9c..89ecb6aa32 100644
--- a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h
+++ b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h
@@ -40,7 +40,7 @@
 /** Kind of flags for determining groups of things that belong together
 	* NOTE: You *MUST* keep this in the same order as the DisabledNames[] below */
 //-------------------------------------------------------------------------------------------------
-enum DisabledType
+enum DisabledType CPP_11(: Int)
 {
 	DISABLED_DEFAULT,     //Typical disable -- like systems, things that don't need to run.
 	DISABLED_HACKED,      //This unit has been hacked
diff --git a/Generals/Code/GameEngine/Include/Common/DrawModule.h b/Generals/Code/GameEngine/Include/Common/DrawModule.h
index 051d042257..a9cb5f02bc 100644
--- a/Generals/Code/GameEngine/Include/Common/DrawModule.h
+++ b/Generals/Code/GameEngine/Include/Common/DrawModule.h
@@ -54,8 +54,8 @@ class TracerDrawInterface;
 class RopeDrawInterface;
 class LaserDrawInterface;
 class FXList;
-enum TerrainDecalType;
-enum ShadowType;
+enum TerrainDecalType CPP_11(: Int);
+enum ShadowType CPP_11(: Int);
 
 //class ModelConditionFlags;
 
diff --git a/Generals/Code/GameEngine/Include/Common/Errors.h b/Generals/Code/GameEngine/Include/Common/Errors.h
index dae85b39d4..74ae98bcd8 100644
--- a/Generals/Code/GameEngine/Include/Common/Errors.h
+++ b/Generals/Code/GameEngine/Include/Common/Errors.h
@@ -54,7 +54,7 @@
 	to add to this list as necessary; however, there should generally be very
 	few codes needed.
 */
-enum ErrorCode
+enum ErrorCode CPP_11(: UnsignedInt)
 {
 	ERROR_BASE									= 0xdead0001,								// a nice, distinctive value
 
diff --git a/Generals/Code/GameEngine/Include/Common/GameAudio.h b/Generals/Code/GameEngine/Include/Common/GameAudio.h
index d3075380e1..a9254cdca6 100644
--- a/Generals/Code/GameEngine/Include/Common/GameAudio.h
+++ b/Generals/Code/GameEngine/Include/Common/GameAudio.h
@@ -61,8 +61,8 @@ class Object;
 class SoundManager;
 
 
-enum AudioAffect;
-enum AudioType;
+enum AudioAffect CPP_11(: Int);
+enum AudioType CPP_11(: Int);
 
 struct AudioEventInfo;
 struct AudioRequest;
diff --git a/Generals/Code/GameEngine/Include/Common/GameCommon.h b/Generals/Code/GameEngine/Include/Common/GameCommon.h
index ec4b0f5940..90c23ecc61 100644
--- a/Generals/Code/GameEngine/Include/Common/GameCommon.h
+++ b/Generals/Code/GameEngine/Include/Common/GameCommon.h
@@ -120,7 +120,7 @@ enum
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum GameDifficulty
+enum GameDifficulty CPP_11(: Int)
 {
 	DIFFICULTY_EASY,
 	DIFFICULTY_NORMAL,
@@ -130,7 +130,7 @@ enum GameDifficulty
 };
 
 //-------------------------------------------------------------------------------------------------
-enum PlayerType
+enum PlayerType CPP_11(: Int)
 {
 	PLAYER_HUMAN,				///< player is human-controlled
 	PLAYER_COMPUTER,		///< player is computer-controlled
@@ -140,7 +140,7 @@ enum PlayerType
 
 //-------------------------------------------------------------------------------------------------
 /// A PartitionCell can be one of three states for Shroud
-enum CellShroudStatus
+enum CellShroudStatus CPP_11(: Int)
 {
 	CELLSHROUD_CLEAR,
 	CELLSHROUD_FOGGED,
@@ -151,7 +151,7 @@ enum CellShroudStatus
 
 //-------------------------------------------------------------------------------------------------
 /// Since an object can take up more than a single PartitionCell, this is a status that applies to the whole Object
-enum ObjectShroudStatus
+enum ObjectShroudStatus CPP_11(: Int)
 {
 	OBJECTSHROUD_INVALID,				///< indeterminate state, will recompute
 	OBJECTSHROUD_CLEAR,					///< object is not shrouded at all (ie, completely visible)
@@ -164,7 +164,7 @@ enum ObjectShroudStatus
 };
 
 //-------------------------------------------------------------------------------------------------
-enum GuardMode
+enum GuardMode CPP_11(: Int)
 {
 	GUARDMODE_NORMAL,
 	GUARDMODE_GUARD_WITHOUT_PURSUIT,	// no pursuit out of guard area
@@ -185,7 +185,7 @@ enum
 
 /// Veterancy level define needed by several files that don't need the full Experience code.
 // NOTE NOTE NOTE: Keep TheVeterencyNames in sync with these.
-enum VeterancyLevel
+enum VeterancyLevel CPP_11(: Int)
 {
 	LEVEL_REGULAR = 0,
 	LEVEL_VETERAN,
@@ -204,7 +204,7 @@ extern const char *TheVeterancyNames[];
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum CommandSourceType 
+enum CommandSourceType CPP_11(: Int) 
 { 
 
 	CMD_FROM_PLAYER = 0, 
@@ -215,7 +215,7 @@ enum CommandSourceType
 };		///< the source of a command
 
 //-------------------------------------------------------------------------------------------------
-enum AbleToAttackType
+enum AbleToAttackType CPP_11(: Int)
 {
 	_ATTACK_FORCED			= 0x01,
 	_ATTACK_CONTINUED		= 0x02,
@@ -453,7 +453,7 @@ class DLINK_ITERATOR
 
 // ------------------------------------------------------------------------
 
-enum WhichTurretType
+enum WhichTurretType CPP_11(: Int)
 {
 	TURRET_INVALID = -1,
 
@@ -476,7 +476,7 @@ inline Real stdAngleDiff(Real a1, Real a2)
 
 // ------------------------------------------------------------------------
 // NOTE NOTE NOTE: Keep TheRelationShipNames in sync with this enum
-enum Relationship
+enum Relationship CPP_11(: Int)
 {
 	ENEMIES = 0,
 	NEUTRAL,
diff --git a/Generals/Code/GameEngine/Include/Common/GameLOD.h b/Generals/Code/GameEngine/Include/Common/GameLOD.h
index 718eb599c6..d726bf8086 100644
--- a/Generals/Code/GameEngine/Include/Common/GameLOD.h
+++ b/Generals/Code/GameEngine/Include/Common/GameLOD.h
@@ -36,13 +36,13 @@
 #ifndef _GAME_LOD_H_
 #define _GAME_LOD_H_
 
-enum ParticlePriorityType;
+enum ParticlePriorityType CPP_11(: Int);
 
 #define MAX_LOD_PRESETS_PER_LEVEL	32	//number of hardware configs preset for each low,medium,high
 #define MAX_BENCH_PROFILES	16
 
 //Make sure this enum stays in sync with GameLODNames[]
-enum StaticGameLODLevel
+enum StaticGameLODLevel CPP_11(: Int)
 {
 	STATIC_GAME_LOD_UNKNOWN=-1,
 	STATIC_GAME_LOD_LOW,
@@ -52,7 +52,7 @@ enum StaticGameLODLevel
 	STATIC_GAME_LOD_COUNT
 };
 
-enum DynamicGameLODLevel
+enum DynamicGameLODLevel CPP_11(: Int)
 {
 	DYNAMIC_GAME_LOD_UNKNOWN=-1,
 	DYNAMIC_GAME_LOD_LOW,
@@ -63,7 +63,7 @@ enum DynamicGameLODLevel
 };
 
 //Make sure this stays in sync with CPUNames[] in gamelod.cpp
-enum CpuType
+enum CpuType CPP_11(: Int)
 {
 	XX,	//unknown type
 	P3,
@@ -72,7 +72,7 @@ enum CpuType
 };
 
 //Keep this in sync with VideoNames in Gamelod.cpp
-enum ChipsetType
+enum ChipsetType CPP_11(: Int)
 {	DC_UNKNOWN,
 	DC_VOODOO2,
 	DC_VOODOO3,
diff --git a/Generals/Code/GameEngine/Include/Common/GameState.h b/Generals/Code/GameEngine/Include/Common/GameState.h
index 651e0ba0a0..4d0a5a423c 100644
--- a/Generals/Code/GameEngine/Include/Common/GameState.h
+++ b/Generals/Code/GameEngine/Include/Common/GameState.h
@@ -51,7 +51,7 @@ typedef void (*IterateSaveFileCallback)( AsciiString filename, void *userData );
 	* save/load menu initialization you can make that menu allow loading only, or allow
 	* both saving and loading from the same menu */
 // ------------------------------------------------------------------------------------------------
-enum SaveLoadLayoutType
+enum SaveLoadLayoutType CPP_11(: Int)
 {
 	SLLT_INVALID = 0,
 	SLLT_SAVE_AND_LOAD,
@@ -82,7 +82,7 @@ struct SaveDate
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum SaveFileType
+enum SaveFileType CPP_11(: Int)
 {
 	SAVE_FILE_TYPE_NORMAL,		///< a regular save game at any arbitrary point in the game
 	SAVE_FILE_TYPE_MISSION,		///< a save game in between missions (a mission save)
@@ -126,7 +126,7 @@ struct AvailableGameInfo
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum SaveCode
+enum SaveCode CPP_11(: Int)
 {
 	SC_INVALID = -1,
 	SC_OK,
@@ -139,7 +139,7 @@ enum SaveCode
 	SC_ERROR,
 };
 
-enum SnapshotType {
+enum SnapshotType CPP_11(: Int) {
 	SNAPSHOT_SAVELOAD,
 	SNAPSHOT_DEEPCRC_LOGICONLY,
 	SNAPSHOT_DEEPCRC,
diff --git a/Generals/Code/GameEngine/Include/Common/GameType.h b/Generals/Code/GameEngine/Include/Common/GameType.h
index 60b04cbca0..566f560f7c 100644
--- a/Generals/Code/GameEngine/Include/Common/GameType.h
+++ b/Generals/Code/GameEngine/Include/Common/GameType.h
@@ -38,21 +38,21 @@
 #define DEFAULT_WORLD_HEIGHT	64
 
 /// A unique, generic "identifier" used to access Objects.
-enum ObjectID
+enum ObjectID CPP_11(: Int)
 {
 	INVALID_ID = 0,
 	FORCE_OBJECTID_TO_LONG_SIZE = 0x7ffffff
 };
 
 /// A unique, generic "identifier" used to access Drawables.
-enum DrawableID
+enum DrawableID CPP_11(: Int)
 {
 	INVALID_DRAWABLE_ID = 0,
 	FORCE_DRAWABLEID_TO_LONG_SIZE = 0x7ffffff
 };
 
 /// A unique, generic "identifier" used to identify player specified formations.
-enum FormationID
+enum FormationID CPP_11(: Int)
 {
 	NO_FORMATION_ID = 0,					// Unit is not a member of any formation
 	FORCE_FORMATIONID_TO_LONG_SIZE = 0x7ffffff
@@ -63,7 +63,7 @@ class INI;
 //-------------------------------------------------------------------------------------------------
 /** The time of day enumeration, keep in sync with TimeOfDayNames[] */
 //-------------------------------------------------------------------------------------------------
-enum TimeOfDay
+enum TimeOfDay CPP_11(: Int)
 {
 	TIME_OF_DAY_INVALID = 0,
 	TIME_OF_DAY_FIRST = 1,
@@ -79,7 +79,7 @@ extern const char *TimeOfDayNames[];
 // defined in Common/GameType.cpp
 
 //-------------------------------------------------------------------------------------------------
-enum Weather
+enum Weather CPP_11(: Int)
 {
 	WEATHER_NORMAL = 0,
 	WEATHER_SNOWY = 1,
@@ -89,7 +89,7 @@ enum Weather
 
 extern const char *WeatherNames[];
 
-enum Scorches
+enum Scorches CPP_11(: Int)
 {
 	SCORCH_1 = 0,
 	SCORCH_2 = 1,
@@ -168,7 +168,7 @@ enum Scorches
 };
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponSlotType
+enum WeaponSlotType CPP_11(: Int)
 {
 	PRIMARY_WEAPON = 0,
 	SECONDARY_WEAPON,
@@ -186,7 +186,7 @@ enum WeaponSlotType
 // made of structures.
 // Note that the bridges just index in the pathfinder, so you don't actually
 // have a LAYER_BRIDGE_1 enum value.
-enum PathfindLayerEnum {LAYER_INVALID = 0, LAYER_GROUND = 1, LAYER_WALL = 15, LAYER_LAST=15};
+enum PathfindLayerEnum CPP_11(: Int) {LAYER_INVALID = 0, LAYER_GROUND = 1, LAYER_WALL = 15, LAYER_LAST=15};
 
 //-------------------------------------------------------------------------------------------------
 
diff --git a/Generals/Code/GameEngine/Include/Common/Geometry.h b/Generals/Code/GameEngine/Include/Common/Geometry.h
index 3e02ad4fa7..ec3e436fdb 100644
--- a/Generals/Code/GameEngine/Include/Common/Geometry.h
+++ b/Generals/Code/GameEngine/Include/Common/Geometry.h
@@ -46,7 +46,7 @@ class INI;
 	* order of this geometry and the fact that the values start at 1
 	*/
 //-------------------------------------------------------------------------------------------------
-enum GeometryType
+enum GeometryType CPP_11(: Int)
 {
 	GEOMETRY_SPHERE = 0,	///< partition/collision testing as sphere. (majorRadius = radius)
 	GEOMETRY_CYLINDER,		///< partition/collision testing as cylinder. (majorRadius = radius, height = height)
@@ -68,7 +68,7 @@ static const char *GeometryNames[] =
 
 //-------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(_INTERNAL)
-enum ExtentModType
+enum ExtentModType CPP_11(: Int)
 {
 	EXTENTMOD_INVALID = 0,
 	EXTENTMOD_TYPE = 1,
diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h
index 8263cafc71..c694416728 100644
--- a/Generals/Code/GameEngine/Include/Common/GlobalData.h
+++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h
@@ -42,12 +42,12 @@
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 struct FieldParse;
-enum _TerrainLOD;
+enum _TerrainLOD CPP_11(: Int);
 class GlobalData;
 class INI;
 class WeaponBonusSet;
-enum BodyDamageType;
-enum AIDebugOptions;
+enum BodyDamageType CPP_11(: Int);
+enum AIDebugOptions CPP_11(: Int);
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/Generals/Code/GameEngine/Include/Common/INI.h b/Generals/Code/GameEngine/Include/Common/INI.h
index 8dc3c9b729..06c477c86f 100644
--- a/Generals/Code/GameEngine/Include/Common/INI.h
+++ b/Generals/Code/GameEngine/Include/Common/INI.h
@@ -42,12 +42,12 @@
 class INI;
 class Xfer;
 class File;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 /** These control the behavior of loading the INI data into items */
 //-------------------------------------------------------------------------------------------------
-enum INILoadType
+enum INILoadType CPP_11(: Int)
 {	
 	INI_LOAD_INVALID,						///< invalid load type
 	INI_LOAD_OVERWRITE,					///< create new or load *over* existing data instance
diff --git a/Generals/Code/GameEngine/Include/Common/KindOf.h b/Generals/Code/GameEngine/Include/Common/KindOf.h
index 97c3bd6950..6a47f33c77 100644
--- a/Generals/Code/GameEngine/Include/Common/KindOf.h
+++ b/Generals/Code/GameEngine/Include/Common/KindOf.h
@@ -40,7 +40,7 @@
 /** Kind of flags for determining groups of things that belong together
 	* NOTE: You *MUST* keep this in the same order as the KindOfNames[] below */
 //-------------------------------------------------------------------------------------------------
-enum KindOfType
+enum KindOfType CPP_11(: Int)
 {
 	KINDOF_INVALID = -1,
 	KINDOF_FIRST = 0,
diff --git a/Generals/Code/GameEngine/Include/Common/MapObject.h b/Generals/Code/GameEngine/Include/Common/MapObject.h
index 72ea74cd18..7c68eb2516 100644
--- a/Generals/Code/GameEngine/Include/Common/MapObject.h
+++ b/Generals/Code/GameEngine/Include/Common/MapObject.h
@@ -42,7 +42,7 @@ class WorldHeightMap;
 class RenderObjClass;
 class ThingTemplate;
 class Shadow;
-enum WaypointID;
+enum WaypointID CPP_11(: Int);
 
 #define MAP_XY_FACTOR			(10.0f)	 //How wide and tall each height map square is in world space.
 #define MAP_HEIGHT_SCALE	(MAP_XY_FACTOR/16.0f)		//divide all map heights by 8.
diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h
index de879daed3..1edb0c70c2 100644
--- a/Generals/Code/GameEngine/Include/Common/MessageStream.h
+++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h
@@ -46,8 +46,8 @@ typedef UnsignedInt TranslatorID;								///< Unique identifiers for message str
 
 class Drawable;
 class GameMessageList;
-enum ObjectID;
-enum DrawableID;
+enum ObjectID CPP_11(: Int);
+enum DrawableID CPP_11(: Int);
 
 union GameMessageArgumentType														///< Union of possible data for given message type
 {
@@ -65,7 +65,7 @@ union GameMessageArgumentType														///< Union of possible data for given
 	WideChar				wChar;
 };
 
-enum GameMessageArgumentDataType 
+enum GameMessageArgumentDataType CPP_11(: Int) 
 {
 	ARGUMENTDATATYPE_INTEGER,
 	ARGUMENTDATATYPE_REAL,
@@ -679,7 +679,7 @@ class GameMessageList : public SubsystemInterface
 	What to do with a GameMessage after a translator has handled it.
 	Use a custom enum (rather than a Bool) to make the code more obvious.
 */
-enum GameMessageDisposition
+enum GameMessageDisposition CPP_11(: Int)
 {
 	KEEP_MESSAGE,			///< continue processing this message thru other translators
 	DESTROY_MESSAGE		///< destroy this message immediately and don't hand it to any other translators
diff --git a/Generals/Code/GameEngine/Include/Common/ModelState.h b/Generals/Code/GameEngine/Include/Common/ModelState.h
index 43c0553cb2..9ca76f0f97 100644
--- a/Generals/Code/GameEngine/Include/Common/ModelState.h
+++ b/Generals/Code/GameEngine/Include/Common/ModelState.h
@@ -87,7 +87,7 @@
 // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal"
 // state is defined by the bit being off. That is, the typical "normal" condition
 // has all condition flags set to zero.
-enum ModelConditionFlagType
+enum ModelConditionFlagType CPP_11(: Int)
 {
 	MODELCONDITION_INVALID = -1,
 
diff --git a/Generals/Code/GameEngine/Include/Common/Module.h b/Generals/Code/GameEngine/Include/Common/Module.h
index 3c8049813a..a291cfed56 100644
--- a/Generals/Code/GameEngine/Include/Common/Module.h
+++ b/Generals/Code/GameEngine/Include/Common/Module.h
@@ -41,8 +41,8 @@
 #include "Common/Snapshot.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-enum TimeOfDay;
-enum StaticGameLODLevel;
+enum TimeOfDay CPP_11(: Int);
+enum StaticGameLODLevel CPP_11(: Int);
 class Drawable;
 class Object;
 class Player;
@@ -54,7 +54,7 @@ struct FieldParse;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ModuleType 
+enum ModuleType CPP_11(: Int) 
 {
 	MODULETYPE_BEHAVIOR = 0,
 
@@ -79,7 +79,7 @@ enum ModuleType
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ModuleInterfaceType 
+enum ModuleInterfaceType CPP_11(: Int) 
 {
 	MODULEINTERFACE_UPDATE					= 0x00000001,
 	MODULEINTERFACE_DIE							= 0x00000002,
diff --git a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h
index 0697683376..1363a4b5b6 100644
--- a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h
+++ b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h
@@ -46,7 +46,7 @@
 	determined at runtime. (The generated code is basically identical, of course.)
 */
 //------------------------------------------------------------------------------------------------- 
-enum NameKeyType
+enum NameKeyType CPP_11(: Int)
 {
 	NAMEKEY_INVALID					= 0,
 	NAMEKEY_MAX							= 1<<23,					// max ordinal value of a NameKey (some code relies on these fitting into 24 bits safely)
diff --git a/Generals/Code/GameEngine/Include/Common/OSDisplay.h b/Generals/Code/GameEngine/Include/Common/OSDisplay.h
index 05bd458a90..fe733b0660 100644
--- a/Generals/Code/GameEngine/Include/Common/OSDisplay.h
+++ b/Generals/Code/GameEngine/Include/Common/OSDisplay.h
@@ -35,7 +35,7 @@
 
 class AsciiString;
 
-enum OSDisplayButtonType
+enum OSDisplayButtonType CPP_11(: UnsignedInt)
 {
 	OSDBT_OK										= 0x00000001,
 	OSDBT_CANCEL								= 0x00000002,
@@ -44,7 +44,7 @@ enum OSDisplayButtonType
 	OSDBT_ERROR									= 0x80000000
 };
 
-enum OSDisplayOtherFlags
+enum OSDisplayOtherFlags CPP_11(: UnsignedInt)
 {
 	OSDOF_SYSTEMMODAL						= 0x00000001,
 	OSDOF_APPLICATIONMODAL			= 0x00000002,
diff --git a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h b/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h
index 8a80bb35db..456195327b 100644
--- a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h
+++ b/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h
@@ -40,7 +40,7 @@
 //-------------------------------------------------------------------------------------------------
 /** Object status types */
 //-------------------------------------------------------------------------------------------------
-enum ObjectStatusTypes
+enum ObjectStatusTypes CPP_11(: Int)
 {
 	//These are saved. Do not insert or remove any!
 
diff --git a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h
index 935a7f452b..40891e61c8 100644
--- a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h
+++ b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h
@@ -59,7 +59,7 @@ typedef std::vector<PairObjectIDAndUInt> SpacesVec;
 // the first ObjectID is the id of the entry, while the second is the id of the hole
 typedef std::vector<PairObjectID> SolutionVec;
 
-enum SolutionType
+enum SolutionType CPP_11(: Int)
 {
 	PREFER_FAST_SOLUTION = 0,
 	PREFER_CORRECT_SOLUTION = 0x7FFFFFFF
diff --git a/Generals/Code/GameEngine/Include/Common/Player.h b/Generals/Code/GameEngine/Include/Common/Player.h
index 34d52aaec2..e074b926b4 100644
--- a/Generals/Code/GameEngine/Include/Common/Player.h
+++ b/Generals/Code/GameEngine/Include/Common/Player.h
@@ -85,11 +85,11 @@ class SpecialPowerModule;
 
 class BattlePlanBonuses;
 
-enum BattlePlanStatus;
-enum UpgradeStatusType;
-enum CommandSourceType;
+enum BattlePlanStatus CPP_11(: Int);
+enum UpgradeStatusType CPP_11(: Int);
+enum CommandSourceType CPP_11(: Int);
 
-enum ScienceAvailabilityType
+enum ScienceAvailabilityType CPP_11(: Int)
 {
 	SCIENCE_AVAILABILITY_INVALID = -1,
 
diff --git a/Generals/Code/GameEngine/Include/Common/PlayerList.h b/Generals/Code/GameEngine/Include/Common/PlayerList.h
index fc3d899930..af61c735a7 100644
--- a/Generals/Code/GameEngine/Include/Common/PlayerList.h
+++ b/Generals/Code/GameEngine/Include/Common/PlayerList.h
@@ -60,7 +60,7 @@ class Team;
 class TeamFactory;
 
 //-------------------------------------------------------------------------------------------------
-enum AllowPlayerRelationship
+enum AllowPlayerRelationship CPP_11(: Int)
 {
 	ALLOW_SAME_PLAYER			= 0x01,		///< allow only objects of the same player as m_obj
 	ALLOW_ALLIES					= 0x02,		///< allow objects that m_obj considers allies
diff --git a/Generals/Code/GameEngine/Include/Common/Radar.h b/Generals/Code/GameEngine/Include/Common/Radar.h
index 841d01e987..33d61a0069 100644
--- a/Generals/Code/GameEngine/Include/Common/Radar.h
+++ b/Generals/Code/GameEngine/Include/Common/Radar.h
@@ -61,7 +61,7 @@ enum
 /** These event types determine the colors radar events happen in to make it easier for us
 	* to play events with a consistent color scheme */
 //-------------------------------------------------------------------------------------------------
-enum RadarEventType
+enum RadarEventType CPP_11(: Int)
 {
 	RADAR_EVENT_INVALID = 0,
 	RADAR_EVENT_CONSTRUCTION,
@@ -126,7 +126,7 @@ class RadarObject : public MemoryPoolObject,
 //-------------------------------------------------------------------------------------------------
 /** Radar priorities.  Keep this in sync with the priority names list below */
 //-------------------------------------------------------------------------------------------------
-enum RadarPriorityType
+enum RadarPriorityType CPP_11(: Int)
 {
 	RADAR_PRIORITY_INVALID,					// a priority that has not been set (in general it won't show up on the radar)
 	RADAR_PRIORITY_NOT_ON_RADAR,		// object specifically forbidden from being on the radar
diff --git a/Generals/Code/GameEngine/Include/Common/Recorder.h b/Generals/Code/GameEngine/Include/Common/Recorder.h
index 543297db96..7dd61c617b 100644
--- a/Generals/Code/GameEngine/Include/Common/Recorder.h
+++ b/Generals/Code/GameEngine/Include/Common/Recorder.h
@@ -45,7 +45,7 @@ class ReplayGameInfo : public GameInfo
 	}
 };
 
-enum RecorderModeType {
+enum RecorderModeType CPP_11(: Int) {
 	RECORDERMODETYPE_RECORD,
 	RECORDERMODETYPE_PLAYBACK,
 	RECORDERMODETYPE_NONE // this is a valid state to be in on the shell map, or in saved games
diff --git a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h
index 25c3f249c4..dc8c89c834 100644
--- a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h
+++ b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h
@@ -64,9 +64,9 @@ class STLSpecialAlloc;
 
 // FORWARD DECLARATIONS
 class Object;
-enum NameKeyType;
-enum ObjectID;
-enum DrawableID;
+enum NameKeyType CPP_11(: Int);
+enum ObjectID CPP_11(: Int);
+enum DrawableID CPP_11(: Int);
 
 #include <algorithm>
 #include <bitset>
diff --git a/Generals/Code/GameEngine/Include/Common/Science.h b/Generals/Code/GameEngine/Include/Common/Science.h
index da02630faf..e124fafa26 100644
--- a/Generals/Code/GameEngine/Include/Common/Science.h
+++ b/Generals/Code/GameEngine/Include/Common/Science.h
@@ -40,7 +40,7 @@
 class Player;
 
 //-------------------------------------------------------------------------------------------------
-enum ScienceType
+enum ScienceType CPP_11(: Int)
 {
 	SCIENCE_INVALID = -1
 };
diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPower.h b/Generals/Code/GameEngine/Include/Common/SpecialPower.h
index 1ff82fc6da..6e2dc52cca 100644
--- a/Generals/Code/GameEngine/Include/Common/SpecialPower.h
+++ b/Generals/Code/GameEngine/Include/Common/SpecialPower.h
@@ -45,7 +45,7 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class ObjectCreationList;
 class Object;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 struct FieldParse;
 
 // For SpecialPowerType and SpecialPowerMaskType::s_bitNameList. Part of detangling.
diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h
index 8ee5142c16..32cbc9a35c 100644
--- a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h
+++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h
@@ -37,7 +37,7 @@
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum SpecialPowerType
+enum SpecialPowerType CPP_11(: Int)
 {
 	SPECIAL_INVALID,
 	// don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[]
diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h
index a6e8c330df..25cb7eb145 100644
--- a/Generals/Code/GameEngine/Include/Common/StateMachine.h
+++ b/Generals/Code/GameEngine/Include/Common/StateMachine.h
@@ -64,7 +64,7 @@ typedef Bool (*StateTransFuncPtr)( State *state, void* userData );
 /**
  * State return codes
  */
-enum StateReturnType 
+enum StateReturnType CPP_11(: Int) 
 { 
 	// note that all positive values are reserved for STATE_SLEEP!
 
@@ -120,7 +120,7 @@ enum
 /** 
  * Parameters for onExit().
  */
-enum StateExitType
+enum StateExitType CPP_11(: Int)
 {
 	EXIT_NORMAL,							///< state exited due to normal state transitioning
 	EXIT_RESET								///< state exited due to state machine reset
diff --git a/Generals/Code/GameEngine/Include/Common/Team.h b/Generals/Code/GameEngine/Include/Common/Team.h
index d2663ce381..f27e3a46d1 100644
--- a/Generals/Code/GameEngine/Include/Common/Team.h
+++ b/Generals/Code/GameEngine/Include/Common/Team.h
@@ -110,7 +110,7 @@ class ThingTemplate;
 class Waypoint;
 class PlayerRelationMap;
 
-enum AttitudeType;
+enum AttitudeType CPP_11(: Int);
 
 typedef struct {
 	Int	minUnits;
diff --git a/Generals/Code/GameEngine/Include/Common/ThingSort.h b/Generals/Code/GameEngine/Include/Common/ThingSort.h
index f694f810ef..3820bcf5d5 100644
--- a/Generals/Code/GameEngine/Include/Common/ThingSort.h
+++ b/Generals/Code/GameEngine/Include/Common/ThingSort.h
@@ -33,7 +33,7 @@
 #define __THINGSORT_H_
 
 //-------------------------------------------------------------------------------------------------
-enum EditorSortingType
+enum EditorSortingType CPP_11(: Int)
 {
 	ES_FIRST = 0,
 
diff --git a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h
index 13b7f09432..d6ef1ee3f5 100644
--- a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h
+++ b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h
@@ -60,10 +60,10 @@ class ProductionPrerequisite;
 struct FieldParse;
 class Player;
 class INI;
-enum RadarPriorityType;
-enum ScienceType;
-enum EditorSortingType;
-enum ShadowType;
+enum RadarPriorityType CPP_11(: Int);
+enum ScienceType CPP_11(: Int);
+enum EditorSortingType CPP_11(: Int);
+enum ShadowType CPP_11(: Int);
 class WeaponTemplateSet;
 class ArmorTemplateSet;
 class FXList;
@@ -94,7 +94,7 @@ enum
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ThingTemplateAudioType
+enum ThingTemplateAudioType CPP_11(: Int)
 {
 	TTAUDIO_voiceSelect,							///< Response when unit is selected
 	TTAUDIO_voiceGroupSelect,					///< Response when a group of this unit is selected
@@ -199,7 +199,7 @@ class AudioArray
 //-------------------------------------------------------------------------------------------------
 /** Object class type enumeration */
 //-------------------------------------------------------------------------------------------------
-enum BuildCompletionType
+enum BuildCompletionType CPP_11(: Int)
 {
 	BC_INVALID = 0,
 	BC_APPEARS_AT_RALLY_POINT,	///< unit appears at rally point of its #1 prereq
@@ -218,7 +218,7 @@ static const char *BuildCompletionNames[] =
 };
 #endif  // end DEFINE_BUILD_COMPLETION_NAMES
 
-enum BuildableStatus
+enum BuildableStatus CPP_11(: Int)
 {
 	// saved into savegames... do not change or remove values!
 	BSTATUS_YES = 0,
@@ -241,7 +241,7 @@ static const char *BuildableStatusNames[] =
 #endif	// end DEFINE_BUILDABLE_STATUS_NAMES
 
 //-------------------------------------------------------------------------------------------------
-enum ModuleParseMode
+enum ModuleParseMode CPP_11(: Int)
 {
 	MODULEPARSE_NORMAL,
 	MODULEPARSE_ADD_REMOVE_REPLACE,
diff --git a/Generals/Code/GameEngine/Include/Common/Upgrade.h b/Generals/Code/GameEngine/Include/Common/Upgrade.h
index 7d4e63e4b9..de8e000f22 100644
--- a/Generals/Code/GameEngine/Include/Common/Upgrade.h
+++ b/Generals/Code/GameEngine/Include/Common/Upgrade.h
@@ -41,12 +41,12 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Player;
 class UpgradeTemplate;
-enum NameKeyType;
+enum NameKeyType CPP_11(: Int);
 class Image;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum UpgradeStatusType
+enum UpgradeStatusType CPP_11(: Int)
 {
 	UPGRADE_STATUS_INVALID = 0,
 	UPGRADE_STATUS_IN_PRODUCTION,
@@ -144,7 +144,7 @@ class Upgrade : public MemoryPoolObject,
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum UpgradeType
+enum UpgradeType CPP_11(: Int)
 {
 	UPGRADE_TYPE_PLAYER = 0,						// upgrade applies to a player as a whole
 	UPGRADE_TYPE_OBJECT,								// upgrade applies to an object instance only
diff --git a/Generals/Code/GameEngine/Include/Common/Xfer.h b/Generals/Code/GameEngine/Include/Common/Xfer.h
index bffb898d6f..9975e9ae5e 100644
--- a/Generals/Code/GameEngine/Include/Common/Xfer.h
+++ b/Generals/Code/GameEngine/Include/Common/Xfer.h
@@ -42,10 +42,10 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Snapshot;
 typedef Int Color;
-enum ObjectID;
-enum DrawableID;
-enum KindOfType;
-enum ScienceType;
+enum ObjectID CPP_11(: Int);
+enum DrawableID CPP_11(: Int);
+enum KindOfType CPP_11(: Int);
+enum ScienceType CPP_11(: Int);
 class Matrix3D;
 
 // ------------------------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ typedef UnsignedByte XferVersion;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum XferMode
+enum XferMode CPP_11(: Int)
 {
 	XFER_INVALID = 0,
 
@@ -66,7 +66,7 @@ enum XferMode
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum XferStatus
+enum XferStatus CPP_11(: Int)
 {
 	XFER_STATUS_INVALID = 0,
 	
@@ -94,7 +94,7 @@ enum XferStatus
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum XferOptions
+enum XferOptions CPP_11(: UnsignedInt)
 {
 	XO_NONE										= 0x00000000,
 	XO_NO_POST_PROCESSING			= 0x00000001,
diff --git a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h
index 8cf976313b..cdd8765005 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h
@@ -40,7 +40,7 @@ class Image;
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum Anim2DMode
+enum Anim2DMode CPP_11(: Int)
 {
 	
 	ANIM_2D_INVALID = 0,
@@ -120,7 +120,7 @@ class Anim2DTemplate : public MemoryPoolObject
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum Anim2DStatus
+enum Anim2DStatus CPP_11(: Int)
 {
 	ANIM_2D_STATUS_NONE			= 0x00,
 	ANIM_2D_STATUS_FROZEN		= 0x01,
diff --git a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
index b4e808b7fd..87f1e2f209 100644
--- a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
+++ b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
@@ -80,7 +80,7 @@ class ProcessAnimateWindow;
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-enum AnimTypes
+enum AnimTypes CPP_11(: Int)
 {
 	WIN_ANIMATION_NONE = 0,
 	WIN_ANIMATION_SLIDE_RIGHT,
diff --git a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
index 7ff725d7dd..a56484d6d4 100644
--- a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
+++ b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
@@ -32,7 +32,7 @@
 
 #include "GameClient/InGameUI.h"
 
-enum GUICommandType;
+enum GUICommandType CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 class CommandTranslator : public GameMessageTranslator
@@ -72,7 +72,7 @@ class CommandTranslator : public GameMessageTranslator
 };
 
 
-enum FilterTypes
+enum FilterTypes CPP_11(: Int)
 {
 	FT_NULL_FILTER=0,
 	// The following are screen filter shaders, that modify the rendered viewport after it is drawn.
@@ -82,7 +82,7 @@ enum FilterTypes
 	FT_MAX
 };
 
-enum FilterModes
+enum FilterModes CPP_11(: Int)
 {
 	FM_NULL_MODE = 0,
 
diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
index 30123bb0f8..c25dd7fccf 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
@@ -60,19 +60,19 @@ class UpgradeTemplate;
 class ControlBarResizer;
 class GameWindowTransitionsHandler;
 
-enum ProductionID;
+enum ProductionID CPP_11(: Int);
 
-enum CommandSourceType;
-enum ProductionType;
-enum GadgetGameMessage;
-enum ScienceType;
-enum TimeOfDay;
-enum RadiusCursorType;
+enum CommandSourceType CPP_11(: Int);
+enum ProductionType CPP_11(: Int);
+enum GadgetGameMessage CPP_11(: Int);
+enum ScienceType CPP_11(: Int);
+enum TimeOfDay CPP_11(: Int);
+enum RadiusCursorType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 /** Command options */
 //-------------------------------------------------------------------------------------------------
-enum CommandOption
+enum CommandOption CPP_11(: Int)
 {
 	COMMAND_OPTION_NONE					= 0x00000000,
 	NEED_TARGET_ENEMY_OBJECT		= 0x00000001, // command now needs user to select enemy target
@@ -161,7 +161,7 @@ const UnsignedInt COMMAND_OPTION_NEED_OBJECT_TARGET =
 	* IMPORTANT: Make sure the GUICommandType enum and the TheGuiCommandNames[] have the same
 	*						 entries in the same order */
 //-------------------------------------------------------------------------------------------------
-enum GUICommandType
+enum GUICommandType CPP_11(: Int)
 {
 	GUI_COMMAND_NONE = 0,									///< invalid command
 	GUI_COMMAND_DOZER_CONSTRUCT,					///< dozer construct
@@ -256,7 +256,7 @@ static const char *TheGuiCommandNames[] =
 };
 #endif  // end DEFINE_GUI_COMMAND_NAMES
 
-enum CommandButtonMappedBorderType
+enum CommandButtonMappedBorderType CPP_11(: Int)
 {
 	COMMAND_BUTTON_BORDER_NONE = 0,
 	COMMAND_BUTTON_BORDER_BUILD,
@@ -555,7 +555,7 @@ class SideSelectWindowData
 	* display of commands and information to the user based on what objects are selected
 	* and their capabilities */
 //-------------------------------------------------------------------------------------------------
-enum ControlBarContext
+enum ControlBarContext CPP_11(: Int)
 {
 	CB_CONTEXT_NONE,									///< default view for center bar and portrait window
 //	CB_CONTEXT_PURCHASE_SCIENCE,
@@ -577,7 +577,7 @@ enum ControlBarContext
 	* hide and un-hide these windows and their interface controls in order to make
 	* the control bar context sensitive to the object that is selected */
 //-------------------------------------------------------------------------------------------------
-enum ContextParent
+enum ContextParent CPP_11(: Int)
 {
 	CP_MASTER,									///< *The* control bar window as a whole
 	CP_PURCHASE_SCIENCE,
@@ -594,7 +594,7 @@ enum ContextParent
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum CBCommandStatus
+enum CBCommandStatus CPP_11(: Int)
 {
 	CBC_COMMAND_NOT_USED = 0,		///< gui control message was *not* used
 	CBC_COMMAND_USED						///< gui control message was used
@@ -605,7 +605,7 @@ enum CBCommandStatus
 	* GUI button to be enabled/disabled/checked/unchecked to represent the current
 	* state of that command availability */
 // ------------------------------------------------------------------------------------------------
-enum CommandAvailability
+enum CommandAvailability CPP_11(: Int)
 {
 	COMMAND_RESTRICTED,
 	COMMAND_AVAILABLE,
@@ -615,7 +615,7 @@ enum CommandAvailability
 	COMMAND_CANT_AFFORD,
 };
 
-enum ControlBarStages
+enum ControlBarStages CPP_11(: Int)
 {
 	CONTROL_BAR_STAGE_DEFAULT = 0,		///< full view for the world to see
 	CONTROL_BAR_STAGE_SQUISHED,				///< squished just for expeirenced players
diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h
index 71d9e4139a..a1430b17b0 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h
@@ -63,7 +63,7 @@
 class AsciiString;
 class playerTemplate;
 class Image;
-enum TimeOfDay;
+enum TimeOfDay CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h
index 413eb2ee6f..7561cc3705 100644
--- a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h
+++ b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h
@@ -30,7 +30,7 @@
 
 #include "GameNetwork/DisconnectManager.h"
 
-enum DisconnectMenuStateType {
+enum DisconnectMenuStateType CPP_11(: Int) {
 	DISCONNECTMENUSTATETYPE_SCREENON,
 	DISCONNECTMENUSTATETYPE_SCREENOFF
 };
diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h
index dbd2387776..966f724795 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Display.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Display.h
@@ -51,7 +51,7 @@ class DebugDisplayInterface;
 class Radar;
 class Image;
 class DisplayString;
-enum StaticGameLODLevel;
+enum StaticGameLODLevel CPP_11(: Int);
 /**
  * The Display class implements the Display interface
  */
diff --git a/Generals/Code/GameEngine/Include/GameClient/Drawable.h b/Generals/Code/GameEngine/Include/GameClient/Drawable.h
index 3a7957efe2..e40a61e6b2 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Drawable.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Drawable.h
@@ -55,7 +55,7 @@ class Shadow;
 class ModuleInfo;
 class Anim2DTemplate;
 class Image;
-enum BodyDamageType;
+enum BodyDamageType CPP_11(: Int);
 
 // this is a very worthwhile performance win. left conditionally defined for now, just 
 // in case, but probably should be made permanent soon. (srj)
@@ -76,7 +76,7 @@ enum BodyDamageType;
 //      each time I add a new icon, and made the arrays dynamic...
 // CD: No so good, core engine components should not be made dynamic in this way
 
-enum DrawableIconType
+enum DrawableIconType CPP_11(: Int)
 {
 /** NOTE: This enum MUST appear in the same order as TheDrawableIconNames array to be
 	* indexed correctly using that array */
@@ -210,7 +210,7 @@ class TintEnvelope : public MemoryPoolObject, public Snapshot
 EMPTY_DTOR(TintEnvelope)
 
 //-----------------------------------------------------------------------------
-enum StealthLookType
+enum StealthLookType CPP_11(: Int)
 {
 	STEALTHLOOK_NONE,								///< unit is not stealthed at all
 	STEALTHLOOK_VISIBLE_FRIENDLY,		///< unit is stealthed-but-visible due to friendly status
@@ -225,7 +225,7 @@ enum StealthLookType
 // ------------------------------------------------------------------------------------------------
 /** Drawable status bits */
 // ------------------------------------------------------------------------------------------------
-enum DrawableStatus
+enum DrawableStatus CPP_11(: Int)
 {
 	DRAWABLE_STATUS_NONE									= 0x00000000,		///< no status
 	DRAWABLE_STATUS_DRAWS_IN_MIRROR				=	0x00000001,		///< drawable can reflect
@@ -235,7 +235,7 @@ enum DrawableStatus
 	DRAWABLE_STATUS_NO_SAVE								= 0x00000010,		///< do *not* save this drawable (UI fluff only). ignored (error, actually) if attached to an object
 };
 
-enum TintStatus
+enum TintStatus CPP_11(: Int)
 {
 	TINT_STATUS_DISABLED		= 0x00000001,///< drawable tint color is deathly dark grey
 	TINT_STATUS_IRRADIATED	= 0x00000002,///< drawable tint color is sickly green
@@ -249,7 +249,7 @@ enum TintStatus
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum TerrainDecalType
+enum TerrainDecalType CPP_11(: Int)
 {
 #ifdef ALLOW_DEMORALIZE
 	TERRAIN_DECAL_DEMORALIZED = 0,
diff --git a/Generals/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h b/Generals/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
index c707381611..15e38144a6 100644
--- a/Generals/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
+++ b/Generals/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
@@ -27,7 +27,7 @@
 #include "GameNetwork/NetworkDefs.h"
 #include "GameNetwork/NAT.h"
 
-enum EstablishConnectionsMenuStateType {
+enum EstablishConnectionsMenuStateType CPP_11(: Int) {
 	ESTABLISHCONNECTIONSMENUSTATETYPE_SCREENON,
 	ESTABLISHCONNECTIONSMENUSTATETYPE_SCREENOFF
 };
diff --git a/Generals/Code/GameEngine/Include/GameClient/Eva.h b/Generals/Code/GameEngine/Include/GameClient/Eva.h
index efd07f41c4..ecf7c85276 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Eva.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Eva.h
@@ -37,7 +37,7 @@ class Player;
 
 //------------------------------------------------------------------------------------ Eva Messages
 // Keep in sync with TheEvaMessageNames AND Eva::s_shouldPlayFuncs
-enum EvaMessage
+enum EvaMessage CPP_11(: Int)
 {
 	EVA_FIRST = 0,
 	EVA_LowPower = EVA_FIRST,
diff --git a/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h b/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
index e2b3c68db5..6a96a65bb5 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
@@ -36,7 +36,7 @@
 #include "GameClient/GameWindowManager.h"
 
 // return codes for message box callbacks
-enum MessageBoxReturnType {
+enum MessageBoxReturnType CPP_11(: Int) {
 	MB_RETURN_CLOSE,
 	MB_RETURN_KEEPOPEN
 };
diff --git a/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h b/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h
index 07e3ded5e0..7fbe17386d 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h
@@ -325,7 +325,7 @@ extern WindowMsgHandledType ReplayControlInput( GameWindow *window, UnsignedInt
 // InGame Chat Controls --------------------------------------------------------------------------------
 extern WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
 extern WindowMsgHandledType InGameChatInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
-enum InGameChatType
+enum InGameChatType CPP_11(: Int)
 {
 	INGAME_CHAT_ALLIES,
 	INGAME_CHAT_EVERYONE,
diff --git a/Generals/Code/GameEngine/Include/GameClient/Gadget.h b/Generals/Code/GameEngine/Include/GameClient/Gadget.h
index 5a90dba1e8..397204c783 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Gadget.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Gadget.h
@@ -133,7 +133,7 @@ enum
 };
 
 // Gadget game messages (sent to their owners)
-enum GadgetGameMessage
+enum GadgetGameMessage CPP_11(: Int)
 {
 
 	// Generic messages supported by all gadgets
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h
index c9c6fe7a7c..e5c427436b 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h
@@ -78,7 +78,7 @@ enum { WIN_COLOR_UNDEFINED = GAME_COLOR_UNDEFINED };
 typedef UnsignedInt WindowMsgData;
 
 //-----------------------------------------------------------------------------
-enum WindowMsgHandledType { MSG_IGNORED, MSG_HANDLED };
+enum WindowMsgHandledType CPP_11(: Int) { MSG_IGNORED, MSG_HANDLED };
 
 // callback types -------------------------------------------------------------
 typedef void (*GameWinMsgBoxFunc)( void ); //used for the Message box callbacks.
@@ -113,7 +113,7 @@ enum
 
 // Game window messages -------------------------------------------------------
 //-----------------------------------------------------------------------------
-enum GameWindowMessage
+enum GameWindowMessage CPP_11(: Int)
 {
 
 	GWM_NONE = 0,
@@ -141,7 +141,7 @@ enum GameWindowMessage
 /** These return codes are returned when after processing events through
 	* the window system */
 //-----------------------------------------------------------------------------
-enum WinInputReturnCode
+enum WinInputReturnCode CPP_11(: Int)
 {
 	WIN_INPUT_NOT_USED = 0,
 	WIN_INPUT_USED,
diff --git a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h
index f349892ec5..80c4a11a16 100644
--- a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h
+++ b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -59,13 +59,13 @@ class WindowLayout;
 class Anim2DTemplate;
 class Anim2D;
 class Shadow;
-enum LegalBuildCode;
-enum KindOfType;
-enum ShadowType;
-enum CanAttackResult;
+enum LegalBuildCode CPP_11(: Int);
+enum KindOfType CPP_11(: Int);
+enum ShadowType CPP_11(: Int);
+enum CanAttackResult CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
-enum RadiusCursorType
+enum RadiusCursorType CPP_11(: Int)
 {
 	RADIUSCURSOR_NONE = 0,
 	RADIUSCURSOR_ATTACK_DAMAGE_AREA,
@@ -273,7 +273,7 @@ enum
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // ------------------------------------------------------------------------------------------------
-enum WorldAnimationOptions
+enum WorldAnimationOptions CPP_11(: Int)
 {
 	WORLD_ANIM_NO_OPTIONS								= 0x00000000,
 	WORLD_ANIM_FADE_ON_EXPIRE						= 0x00000001,
diff --git a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h
index f238034e89..d9d8e61275 100644
--- a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h
+++ b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h
@@ -63,6 +63,7 @@
 #endif
 
 #include <dinput.h>
+#include <Lib/BaseType.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 
@@ -104,7 +105,7 @@
 /** The key tables */
 //=============================================================================
 
-enum KeyDefType
+enum KeyDefType CPP_11(: Int)
 {
 	// keypad keys ---------------------------------------------------------------- 
 	KEY_KP0 								= DIK_NUMPAD0,
diff --git a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h
index 38b2e823ad..732f97502a 100644
--- a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h
+++ b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h
@@ -34,7 +34,7 @@
 #include "GameClient/InGameUI.h"
 
 
-enum MappableKeyCategories
+enum MappableKeyCategories CPP_11(: Int)
 {
 	CATEGORY_CONTROL = 0,
 	CATEGORY_INFORMATION,
@@ -67,7 +67,7 @@ static const LookupListRec CategoryListName[] =
 // in particular, "modifier" keys and keypad keys aren't
 // available. Note that MappableKeyType is a SUBSET of
 // KeyDefType; this is extremely important to maintain!
-enum MappableKeyType
+enum MappableKeyType CPP_11(: Int)
 {
 	MK_ESC					= KEY_ESC,
 	MK_BACKSPACE		= KEY_BACKSPACE,
@@ -250,7 +250,7 @@ static const LookupListRec KeyNames[] =
 };
 
 // -------------------------------------------------------------------------------
-enum MappableKeyTransition
+enum MappableKeyTransition CPP_11(: Int)
 {
 	DOWN,
 	UP,
@@ -267,7 +267,7 @@ static const LookupListRec TransitionNames[] =
 
 // -------------------------------------------------------------------------------
 // an easier-to-type subset of the KEY_STATE stuff.
-enum MappableKeyModState
+enum MappableKeyModState CPP_11(: Int)
 {
 	NONE							= 0,
 	CTRL							= KEY_STATE_LCONTROL,
@@ -296,7 +296,7 @@ static const LookupListRec ModifierNames[] =
 
 // -------------------------------------------------------------------------------
 // CommandUsableInType sets in what state the commands are allowed.
-enum CommandUsableInType
+enum CommandUsableInType CPP_11(: Int)
 {
 	COMMANDUSABLE_NONE				= 0,
 
diff --git a/Generals/Code/GameEngine/Include/GameClient/Mouse.h b/Generals/Code/GameEngine/Include/GameClient/Mouse.h
index 931b7ee071..a055538b23 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Mouse.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Mouse.h
@@ -61,7 +61,7 @@
 
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 
-enum MouseButtonState
+enum MouseButtonState CPP_11(: Int)
 {
 	MBS_Up = 0,
 	MBS_Down,
diff --git a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h
index c1c66ee641..73c3fbb95b 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h
@@ -56,7 +56,7 @@ class INI;
 class DebugWindowDialog;		// really ParticleEditorDialog
 class RenderInfoClass;			// ick
 
-enum ParticleSystemID
+enum ParticleSystemID CPP_11(: Int)
 {
 	INVALID_PARTICLE_SYSTEM_ID = 0
 };
@@ -82,7 +82,7 @@ struct RGBColorKeyframe
 	UnsignedInt frame;
 };
 
-enum ParticlePriorityType
+enum ParticlePriorityType CPP_11(: Int)
 {
 	INVALID_PRIORITY = 0, 
 	PARTICLE_PRIORITY_LOWEST = 1,
diff --git a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h
index 09c1cd3b7b..2333f8bba7 100644
--- a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h
+++ b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h
@@ -34,7 +34,7 @@
 #include "Common/GameType.h"
 #include "GameClient/Color.h"
 
-enum ShadowType;
+enum ShadowType CPP_11(: Int);
 class Player;
 class Shadow;
 class RadiusDecalTemplate;
diff --git a/Generals/Code/GameEngine/Include/GameClient/Shadow.h b/Generals/Code/GameEngine/Include/GameClient/Shadow.h
index 9b73531e53..16761ff27a 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Shadow.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Shadow.h
@@ -38,7 +38,7 @@
 //
 
 // shadow bit flags, keep this in sync with TheShadowNames
-enum ShadowType
+enum ShadowType CPP_11(: Int)
 {
 	SHADOW_NONE											=	0x00000000, 
 	SHADOW_DECAL										=	0x00000001,		//shadow decal applied via modulate blend
diff --git a/Generals/Code/GameEngine/Include/GameClient/Shell.h b/Generals/Code/GameEngine/Include/GameClient/Shell.h
index c48ffb6a49..08bb8274b0 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Shell.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Shell.h
@@ -105,7 +105,7 @@ class AnimateWindowManager;
 class GameWindow;
 class ShellMenuSchemeManager;
 
-enum AnimTypes;
+enum AnimTypes CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 /** This is the interface to the shell system to load, display, and
diff --git a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h b/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h
index 2dfc924ede..eb85c66322 100644
--- a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h
+++ b/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h
@@ -46,7 +46,7 @@ class AsciiString;
 // ------------------------------------------------------------------------------------------------
 /** Bridges have 4 towers around it that the player can attack or use to repair the bridge */
 // ------------------------------------------------------------------------------------------------
-enum BridgeTowerType
+enum BridgeTowerType CPP_11(: Int)
 {
 	BRIDGE_TOWER_FROM_LEFT = 0,
 	BRIDGE_TOWER_FROM_RIGHT,
diff --git a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h b/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h
index 789460226f..d3db11d4b3 100644
--- a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h
+++ b/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h
@@ -45,7 +45,7 @@ class Drawable;
 //-------------------------------------------------------------------------------------------------
 /** LOD values for terrain, keep this in sync with TerrainLODNames[] */
 //-------------------------------------------------------------------------------------------------
-typedef enum _TerrainLOD
+typedef enum _TerrainLOD CPP_11(: Int)
 { 
 	TERRAIN_LOD_INVALID								= 0,
 	TERRAIN_LOD_MIN										= 1,  // note that this is less than max
diff --git a/Generals/Code/GameEngine/Include/GameClient/View.h b/Generals/Code/GameEngine/Include/GameClient/View.h
index a6bc49708c..474bd879af 100644
--- a/Generals/Code/GameEngine/Include/GameClient/View.h
+++ b/Generals/Code/GameEngine/Include/GameClient/View.h
@@ -53,7 +53,7 @@ class LookAtTranslator;
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum PickType
+enum PickType CPP_11(: Int)
 {
 	PICK_TYPE_TERRAIN						= COLL_TYPE_0,
 	PICK_TYPE_SELECTABLE				= COLL_TYPE_1,
diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h b/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h
index 9dfd6487f7..452ff1a9a3 100644
--- a/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h
+++ b/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h
@@ -69,7 +69,7 @@ class VideoBuffer;
 //-----------------------------------------------------------------------------
 
 
-enum WindowVideoPlayType
+enum WindowVideoPlayType CPP_11(: Int)
 {
 	WINDOW_PLAY_MOVIE_ONCE = 0,
 	WINDOW_PLAY_MOVIE_LOOP,
@@ -78,7 +78,7 @@ enum WindowVideoPlayType
 	WINDOW_PLAY_MOVIE_COUNT
 };
 
-enum WindowVideoStates
+enum WindowVideoStates CPP_11(: Int)
 {
 	WINDOW_VIDEO_STATE_START = 0,
 	WINDOW_VIDEO_STATE_STOP,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AI.h b/Generals/Code/GameEngine/Include/GameLogic/AI.h
index ca987196c5..894f22b144 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AI.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AI.h
@@ -51,11 +51,11 @@ class PolygonTrigger;
 class UpgradeTemplate;
 class WeaponTemplate;
 
-enum GUICommandType;
-enum HackerAttackMode;
-enum WeaponSetType;
-enum WeaponLockType;
-enum SpecialPowerType;
+enum GUICommandType CPP_11(: Int);
+enum HackerAttackMode CPP_11(: Int);
+enum WeaponSetType CPP_11(: Int);
+enum WeaponLockType CPP_11(: Int);
+enum SpecialPowerType CPP_11(: Int);
 
 typedef std::vector<ObjectID> VecObjectID;
 typedef VecObjectID::iterator VecObjectIDIt;
@@ -63,7 +63,7 @@ typedef VecObjectID::iterator VecObjectIDIt;
 typedef std::list<Object *> ListObjectPtr;
 typedef ListObjectPtr::iterator ListObjectPtrIt;
 
-enum AIDebugOptions
+enum AIDebugOptions CPP_11(: Int)
 {
 	AI_DEBUG_NONE = 0, 
 	AI_DEBUG_PATHS,
@@ -307,7 +307,7 @@ class Weapon;
 // TheSuperHackers @compile xezon 22/03/2025 Renames AI_PASSIVE to not conflict with macro in ws2def.h
 
 // Note - written out in save/load xfer and .map files, don't change these numbers.  
-enum AttitudeType {
+enum AttitudeType CPP_11(: Int) {
 	ATTITUDE_SLEEP = -2,
 	ATTITUDE_PASSIVE=-1,
 	ATTITUDE_NORMAL=0,
@@ -316,7 +316,7 @@ enum AttitudeType {
 	ATTITUDE_INVALID=3
 };		///< AI "attitude" behavior modifiers
 
-enum CommandSourceType;
+enum CommandSourceType CPP_11(: Int);
 
 typedef UnsignedInt CommandSourceMask;
 
@@ -333,7 +333,7 @@ static const char *TheCommandSourceMaskNames[] =
 
 //------------------------------------------------------------------------------------------------------------
 
-enum AICommandType	// Stored in save file, do not reorder/renumber.  jba.
+enum AICommandType CPP_11(: Int)	// Stored in save file, do not reorder/renumber.  jba.
 {
 	AICMD_MOVE_TO_POSITION = 0,
 	AICMD_MOVE_TO_OBJECT,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h
index 8c12b062f5..864f57aad7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h
@@ -57,7 +57,7 @@ class Squad;
  * Each of these constants will be associated with an instance of a State class
  * in a given StateMachine.
  */
-enum AIStateType
+enum AIStateType CPP_11(: Int)
 {
 	AI_IDLE,
 	AI_MOVE_TO,																///< move to the GoalObject or GoalPosition
@@ -192,7 +192,7 @@ class AttackStateMachine : public StateMachine
 
 public:
 // Attack states.
-enum StateType
+enum StateType CPP_11(: Int)
 	{
 		CHASE_TARGET,													///< Chase a moving target (optionally following it)
 		APPROACH_TARGET,											///< Approach a non-moving target.
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h
index c83c76eda2..17fb5921d0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h
@@ -43,7 +43,7 @@ class INI;
 // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal"
 // state is defined by the bit being off. That is, the typical "normal" condition
 // has all condition flags set to zero.
-enum ArmorSetType
+enum ArmorSetType CPP_11(: Int)
 {
 	// The access and use of this enum has the bit shifting built in, so this is a 0,1,2,3,4,5 enum
 	ARMORSET_VETERAN		= 0,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
index 9bc6d10d6f..4954637bc1 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
@@ -36,7 +36,7 @@
 #include "Common/Overridable.h"
 #include "Common/Override.h"
 
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 struct crateCreationEntry
 {
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Damage.h b/Generals/Code/GameEngine/Include/GameLogic/Damage.h
index 55b3af48d4..5bbc50fd9b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Damage.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Damage.h
@@ -43,7 +43,7 @@ class INI;
 //-------------------------------------------------------------------------------------------------
 /** Damage types, keep this in sync with TheDamageNames[] */
 //-------------------------------------------------------------------------------------------------
-enum DamageType
+enum DamageType CPP_11(: Int)
 {	
 	DAMAGE_EXPLOSION							= 0,			
 	DAMAGE_CRUSH									= 1,					
@@ -166,7 +166,7 @@ inline DamageTypeFlags clearDamageTypeFlag(DamageTypeFlags flags, DamageType dt)
 //-------------------------------------------------------------------------------------------------
 /** Death types, keep this in sync with TheDeathNames[] */
 //-------------------------------------------------------------------------------------------------
-enum DeathType
+enum DeathType CPP_11(: Int)
 {	
 	// note that these DELIBERATELY have (slightly) different names from the damage names,
 	// since there isn't necessarily a one-to-one correspondence. e.g., DEATH_BURNED
diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
index b242ec57fd..1dbb89b655 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
@@ -66,7 +66,7 @@ class WindowLayout;
 class TerrainLogic;
 class GhostObjectManager;
 class CommandButton;
-enum BuildableStatus;
+enum BuildableStatus CPP_11(: Int);
 
 typedef const CommandButton* ConstCommandButtonPtr;
 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h
index 5a90e672b4..e2a52bbb8e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h
@@ -43,8 +43,8 @@
 
 class Object;
 class PartitionData;
-enum GeometryType;
-enum ObjectID;
+enum GeometryType CPP_11(: Int);
+enum ObjectID CPP_11(: Int);
 
 class GhostObject : public Snapshot
 {
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
index 3700cfe1c6..ba66691759 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
@@ -44,14 +44,14 @@ class Locomotor;
 class LocomotorTemplate;
 class INI;
 class PhysicsBehavior;
-enum BodyDamageType;
-enum PhysicsTurningType;
+enum BodyDamageType CPP_11(: Int);
+enum PhysicsTurningType CPP_11(: Int);
 
 // if we ever re-enable jets circling for landing, we need this. so keep in around just in case. (srj)
 #define NO_CIRCLE_FOR_LANDING
 
 //-------------------------------------------------------------------------------------------------
-enum LocomotorAppearance
+enum LocomotorAppearance CPP_11(: Int)
 {
 	LOCO_LEGS_TWO,
 	LOCO_WHEELS_FOUR,
@@ -63,7 +63,7 @@ enum LocomotorAppearance
 	LOCO_OTHER
 };
 
-enum LocomotorPriority
+enum LocomotorPriority CPP_11(: Int)
 {
 	LOCO_MOVES_BACK=0,				// In a group, this one moves toward the back
 	LOCO_MOVES_MIDDLE=1,			// In a group, this one stays in the middle
@@ -87,7 +87,7 @@ static const char *TheLocomotorAppearanceNames[] =
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum LocomotorBehaviorZ
+enum LocomotorBehaviorZ CPP_11(: Int)
 {
 	Z_NO_Z_MOTIVE_FORCE,							// does whatever physics tells it, but has no z-force of its own.
 	Z_SEA_LEVEL,											// keep at surface-of-water level
diff --git a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h
index 656ddd7ce2..440c7598b7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h
@@ -46,7 +46,7 @@ class LocomotorTemplate;
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum LocomotorSurfaceType
+enum LocomotorSurfaceType CPP_11(: Int)
 {
 	LOCOMOTORSURFACE_GROUND			= (1 << 0),									///< clear, unobstructed ground
 	LOCOMOTORSURFACE_WATER			= (1 << 1),									///< water area
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
index 57b4a2f947..e2da4527e7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
@@ -58,8 +58,8 @@ class WorkerAIInterface;
 class HackInternetAIInterface;
 class AssaultTransportAIInterface;
 
-enum AIStateType;
-enum ObjectID;
+enum AIStateType CPP_11(: Int);
+enum ObjectID CPP_11(: Int);
 
 
 //-------------------------------------------------------------------------------------------------
@@ -70,7 +70,7 @@ const Real FAST_AS_POSSIBLE = 999999.0f;
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum LocomotorSetType
+enum LocomotorSetType CPP_11(: Int)
 {
 	LOCOMOTORSET_INVALID = -1,
 
@@ -87,7 +87,7 @@ enum LocomotorSetType
 };
 
 //-------------------------------------------------------------------------------------------------
-enum GuardTargetType
+enum GuardTargetType CPP_11(: Int)
 { 
 	GUARDTARGET_LOCATION,	// Guard a coord3d
 	GUARDTARGET_OBJECT,		// Guard an object
@@ -111,7 +111,7 @@ static const char *TheLocomotorSetNames[] =
 };
 #endif 
 
-enum AutoAcquireStates
+enum AutoAcquireStates CPP_11(: Int)
 {
 	AAS_Idle											= 0x01,
 	AAS_Idle_Stealthed						= 0x02,
@@ -135,7 +135,7 @@ static const char *TheAutoAcquireEnemiesNames[] =
 
 
 //-------------------------------------------------------------------------------------------------
-enum MoodMatrixParameters
+enum MoodMatrixParameters CPP_11(: Int)
 {
 	// Controller_Player and Controller_AI are mutually exclusive
 	MM_Controller_Player		= 0x00000001,
@@ -159,7 +159,7 @@ enum MoodMatrixParameters
 };
 
 //-------------------------------------------------------------------------------------------------
-enum MoodMatrixAction
+enum MoodMatrixAction CPP_11(: Int)
 {
 	MM_Action_Idle,
 	MM_Action_Move,
@@ -168,7 +168,7 @@ enum MoodMatrixAction
 };
 
 //-------------------------------------------------------------------------------------------------
-enum MoodActionAdjustment
+enum MoodActionAdjustment CPP_11(: Int)
 {
 	MAA_Action_Ok										= 0x00000001,
 	MAA_Action_To_Idle							= 0x00000002,
@@ -214,7 +214,7 @@ class AIUpdateModuleData : public UpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-enum AIFreeToExitType // Note - written out in save/load xfer, don't change these numbers.  jba.
+enum AIFreeToExitType CPP_11(: Int) // Note - written out in save/load xfer, don't change these numbers.  jba.
 {
 	FREE_TO_EXIT=0,
 	NOT_FREE_TO_EXIT=1,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
index c039d9b797..c5a1039204 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
@@ -37,7 +37,7 @@
 #include "GameLogic/Module/AIUpdate.h"
 
 //-------------------------------------------------------------------------------------------------
-enum AssaultStateTypes
+enum AssaultStateTypes CPP_11(: Int)
 {
 	IDLE,							          ///< Not doing anything.
 	ASSAULTING,						      ///< Transport is waiting while troops do fighting.
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
index 3e4dc3ddb3..180c8501c9 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
@@ -53,7 +53,7 @@
 class Object;
 class SpecialPowerTemplate;
 struct FieldParse;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 class BaikonurLaunchPowerModuleData : public SpecialPowerModuleData
 {
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
index 87fd326d42..d84ca943a9 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
@@ -41,8 +41,8 @@ class SpecialPowerModule;
 class ParticleSystem;
 class FXList;
 class AudioEventRTS;
-enum  MaxHealthChangeType;
-enum  CommandOption;
+enum  MaxHealthChangeType CPP_11(: Int);
+enum  CommandOption CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -90,7 +90,7 @@ class BattlePlanUpdateModuleData : public ModuleData
 
 };
 
-enum TransitionStatus
+enum TransitionStatus CPP_11(: Int)
 {
 	TRANSITIONSTATUS_IDLE,
 	TRANSITIONSTATUS_UNPACKING,
@@ -98,7 +98,7 @@ enum TransitionStatus
 	TRANSITIONSTATUS_PACKING,
 };
 
-enum BattlePlanStatus
+enum BattlePlanStatus CPP_11(: Int)
 {
 	PLANSTATUS_NONE,
 	PLANSTATUS_BOMBARDMENT,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
index bf3824ccbb..9a51797c26 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
@@ -50,7 +50,7 @@ class WeaponTemplate;
 	* enumeration being in sequential order
 	*/
 //-------------------------------------------------------------------------------------------------
-enum BodyDamageType
+enum BodyDamageType CPP_11(: Int)
 {
 	BODY_PRISTINE,				///< unit should appear in pristine condition
 	BODY_DAMAGED,					///< unit has been damaged
@@ -72,7 +72,7 @@ static const char* TheBodyDamageTypeNames[] =
 };
 #endif
 
-enum MaxHealthChangeType
+enum MaxHealthChangeType CPP_11(: Int)
 {
 	SAME_CURRENTHEALTH,
 	PRESERVE_RATIO,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
index d16d107bf5..c12dce7954 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
@@ -37,7 +37,7 @@
 #include "GameLogic/Module/DamageModule.h" 
 
 //#include "GameLogic/Module/BodyModule.h" -- Yikes... not necessary to include this! (KM)
-enum BodyDamageType; //Ahhhh much better!
+enum BodyDamageType CPP_11(: Int); //Ahhhh much better!
 
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
index 98f138d59c..9d0cec524b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
@@ -41,7 +41,7 @@
 #include "GameLogic/Module/UpdateModule.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-enum BridgeTowerType;
+enum BridgeTowerType CPP_11(: Int);
 class FXList;
 class ObjectCreationList;
 class Bridge;
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
index 7c5a0641f2..f6916ffc48 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
@@ -38,7 +38,7 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum ScaffoldTargetMotion
+enum ScaffoldTargetMotion CPP_11(: Int)
 {
 	STM_STILL,
 	STM_RISE,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
index 9d8fa3ecac..4644c62b5e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
@@ -39,7 +39,7 @@
 class Object;
 class SpecialPowerTemplate;
 struct FieldParse;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
index 4d4a6e2346..1cf874ccb4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
@@ -65,7 +65,7 @@ class ChinookAIUpdateModuleData : public SupplyTruckAIUpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-enum ChinookFlightStatus // Stored in save file, don't renumber.  jba. 
+enum ChinookFlightStatus CPP_11(: Int) // Stored in save file, don't renumber.  jba. 
 {
 	CHINOOK_TAKING_OFF				= 0,
 	CHINOOK_FLYING						= 1,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
index f8df43e9e4..33b86a9d01 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
@@ -40,10 +40,10 @@ class Player;
 class ExitInterface;
 class Matrix3D;
 class Weapon;
-enum CommandSourceType;
+enum CommandSourceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
-enum ObjectEnterExitType
+enum ObjectEnterExitType CPP_11(: Int)
 {
 	WANTS_TO_ENTER,
 	WANTS_TO_EXIT,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
index 95f7bd636a..7cf3ce6d55 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
@@ -39,7 +39,7 @@
 class Thing;
 class Anim2DTemplate;
 class FXList;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class CrateCollideModuleData : public CollideModuleData 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
index 60d44295c1..6843683474 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
@@ -42,7 +42,7 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
 
-enum CrushEnum
+enum CrushEnum CPP_11(: Int)
 {
 	TOTAL_CRUSH,
 	BACK_END_CRUSH,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
index e0987736c5..ee90cfe55c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
@@ -36,7 +36,7 @@
 #include "GameLogic/Damage.h"
 #include "GameLogic/Module/BehaviorModule.h"
 
-enum BodyDamageType;
+enum BodyDamageType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 /** OBJECT DAMAGE MODULE base class */
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
index ff548123a6..b0a855620d 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
@@ -42,7 +42,7 @@
 class Object;
 class SpecialPowerTemplate;
 struct FieldParse;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 
 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
index 0df5278001..4c031a82bc 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
@@ -36,7 +36,7 @@
 #include "GameLogic/Module/AIUpdate.h"
 
 //-------------------------------------------------------------------------------------------------
-enum DeployStateTypes
+enum DeployStateTypes CPP_11(: Int)
 {
 	READY_TO_MOVE,							///< Mobile, can't attack.
 	DEPLOY,											///< Not mobile, can't attack, currently unpacking to attack
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
index a699d81962..657ba7a334 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
@@ -68,7 +68,7 @@ class DozerPrimaryStateMachine : public StateMachine
 //-------------------------------------------------------------------------------------------------
 /** Dozer behaviors that use action sub state machines */
 //-------------------------------------------------------------------------------------------------
-enum DozerTask // These enums are saved in the game save file, so DO NOT renumber them. jba.
+enum DozerTask CPP_11(: Int) // These enums are saved in the game save file, so DO NOT renumber them. jba.
 {
 	DOZER_TASK_INVALID = -1,
 	DOZER_TASK_FIRST = 0,
@@ -81,7 +81,7 @@ enum DozerTask // These enums are saved in the game save file, so DO NOT renumbe
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum DozerDockPoint	 // These enums are saved in the game save file, so DO NOT renumber them. jba.
+enum DozerDockPoint CPP_11(: Int)	 // These enums are saved in the game save file, so DO NOT renumber them. jba.
 {
 	DOZER_DOCK_POINT_START	= 0,
 	DOZER_DOCK_POINT_ACTION	= 1,
@@ -91,7 +91,7 @@ enum DozerDockPoint	 // These enums are saved in the game save file, so DO NOT r
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum DozerBuildSubTask  // These enums are saved in the game save file, so DO NOT renumber them. jba.
+enum DozerBuildSubTask CPP_11(: Int)  // These enums are saved in the game save file, so DO NOT renumber them. jba.
 {
 	DOZER_SELECT_BUILD_DOCK_LOCATION		= 0,
 	DOZER_MOVING_TO_BUILD_DOCK_LOCATION	=	1,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
index 93514d12d9..4f88c04a0a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
@@ -39,7 +39,7 @@
 
 
 //-------------------------------------------------------------------------------------------------
-enum FlammabilityStatusType
+enum FlammabilityStatusType CPP_11(: Int)
 {
 	// These show the state I last noticed my object was in.
 	FS_NORMAL = 0,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
index 2d8c2157b6..0e29c39d93 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
@@ -44,7 +44,7 @@ class UpgradeTemplate;
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-enum HordeActionType
+enum HordeActionType CPP_11(: Int)
 {
 	HORDEACTION_HORDE = 0,
 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
index 03444050ca..1e1d9d1bc8 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
@@ -39,7 +39,7 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
 class Vector3;
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
index b66fd73011..9c6a0ea953 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
@@ -37,7 +37,7 @@
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
-enum MaxHealthChangeType;
+enum MaxHealthChangeType CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
index 8f0c859bbd..9d2afe47e7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
@@ -38,7 +38,7 @@
 #include "Common/INI.h"
 #include "WWMath/matrix3d.h"
 
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 class FXList;
 
 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
index b0d8c3a098..213af0324b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
@@ -43,7 +43,7 @@
 #include "Common/INI.h"
 #include "GameLogic/Module/UpdateModule.h"
 class DamageInfo;
-enum ModelConditionFlagType;
+enum ModelConditionFlagType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class MobMemberSlavedUpdateModuleData : public UpdateModuleData
@@ -79,7 +79,7 @@ class MobMemberSlavedUpdateModuleData : public UpdateModuleData
 };
 
 
-enum MobStates
+enum MobStates CPP_11(: Int)
 {
 	MOB_STATE_NONE,
 	MOB_STATE_IDLE,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
index 75d27066c8..3ed2de7191 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
@@ -39,7 +39,7 @@ class FXList;
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum NeutronBlast
+enum NeutronBlast CPP_11(: Int)
 { 
 	NEUTRON_BLAST_1 = 0,
 	NEUTRON_BLAST_2,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
index b8c0d5f384..1eaab4ba53 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
@@ -39,7 +39,7 @@
 #include "Common/INI.h"
 #include "WWMath/matrix3d.h"
 
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 class FXList;
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
index 65fa9933fb..16e3395935 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
@@ -39,7 +39,7 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class ObjectCreationList;
 
-enum OCLCreateLocType
+enum OCLCreateLocType CPP_11(: Int)
 {
 	CREATE_AT_EDGE_NEAR_SOURCE,
 	CREATE_AT_EDGE_NEAR_TARGET,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
index 64b639faae..89ca0c5fb1 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
@@ -56,7 +56,7 @@ class POWTruckAIUpdateModuleData : public AIUpdateModuleData
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum POWTruckTask	// Stored in save file, do not renumber.  jba.
+enum POWTruckTask CPP_11(: Int)	// Stored in save file, do not renumber.  jba.
 {
 	POW_TRUCK_TASK_WAITING						= 0, ///< Waiting for something to do 
 	POW_TRUCK_TASK_FIND_TARGET				= 1, ///< We need to search out a target to collect
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
index 27c789bf8c..b528e51c61 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
@@ -41,7 +41,7 @@ class SpecialPowerModule;
 class ParticleSystem;
 class FXList;
 class AudioEventRTS;
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 
 #define MAX_OUTER_NODES 16
 
@@ -112,7 +112,7 @@ class ParticleUplinkCannonUpdateModuleData : public ModuleData
 
 };
 
-enum PUCStatus
+enum PUCStatus CPP_11(: Int)
 {
 	STATUS_IDLE,
 	STATUS_CHARGING,
@@ -125,7 +125,7 @@ enum PUCStatus
 	STATUS_PACKING,
 };
 
-enum LaserStatus
+enum LaserStatus CPP_11(: Int)
 {
 	LASERSTATUS_NONE,
 	LASERSTATUS_BORN,
@@ -133,7 +133,7 @@ enum LaserStatus
 	LASERSTATUS_DEAD,
 };
 
-enum IntensityTypes
+enum IntensityTypes CPP_11(: Int)
 {
 	IT_LIGHT,
 	IT_MEDIUM,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
index 16f58ec2c9..65e0ce53ae 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
@@ -37,9 +37,9 @@
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Module/CollideModule.h"
 
-enum ObjectID;
+enum ObjectID CPP_11(: Int);
 
-enum PhysicsTurningType
+enum PhysicsTurningType CPP_11(: Int)
 {
 	TURN_NEGATIVE = -1,
 	TURN_NONE = 0,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
index 292c25ad4f..bb6147a9b5 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
@@ -43,12 +43,12 @@ class ThingTemplate;
 class UpgradeTemplate;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-enum ProductionID
+enum ProductionID CPP_11(: Int)
 {
 	PRODUCTIONID_INVALID = 0
 };
 
-enum ProductionType
+enum ProductionType CPP_11(: Int)
 {
 	PRODUCTION_INVALID = 0,
 	PRODUCTION_UNIT,
@@ -141,7 +141,7 @@ class ProductionUpdateModuleData : public UpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-enum CanMakeType;
+enum CanMakeType CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
index 10ba31228a..4bbe77da62 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
@@ -40,7 +40,7 @@ const Int SLAVED_UPDATE_RATE = LOGICFRAMES_PER_SECOND/4; ///< This is a low prio
 #include "Common/INI.h"
 #include "GameLogic/Module/UpdateModule.h"
 class DamageInfo;
-enum ModelConditionFlagType;
+enum ModelConditionFlagType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class SlavedUpdateModuleData : public UpdateModuleData
@@ -123,7 +123,7 @@ class SlavedUpdateModuleData : public UpdateModuleData
 	}
 };
 
-enum RepairStates
+enum RepairStates CPP_11(: Int)
 {
 	REPAIRSTATE_NONE,
 	REPAIRSTATE_UNPACKING,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
index 44c55b2d40..d9621cd55e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
@@ -48,7 +48,7 @@ typedef std::vector<const ObjectCreationList*> OCLVec;
 typedef std::vector<const WeaponTemplate*> WeaponTemplateVec;
 
 //-------------------------------------------------------------------------------------------------
-enum SlowDeathPhaseType
+enum SlowDeathPhaseType CPP_11(: Int)
 {
 	SDPHASE_INITIAL = 0,
 	SDPHASE_MIDPOINT,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
index 97132c5371..0d7e91c407 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
@@ -44,7 +44,7 @@ const Int SPAWN_UPDATE_RATE = LOGICFRAMES_PER_SECOND/2; ///< This is a low prior
 
 //-------------------------------------------------------------------------------------------------
 class ThingTemplate;
-enum CanAttackResult;
+enum CanAttackResult CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class SpawnBehaviorModuleData : public BehaviorModuleData
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
index eba8b29125..8e4eed83ac 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
@@ -42,7 +42,7 @@ class DamageInfo;
 class SpecialPowerTemplate;
 class SpecialPowerModule;
 class FXList;
-enum SpecialPowerType;
+enum SpecialPowerType CPP_11(: Int);
 
 #define SPECIAL_ABILITY_HUGE_DISTANCE 10000000.0f
 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
index 9e6cf61fde..52a1f34047 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
@@ -41,7 +41,7 @@
 class Object;
 class SpecialPowerTemplate;
 struct FieldParse;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
index ca686215dc..405f2fdab1 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
@@ -37,7 +37,7 @@
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
-enum StealthLookType;
+enum StealthLookType CPP_11(: Int);
 class FXList;
 
 enum
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
index e8c7d04240..1a54964646 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
@@ -46,7 +46,7 @@ typedef std::vector<const FXList*> FXVec;
 
 
 //-------------------------------------------------------------------------------------------------
-enum StructureCollapsePhaseType
+enum StructureCollapsePhaseType CPP_11(: Int)
 {
 	SCPHASE_INITIAL = 0,
 	SCPHASE_DELAY,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
index 209c9e9a35..c154205643 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
@@ -64,7 +64,7 @@ struct AngleFXInfo
 typedef std::vector<AngleFXInfo> AngleFXInfoVector;
 
 //-------------------------------------------------------------------------------------------------
-enum StructureTopplePhaseType
+enum StructureTopplePhaseType CPP_11(: Int)
 {
 	STPHASE_INITIAL = 0,
 	STPHASE_DELAY,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
index e2a801a690..c95defbac4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
@@ -63,10 +63,10 @@ class WeaponTemplate;
 class DamageInfo;
 class ParticleSystemTemplate;
 class CommandButton;
-enum CommandOption;
+enum CommandOption CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
-enum UpdateSleepTime 
+enum UpdateSleepTime CPP_11(: Int) 
 { 
 	UPDATE_SLEEP_INVALID	= 0,
 	UPDATE_SLEEP_NONE			= 1,
@@ -83,7 +83,7 @@ enum UpdateSleepTime
 // in an efficient way while still maintaining order-dependency; you should
 // really never specify anything other than PHASE_NORMAL without very
 // careful deliberation. If you need to, talk it over with folks first. (srj)
-enum SleepyUpdatePhase
+enum SleepyUpdatePhase CPP_11(: Int)
 {
 	// reserve 2 bits for phase. this still leaves us 30 bits for frame counter,
 	// which, at 30fps, will still run for ~414 days without overflowing...
@@ -346,7 +346,7 @@ class DockUpdateInterface
 };
 
 //-------------------------------------------------------------------------------------------------
-enum ExitDoorType
+enum ExitDoorType CPP_11(: Int)
 {
 	DOOR_1 = 0,
 	DOOR_2 = 1,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h
index a8bc6f4e8f..75bfa92a8a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Object.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Object.h
@@ -102,18 +102,18 @@ class ObjectRepulsorHelper;
 class ObjectWeaponStatusHelper;
 class ObjectDefectionHelper;
 
-enum CommandSourceType;
-enum DamageType;
-enum HackerAttackMode;
-enum NameKeyType;
-enum SpecialPowerType;
-enum WeaponBonusConditionType;
-enum WeaponChoiceCriteria;
-enum WeaponSetConditionType;
-enum WeaponSetType;
-enum WeaponStatus;
-enum RadarPriorityType;
-enum CanAttackResult;
+enum CommandSourceType CPP_11(: Int);
+enum DamageType CPP_11(: Int);
+enum HackerAttackMode CPP_11(: Int);
+enum NameKeyType CPP_11(: Int);
+enum SpecialPowerType CPP_11(: Int);
+enum WeaponBonusConditionType CPP_11(: Int);
+enum WeaponChoiceCriteria CPP_11(: Int);
+enum WeaponSetConditionType CPP_11(: Int);
+enum WeaponSetType CPP_11(: Int);
+enum WeaponStatus CPP_11(: Int);
+enum RadarPriorityType CPP_11(: Int);
+enum CanAttackResult CPP_11(: Int);
 
 // For ObjectStatusTypes
 #include "Common/ObjectStatusTypes.h"
@@ -140,7 +140,7 @@ struct TTriggerInfo
 //----------------------------------------------------
 
 
-enum CrushSquishTestType
+enum CrushSquishTestType CPP_11(: Int)
 {
 	TEST_CRUSH_ONLY, 
 	TEST_SQUISH_ONLY, 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h
index 091b13f935..5f1ca8b84c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h
@@ -39,7 +39,7 @@ class Object;
 
 //-------------------------------------------------------------------------------------------
 /** */
-enum IterOrderType
+enum IterOrderType CPP_11(: Int)
 {
 	ITER_FASTEST,										///< iterate in arbitrary order
 	ITER_SORTED_NEAR_TO_FAR,				///< iterate in nearest-to-farthest order (may be slower)
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
index 6f36a83507..89682ffe2e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
@@ -33,7 +33,7 @@
 //-------------------------------------------------------------------------------------------------
 /** Object status bits */
 //-------------------------------------------------------------------------------------------------
-enum ObjectScriptStatusBit
+enum ObjectScriptStatusBit CPP_11(: Int)
 {
 	OBJECT_STATUS_SCRIPT_DISABLED						= 0x01,		///< this object is disabled via script
 	OBJECT_STATUS_SCRIPT_UNPOWERED					= 0x02,		///< this object is unpowered via script
diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h
index 430edada6f..8296ddb069 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -96,10 +96,10 @@ class ThingTemplate;
 class GhostObject;
 class CommandButton;
 
-enum CommandSourceType;
+enum CommandSourceType CPP_11(: Int);
 
 // ----------------------------------------------------------------------------------------------
-enum ValueOrThreat
+enum ValueOrThreat CPP_11(: Int)
 {
 	VOT_CashValue = 1,
 	VOT_ThreatValue,
@@ -107,7 +107,7 @@ enum ValueOrThreat
 };
 
 // ----------------------------------------------------------------------------------------------
-enum FindPositionFlags
+enum FindPositionFlags CPP_11(: Int)
 {
 	FPF_NONE															= 0x00000000,		// no options, default behavior
 	FPF_IGNORE_WATER											= 0x00000001,		// a position found underwater is ok
@@ -149,7 +149,7 @@ struct FindPositionOptions
 //=====================================
 /** */
 //=====================================
-enum DistanceCalculationType
+enum DistanceCalculationType CPP_11(: Int)
 {
 	FROM_CENTER_2D					= 0,	///< measure from Object center in 2d.
 	FROM_CENTER_3D					= 1,	///< measure from Object center in 3d.
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h
index 91e6b18d3a..47da7cf316 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h
@@ -37,7 +37,7 @@ class GameWindow;
 class	Team;
 class View;
 
-enum AudioAffect;
+enum AudioAffect CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 // ScriptActionsInterface
diff --git a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h
index f95e970e90..c41b163de8 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h
@@ -52,7 +52,7 @@ class Matrix3D;
 class WaterHandle;
 class Xfer;
 
-enum WaypointID
+enum WaypointID CPP_11(: Int)
 {
 	INVALID_WAYPOINT_ID = 0x7FFFFFFF
 };
diff --git a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h
index 5099991541..a45a1995a6 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h
@@ -42,7 +42,7 @@ const Real DEFAULT_PITCH_RATE = 0.01f;
  * Each of these constants will be associated with an instance of a State class
  * in a given StateMachine.
  */
-enum TurretStateType
+enum TurretStateType CPP_11(: Int)
 {
 	TURRETAI_IDLE,
 	TURRETAI_IDLESCAN,
@@ -248,7 +248,7 @@ class TurretAIData : public MemoryPoolObject
 EMPTY_DTOR(TurretAIData)
 
 //-----------------------------------------------------------------------------------------------------
-enum TurretTargetType
+enum TurretTargetType CPP_11(: Int)
 {
 	TARGET_NONE,
 	TARGET_OBJECT,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h
index 13965fe9cd..4a71a7b2c0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h
@@ -39,7 +39,7 @@ class Player;
 /*
  * bitfield for specifying which victory conditions will apply in multiplayer games
  */
-enum VictoryType
+enum VictoryType CPP_11(: Int)
 {
 	VICTORY_NOBUILDINGS = 1,
 	VICTORY_NOUNITS = 2,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h
index 8429395a36..b355e6c83e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h
@@ -50,13 +50,13 @@ class Weapon;
 class WeaponTemplate;
 class INI;
 class ParticleSystemTemplate;
-enum NameKeyType;
+enum NameKeyType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 const Int NO_MAX_SHOTS_LIMIT = 0x7fffffff;
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponReloadType
+enum WeaponReloadType CPP_11(: Int)
 {
 	AUTO_RELOAD,
 	NO_RELOAD,
@@ -74,7 +74,7 @@ static const char *TheWeaponReloadNames[] =
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponPrefireType
+enum WeaponPrefireType CPP_11(: Int)
 {
 	PREFIRE_PER_SHOT,		///< Use the prefire delay for every shot we make
 	PREFIRE_PER_ATTACK,	///< Use the prefire delay each time we attack a new target
@@ -94,7 +94,7 @@ static const char *TheWeaponPrefireNames[] =
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponAntiMaskType
+enum WeaponAntiMaskType CPP_11(: Int)
 {
 	WEAPON_ANTI_AIRBORNE_VEHICLE	= 0x01,
 	WEAPON_ANTI_GROUND						= 0x02,
@@ -107,7 +107,7 @@ enum WeaponAntiMaskType
 };
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponAffectsMaskType
+enum WeaponAffectsMaskType CPP_11(: Int)
 {
 	WEAPON_AFFECTS_SELF						= 0x01,
 	WEAPON_AFFECTS_ALLIES					= 0x02,
@@ -133,7 +133,7 @@ static const char *TheWeaponAffectsMaskNames[] =
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponCollideMaskType
+enum WeaponCollideMaskType CPP_11(: Int)
 {
 	// all of these apply to *nontargeted* things that might just happen to get in the way...
 	// the target can always be collided with, regardless of flags
@@ -169,7 +169,7 @@ static const char *TheWeaponCollideMaskNames[] =
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum WeaponBonusConditionType
+enum WeaponBonusConditionType CPP_11(: Int)
 {
 	// The access and use of this enum has the bit shifting built in, so this is a 0,1,2,3,4,5 enum
 	WEAPONBONUSCONDITION_INVALID = -1,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h
index 626c7a3147..f00eab68a4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h
@@ -42,8 +42,8 @@ class Object;
 class Weapon;
 class WeaponTemplate;
 
-enum CommandSourceType;
-enum DamageType;
+enum CommandSourceType CPP_11(: Int);
+enum DamageType CPP_11(: Int);
 
 // for WeaponSetType. Part of detangling.
 #include "GameLogic/WeaponSetType.h"
@@ -87,7 +87,7 @@ static const ModelConditionFlagType TheWeaponSetTypeToModelConditionTypeMap[WEAP
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponSetConditionType
+enum WeaponSetConditionType CPP_11(: Int)
 {
 	WSF_INVALID = -1,
 
@@ -150,14 +150,14 @@ typedef std::vector<WeaponTemplateSet> WeaponTemplateSetVector;
 typedef SparseMatchFinder<WeaponTemplateSet, WeaponSetFlags> WeaponTemplateSetFinder;
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponChoiceCriteria
+enum WeaponChoiceCriteria CPP_11(: Int)
 {
 	PREFER_MOST_DAMAGE,		///< choose the weapon that will do the most damage
 	PREFER_LONGEST_RANGE	///< choose the weapon with the longest range (that will do nonzero damage)
 };
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponLockType
+enum WeaponLockType CPP_11(: Int)
 {
 	NOT_LOCKED,							///< Weapon is not locked
 	LOCKED_TEMPORARILY,			///< Weapon is locked until clip is empty, or current "attack" state exits
@@ -165,7 +165,7 @@ enum WeaponLockType
 };
 
 //-------------------------------------------------------------------------------------------------
-enum CanAttackResult
+enum CanAttackResult CPP_11(: Int)
 {
 	//Worst scenario to best scenario -- These must be done this way now!
 	ATTACKRESULT_NOT_POSSIBLE,					//Can't possibly attack target.
diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h
index e78f37f02d..b0274dc087 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h
@@ -38,7 +38,7 @@
 // IMPORTANT NOTE #2: if you add or modify this list, be sure to update TheWeaponSetNames, 
 // *and* TheWeaponSetTypeToModelConditionTypeMap!
 //
-enum WeaponSetType
+enum WeaponSetType CPP_11(: Int)
 {
 	// The access and use of this enum has the bit shifting built in, so this is a 0,1,2,3,4,5 enum
 	WEAPONSET_VETERAN		= 0,
diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h
index 05eacd4978..a9dc042205 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h
@@ -30,7 +30,7 @@
 #ifndef __WEAPONSTATUS_H__
 #define __WEAPONSTATUS_H__
 
-enum WeaponStatus
+enum WeaponStatus CPP_11(: Int)
 {
 	READY_TO_FIRE,
 	OUT_OF_AMMO,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h b/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
index f06c547d6c..dc7819f93d 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
@@ -32,7 +32,7 @@
 #include "Lib/BaseType.h"
 //#include "GameNetwork/ConnectionManager.h"
 
-enum DisconnectStateType {
+enum DisconnectStateType CPP_11(: Int) {
 	DISCONNECTSTATETYPE_SCREENON,
 	DISCONNECTSTATETYPE_SCREENOFF
 //	DISCONNECTSTATETYPE_WAITINGFORPACKETROUTER
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h b/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
index 37f946c1fa..dba7b98848 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
@@ -69,7 +69,7 @@ struct SpareSocketStruct {
 	UnsignedShort port;
 };
 
-enum FirewallDetectionState {
+enum FirewallDetectionState CPP_11(: Int) {
 	DETECTIONSTATE_IDLE,
 	DETECTIONSTATE_BEGIN,
 	DETECTIONSTATE_TEST1,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h
index 2e4759a4cc..7317032f63 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h
@@ -31,7 +31,7 @@
 #include "Lib/BaseType.h"
 #include "GameNetwork/NetCommandList.h"
 
-enum FrameDataReturnType {
+enum FrameDataReturnType CPP_11(: Int) {
 	FRAMEDATA_NOTREADY,
 	FRAMEDATA_RESEND,
 	FRAMEDATA_READY
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h
index 6e181924f6..1d453186b2 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h
@@ -35,7 +35,7 @@
 #include "GameNetwork/NetworkDefs.h"
 #include "GameNetwork/FirewallHelper.h"
 
-enum SlotState
+enum SlotState CPP_11(: Int)
 {
 	SLOT_OPEN,
 	SLOT_CLOSED,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h
index 0a2026d32f..3379625ec5 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h
@@ -118,7 +118,7 @@ void ListGroupRoomsCallback(PEER peer, PEERBool success,
 														int maxWaiting, int numGames,
 														int numPlaying, void * param);					///< Called while listing group rooms
 
-enum GameSpyColors {
+enum GameSpyColors CPP_11(: Int) {
 	GSCOLOR_DEFAULT = 0,
 	GSCOLOR_CURRENTROOM,
 	GSCOLOR_ROOM,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
index 5d34c8a711..b517016648 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
@@ -43,7 +43,7 @@ void RefreshGameInfoListBox( GameWindow *mainWin, GameWindow *win );
 void RefreshGameListBoxes( void );
 void ToggleGameListType( void );
 
-enum GameSortType
+enum GameSortType CPP_11(: Int)
 {
 	GAMESORT_ALPHA_ASCENDING = 0,
 	GAMESORT_ALPHA_DESCENDING,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
index af283c8d08..db8f31f05f 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
@@ -39,7 +39,7 @@ void CancelPatchCheckCallback( void );
 void StartDownloadingPatches( void );
 void HandleCanceledDownload( Bool resetDropDown = TRUE );
 
-enum OverallStatsPeriod
+enum OverallStatsPeriod CPP_11(: Int)
 {
 	STATS_TODAY = 0,
 	STATS_YESTERDAY,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
index f9322722c8..19cb03cdda 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
@@ -44,7 +44,7 @@ class PSPlayerStats;
 typedef std::set<AsciiString> IgnoreList;
 typedef std::map<Int, AsciiString> SavedIgnoreMap;
 
-enum RCItemType
+enum RCItemType CPP_11(: Int)
 {
 	ITEM_BUDDY,
 	ITEM_REQUEST,
@@ -127,7 +127,7 @@ struct AsciiComparator
 
 typedef std::map<AsciiString, PlayerInfo, AsciiComparator> PlayerInfoMap;
 
-enum GameSpyColors {
+enum GameSpyColors CPP_11(: Int) {
 	GSCOLOR_DEFAULT = 0,
 	GSCOLOR_CURRENTROOM,
 	GSCOLOR_ROOM,
@@ -160,7 +160,7 @@ enum GameSpyColors {
 
 extern Color GameSpyColor[GSCOLOR_MAX];
 
-enum GameSpyBuddyStatus {
+enum GameSpyBuddyStatus CPP_11(: Int) {
 	BUDDY_OFFLINE,
 	BUDDY_ONLINE,
 	BUDDY_LOBBY,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
index 1d41c02a00..78988f860d 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
@@ -34,7 +34,7 @@
 #include "gamespy/peer/peer.h"
 #include "GameNetwork/NetworkDefs.h"
 
-enum SerialAuthResult
+enum SerialAuthResult CPP_11(: Int)
 {
 	SERIAL_NONEXISTENT,
 	SERIAL_AUTHFAILED,
@@ -175,7 +175,7 @@ class PeerRequest
 
 //-------------------------------------------------------------------------
 
-enum DisconnectReason
+enum DisconnectReason CPP_11(: Int)
 {
 	DISCONNECT_NICKTAKEN = 1,
 	DISCONNECT_BADNICK,
@@ -199,7 +199,7 @@ enum DisconnectReason
 	DISCONNECT_MAX,
 };
 
-enum QMStatus
+enum QMStatus CPP_11(: Int)
 {
 	QM_IDLE,
 	QM_JOININGQMCHANNEL,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
index 68b27ed94c..cfa09d7cd4 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
@@ -31,7 +31,7 @@
 #ifndef __PERSISTENTSTORAGEDEFS_H__
 #define __PERSISTENTSTORAGEDEFS_H__
 
-enum LocaleType
+enum LocaleType CPP_11(: Int)
 {
     LOC_UNKNOWN = 0,
     LOC_MIN = 1,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
index f289011149..76a505e754 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
@@ -44,7 +44,7 @@ void GSMessageBoxOkCancel(UnicodeString title, UnicodeString message, GameWinMsg
 void GSMessageBoxYesNo(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc yesFunc, GameWinMsgBoxFunc noFunc);	///< Display a Message box with Yes/No buttons and track it
 void RaiseGSMessageBox( void );		///< Bring GS message box to the foreground (if we transition screens while a message box is up)
 
-enum GSOverlayType
+enum GSOverlayType CPP_11(: Int)
 {
 	GSOVERLAY_PLAYERINFO,
 	GSOVERLAY_MAPSELECT,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
index 6a7daa939d..837003ca2a 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
@@ -78,7 +78,7 @@ void updateGameOptions( void );
 
 //Enum is used for the utility function so other windows do not need
 //to know about controls on LanGameOptions window.
-enum PostToLanGameType{ SEND_GAME_OPTS = 0,
+enum PostToLanGameType CPP_11(: Int){ SEND_GAME_OPTS = 0,
 												MAP_BACK,
 												POST_TO_LAN_GAME_TYPE_COUNT };
 //the utility function mentioned above
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h b/Generals/Code/GameEngine/Include/GameNetwork/NAT.h
index 1567ab7d98..c79421bf10 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/NAT.h
@@ -39,7 +39,7 @@
 class Transport;
 class GameSlot;
 
-enum NATStateType {
+enum NATStateType CPP_11(: Int) {
 	NATSTATE_IDLE,
 	NATSTATE_DOCONNECTIONPATHS,
 	NATSTATE_WAITFORSTATS,
@@ -47,7 +47,7 @@ enum NATStateType {
 	NATSTATE_FAILED
 };
 
-enum NATConnectionState {
+enum NATConnectionState CPP_11(: Int) {
 	NATCONNECTIONSTATE_NOSTATE,
 	NATCONNECTIONSTATE_WAITINGTOBEGIN,
 //	NATCONNECTIONSTATE_NETGEARDELAY,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
index 1d5bf99a59..df8707bc60 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
@@ -45,7 +45,7 @@ extern Int FRAME_DATA_LENGTH;
 extern Int FRAMES_TO_KEEP;
 
 // This is the connection numbering: 1-8 are for players, 9 is a broadcast con.
-enum ConnectionNumbers
+enum ConnectionNumbers CPP_11(: Int)
 {
 	MAX_PLAYER = 7,			// The index of the highest possible player number.  This is 0 based, so the most players allowed in a game is MAX_PLAYER+1.
 	NUM_CONNECTIONS
@@ -112,7 +112,7 @@ struct DelayedTransportMessage
 /**
  * Message types
  */
-enum NetMessageFlag {
+enum NetMessageFlag CPP_11(: Int) {
 	MSG_ACK = 1,
 	MSG_NEEDACK = 2,
 	MSG_SEQUENCED = 4,
@@ -120,7 +120,7 @@ enum NetMessageFlag {
 };
 typedef UnsignedByte NetMessageFlags;
 
-enum NetCommandType {
+enum NetCommandType CPP_11(: Int) {
 	NETCOMMANDTYPE_UNKNOWN = -1,
 	NETCOMMANDTYPE_ACKBOTH = 0,
 	NETCOMMANDTYPE_ACKSTAGE1,
@@ -159,7 +159,7 @@ enum NetCommandType {
 	NETCOMMANDTYPE_MAX
 };
 
-enum NetLocalStatus {
+enum NetLocalStatus CPP_11(: Int) {
 	NETLOCALSTATUS_PREGAME = 0,
 	NETLOCALSTATUS_INGAME,
 	NETLOCALSTATUS_LEAVING,
@@ -167,7 +167,7 @@ enum NetLocalStatus {
 	NETLOCALSTATUS_POSTGAME
 };
 
-enum PlayerLeaveCode {
+enum PlayerLeaveCode CPP_11(: Int) {
 	PLAYERLEAVECODE_CLIENT = 0,
 	PLAYERLEAVECODE_LOCAL,
 	PLAYERLEAVECODE_PACKETROUTER,
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
index d25d5025ae..66333e93aa 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
@@ -51,7 +51,7 @@
 #include <Common/GameMemory.h>
 #include "EABrowserDispatch/BrowserDispatch.h"
 #include "FEBDispatch.h"
-#include <Utility/CppMacros.h>
+#include <Lib/BaseType.h>
 
 class GameWindow;
 
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/udp.h b/Generals/Code/GameEngine/Include/GameNetwork/udp.h
index 2c7ed50179..ee4f7bbad4 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/udp.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/udp.h
@@ -74,7 +74,7 @@ class UDP
  public:
   // These defines specify a system independent way to
   //   get error codes for socket services.
-  enum sockStat
+  enum sockStat CPP_11(: Int)
   {
     OK           =  0,     // Everything's cool
     UNKNOWN      = -1,     // There was an error of unknown type
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
index e41ce3cbf0..81acfd09bf 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -210,7 +210,7 @@ extern void DoResolutionDialog();
 static Bool ignoreSelected = FALSE;
 WindowLayout *OptionsLayout = NULL;
 
-enum Detail
+enum Detail CPP_11(: Int)
 {
 	HIGHDETAIL = 0,
 	MEDIUMDETAIL,
@@ -1387,7 +1387,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	Color color =  GameMakeColor(255,255,255,255);
 
-  enum AliasingMode
+  enum AliasingMode CPP_11(: Int)
   {
     OFF = 0,
     LOW,
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
index 6330a0aa54..66b2e287e6 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
@@ -149,7 +149,7 @@ static void handleLadderSelection( Int ladderID )
 }
 
 
-enum PasswordMode
+enum PasswordMode CPP_11(: Int)
 {
 	PASS_NONE,
 	PASS_ENTRY,
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
index 2596fa424a..dd1cb7c56c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
@@ -52,7 +52,7 @@
 
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-enum ObjectID;
+enum ObjectID CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
 /** This class is used to track objects as they exit our area of influence */
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
index 3b45f20885..16bc57d848 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -669,7 +669,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 EMPTY_DTOR(ApplyRandomForceNugget)
 
 //-------------------------------------------------------------------------------------------------
-enum DebrisDisposition
+enum DebrisDisposition CPP_11(: Int)
 {
 	LIKE_EXISTING						= 0x00000001,
 	ON_GROUND_ALIGNED				= 0x00000002,
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
index ef3a9b44e2..4419431935 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -55,7 +55,7 @@ const Real BIGNUM = 99999.0f;
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum ChinookAIStateType
+enum ChinookAIStateType CPP_11(: Int)
 {
 	// note that these must be distinct (numerically) from AIStateType. ick.
 	ChinookAIStateType_FIRST = 1000,
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
index cca299b920..3f272c82a5 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -74,7 +74,7 @@ static const Real MIN_ACTION_TOLERANCE = 70.0f;
 //-------------------------------------------------------------------------------------------------
 /** Available Dozer actions */
 //-------------------------------------------------------------------------------------------------
-enum DozerActionType
+enum DozerActionType CPP_11(: Int)
 {
 	DOZER_ACTION_PICK_ACTION_POS,		///< pick a location "around" the target to do our action
 	DOZER_ACTION_MOVE_TO_ACTION_POS,///< move to our action pos we've picked
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index 5a3929eaab..4fec10cdb7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -55,7 +55,7 @@ const Real BIGNUM = 99999.0f;
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum TaxiType
+enum TaxiType CPP_11(: Int)
 {
 	FROM_HANGAR,
 	FROM_PARKING,
@@ -63,7 +63,7 @@ enum TaxiType
 };
 
 //-------------------------------------------------------------------------------------------------
-enum JetAIStateType
+enum JetAIStateType CPP_11(: Int)
 {
 	// note that these must be distinct (numerically) from AIStateType. ick.
 	JETAISTATETYPE_FIRST = 1000,
diff --git a/Generals/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h b/Generals/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
index 42f190faa6..bf4d95deb1 100644
--- a/Generals/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
+++ b/Generals/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
@@ -28,7 +28,7 @@ class AudioEventRTS;
 
 enum { MAXPROVIDERS = 64 };
 
-enum PlayingAudioType
+enum PlayingAudioType CPP_11(: Int)
 {
 	PAT_Sample,
 	PAT_3DSample,
@@ -36,14 +36,14 @@ enum PlayingAudioType
 	PAT_INVALID
 };
 
-enum PlayingStatus
+enum PlayingStatus CPP_11(: Int)
 {
 	PS_Playing,
 	PS_Stopped,
 	PS_Paused
 };
 
-enum PlayingWhich
+enum PlayingWhich CPP_11(: Int)
 {
 	PW_Attack,
 	PW_Sound,
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
index 64e60987e2..d44236290a 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
@@ -62,7 +62,7 @@ class RenderObjClass;
 class Shadow;
 class TerrainTracksRenderObjClass;
 class HAnimClass;
-enum GameLODLevel;
+enum GameLODLevel CPP_11(: Int);
 //-------------------------------------------------------------------------------------------------
 /** The default client update module */
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
index e3caacbec2..11e855393d 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
@@ -35,7 +35,7 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class W3DScienceModelDrawModuleData : public W3DModelDrawModuleData
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
index 82e7c74519..e90221cc20 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
@@ -27,7 +27,7 @@
 #ifndef __W3DCUSTOMSCENE_H_
 #define __W3DCUSTOMSCENE_H_
 
-enum CustomScenePassModes
+enum CustomScenePassModes CPP_11(: Int)
 {
 	SCENE_PASS_DEFAULT,
 	SCENE_PASS_ALPHA_MASK
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
index b2e1e1349e..ec65a7beae 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
@@ -103,7 +103,7 @@ struct TRoadSegInfo
 
 // The individual data for a road segment.
 enum {MAX_SEG_VERTEX=500, MAX_SEG_INDEX=2000};
-enum TCorner 
+enum TCorner CPP_11(: Int) 
 {
 	SEGMENT, 
 	CURVE, 
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
index ec9f93e44e..663cc2b43b 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
@@ -49,7 +49,7 @@
 class W3DDynamicLight;
 class LightClass;
 class Drawable;
-enum CustomScenePassModes;
+enum CustomScenePassModes CPP_11(: Int);
 class MaterialPassClass;
 class W3DShroudMaterialPassClass;
 class W3DMaskMaterialPassClass;
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
index 79cb9d9068..b7471193c6 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
@@ -37,11 +37,11 @@
 #define __W3DSHADERMANAGER_H_
 
 #include "WW3D2/texture.h"
-enum FilterTypes;
-enum CustomScenePassModes;
-enum StaticGameLODLevel;
-enum ChipsetType;
-enum CpuType;
+enum FilterTypes CPP_11(: Int);
+enum CustomScenePassModes CPP_11(: Int);
+enum StaticGameLODLevel CPP_11(: Int);
+enum ChipsetType CPP_11(: Int);
+enum CpuType CPP_11(: Int);
 
 class TextureClass;	///forward reference
 /** System for managing complex rendering settings which are either not handled by
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
index c1b223a861..85422e5ebc 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
@@ -28,7 +28,7 @@
 #ifndef __W3DWaterTracks_H_
 #define __W3DWaterTracks_H_
 
-enum waveType;	//forward reference
+enum waveType CPP_11(: Int);	//forward reference
 
 /// Custom render object that draws animated tracks/waves on the water.
 /**
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
index d50ecb3519..813de0b84b 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
@@ -211,14 +211,14 @@ extern Real TheSkateDistOverride;
 #endif
 
 // flags that aren't read directly from INI, but set in response to various other situations
-enum INIReadFlagsType
+enum INIReadFlagsType CPP_11(: Int)
 {
 	ANIMS_COPIED_FROM_DEFAULT_STATE = 0,
 	GOT_NONIDLE_ANIMS,
 	GOT_IDLE_ANIMS,
 };
 
-enum ACBits
+enum ACBits CPP_11(: Int)
 {
 	RANDOMIZE_START_FRAME = 0,
 	START_FRAME_FIRST,
@@ -1150,7 +1150,7 @@ const Vector3* W3DModelDrawModuleData::getAttachToDrawableBoneOffset(const Drawa
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum ParseCondStateType
+enum ParseCondStateType CPP_11(: Int)
 {
 	PARSE_NORMAL,
 	PARSE_DEFAULT,
@@ -1196,7 +1196,7 @@ void W3DModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 }
 
 //-------------------------------------------------------------------------------------------------
-enum AnimParseType
+enum AnimParseType CPP_11(: Int)
 {
 	ANIM_NORMAL,
 	ANIM_IDLE
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
index ca750aa6b9..bdaaf7d05e 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
@@ -582,7 +582,7 @@ TextureClass *ground=NULL;
 #define TILE_HEIGHT	10.1f
 #define TILE_DIFFUSE 0x00b4b0a5
 
-enum BlendDirection
+enum BlendDirection CPP_11(: Int)
 {	B_A,	//visible on all sides
 	B_R,	//visible on right
 	B_L,	//visible on left
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
index 64f27f13ea..8967d104aa 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
@@ -77,7 +77,7 @@ WaterTracksRenderSystem *TheWaterTracksRenderSystem=NULL;	///< singleton for tra
 
 static Bool pauseWaves=FALSE;
 
-enum waveType
+enum waveType CPP_11(: Int)
 {
 	WaveTypeFirst,
 	WaveTypePond=WaveTypeFirst,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h
index ca9eb920e6..b180137213 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h
@@ -68,7 +68,7 @@ struct AcademyAdviceInfo
 	UnsignedInt numTips;
 };
 
-enum AcademyClassificationType
+enum AcademyClassificationType CPP_11(: Int)
 {
 	//Don't forget to update the strings too!
 	ACT_NONE,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h
index c33a17c141..79b1ef1b1d 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h
@@ -44,12 +44,12 @@
 class Object;
 class Player;
 class SpecialPowerTemplate;
-enum SpecialPowerType;
-enum WeaponSlotType;
-enum CommandSourceType;
-enum CanAttackResult;
+enum SpecialPowerType CPP_11(: Int);
+enum WeaponSlotType CPP_11(: Int);
+enum CommandSourceType CPP_11(: Int);
+enum CanAttackResult CPP_11(: Int);
 
-enum CanEnterType
+enum CanEnterType CPP_11(: Int)
 {
 	CHECK_CAPACITY,
 	DONT_CHECK_CAPACITY,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioAffect.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioAffect.h
index 2f8f15e68f..492d5d877f 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioAffect.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/AudioAffect.h
@@ -30,9 +30,11 @@
 #ifndef _AUDIOAFFECT_H_
 #define _AUDIOAFFECT_H_
 
+#include <Lib/BaseType.h>
+
 // if it is set by the options panel, use the system setting parameter. Otherwise, this will be 
 // appended to whatever the current system volume is.
-enum AudioAffect
+enum AudioAffect CPP_11(: Int)
 {
 	AudioAffect_Music		= 0x01,
 	AudioAffect_Sound		= 0x02,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioEventInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioEventInfo.h
index b714bf8e92..144cddefda 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioEventInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/AudioEventInfo.h
@@ -41,7 +41,7 @@
 struct FieldParse;
 
 // USEFUL DECLARATIONS ////////////////////////////////////////////////////////////////////////////
-enum AudioType
+enum AudioType CPP_11(: Int)
 {
 	AT_Music,
 	AT_Streaming,
@@ -49,7 +49,7 @@ enum AudioType
 };
 
 extern const char *theAudioPriorityNames[];
-enum AudioPriority
+enum AudioPriority CPP_11(: Int)
 {
 	AP_LOWEST,
 	AP_LOW,
@@ -59,7 +59,7 @@ enum AudioPriority
 };
 
 extern const char *theSoundTypeNames[];
-enum SoundType
+enum SoundType CPP_11(: Int)
 {
 	ST_UI										= 0x0001,
 	ST_WORLD								= 0x0002,
@@ -73,7 +73,7 @@ enum SoundType
 };
 
 extern const char *theAudioControlNames[];
-enum AudioControl
+enum AudioControl CPP_11(: Int)
 {
 	AC_LOOP									= 0x0001,
 	AC_RANDOM								= 0x0002,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioEventRTS.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioEventRTS.h
index 468de7862a..b420f7de86 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioEventRTS.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/AudioEventRTS.h
@@ -38,7 +38,7 @@
 // forward declarations ///////////////////////////////////////////////////////////////////////////
 struct AudioEventInfo;
 
-enum OwnerType
+enum OwnerType CPP_11(: Int)
 {
 	OT_Positional,
 	OT_Drawable,
@@ -47,7 +47,7 @@ enum OwnerType
 	OT_INVALID
 };
 
-enum PortionToPlay
+enum PortionToPlay CPP_11(: Int)
 {
 	PP_Attack,
 	PP_Sound,
@@ -55,7 +55,7 @@ enum PortionToPlay
 	PP_Done
 };
 
-enum AudioPriority;
+enum AudioPriority CPP_11(: Int);
 
 // This is called AudioEventRTS because AudioEvent is a typedef in ww3d
 // You might want this to be memory pooled (I personally do), but it can't
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
index 2718a99ca8..0c564b4a99 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
@@ -31,7 +31,7 @@
 #ifndef _AUDIOHANDLESPECIALVALUES_H_
 #define _AUDIOHANDLESPECIALVALUES_H_
 
-enum AudioHandleSpecialValues
+enum AudioHandleSpecialValues CPP_11(: Int)
 {
 	AHSV_Error					= 0x00,
 	AHSV_NoSound,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioRequest.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioRequest.h
index 730a49542a..6dd96c9d78 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioRequest.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/AudioRequest.h
@@ -36,7 +36,7 @@
 
 class AudioEventRTS;
 
-enum RequestType
+enum RequestType CPP_11(: Int)
 {
 	AR_Play,
 	AR_Pause,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h
index 22c5eadc76..9e455549e4 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h
@@ -72,7 +72,7 @@ typedef ObjectSellList::iterator ObjectSellListIterator;
 //-------------------------------------------------------------------------------------------------
 /** Return codes for queries about being able to build */
 //-------------------------------------------------------------------------------------------------
-enum CanMakeType
+enum CanMakeType CPP_11(: Int)
 {
 	CANMAKE_OK,
 	CANMAKE_NO_PREREQ,
@@ -86,7 +86,7 @@ enum CanMakeType
 //-------------------------------------------------------------------------------------------------
 /** Return codes for queries about legal build locations */
 //-------------------------------------------------------------------------------------------------
-enum LegalBuildCode
+enum LegalBuildCode CPP_11(: Int)
 {
 	LBC_OK = 0,
 	LBC_RESTRICTED_TERRAIN,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h
index a3f38a7b67..840a967851 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h
@@ -41,7 +41,7 @@
 /** Kind of flags for determining groups of things that belong together
 	* NOTE: You *MUST* keep this in the same order as the DisabledNames[] below */
 //-------------------------------------------------------------------------------------------------
-enum DisabledType
+enum DisabledType CPP_11(: Int)
 {
 	DISABLED_DEFAULT,     //Typical disable -- like systems, things that don't need to run.
 	DISABLED_HACKED,      //This unit has been hacked
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h
index 480edf3172..cf13e695bb 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h
@@ -55,8 +55,8 @@ class TracerDrawInterface;
 class RopeDrawInterface;
 class LaserDrawInterface;
 class FXList;
-enum TerrainDecalType;
-enum ShadowType;
+enum TerrainDecalType CPP_11(: Int);
+enum ShadowType CPP_11(: Int);
 
 //class ModelConditionFlags;
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DynamicAudioEventInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/DynamicAudioEventInfo.h
index a3f5461f99..c13dfbd591 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DynamicAudioEventInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/DynamicAudioEventInfo.h
@@ -87,7 +87,7 @@ class DynamicAudioEventInfo : public AudioEventInfo
 
   private:
     // List of fields we can override
-    enum OverriddenFields
+    enum OverriddenFields CPP_11(: Int)
     {
       OVERRIDE_NAME = 0,
       OVERRIDE_LOOP_FLAG,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h
index f146b350a6..2e6d860a09 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h
@@ -54,7 +54,7 @@
 	to add to this list as necessary; however, there should generally be very
 	few codes needed.
 */
-enum ErrorCode
+enum ErrorCode CPP_11(: UnsignedInt)
 {
 	ERROR_BASE									= 0xdead0001,								// a nice, distinctive value
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h b/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h
index c4639758a5..64dae03189 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h
@@ -61,8 +61,8 @@ class Object;
 class SoundManager;
 
 
-enum AudioAffect;
-enum AudioType;
+enum AudioAffect CPP_11(: Int);
+enum AudioType CPP_11(: Int);
 
 struct AudioEventInfo;
 struct AudioRequest;
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h
index 63f89c5931..3d076603f3 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h
@@ -138,7 +138,7 @@ enum
 };
 
 //-------------------------------------------------------------------------------------------------
-enum GameDifficulty
+enum GameDifficulty CPP_11(: Int)
 {
 	DIFFICULTY_EASY,
 	DIFFICULTY_NORMAL,
@@ -148,7 +148,7 @@ enum GameDifficulty
 };
 
 //-------------------------------------------------------------------------------------------------
-enum PlayerType
+enum PlayerType CPP_11(: Int)
 {
 	PLAYER_HUMAN,				///< player is human-controlled
 	PLAYER_COMPUTER,		///< player is computer-controlled
@@ -158,7 +158,7 @@ enum PlayerType
 
 //-------------------------------------------------------------------------------------------------
 /// A PartitionCell can be one of three states for Shroud
-enum CellShroudStatus
+enum CellShroudStatus CPP_11(: Int)
 {
 	CELLSHROUD_CLEAR,
 	CELLSHROUD_FOGGED,
@@ -169,7 +169,7 @@ enum CellShroudStatus
 
 //-------------------------------------------------------------------------------------------------
 /// Since an object can take up more than a single PartitionCell, this is a status that applies to the whole Object
-enum ObjectShroudStatus
+enum ObjectShroudStatus CPP_11(: Int)
 {
 	OBJECTSHROUD_INVALID,				///< indeterminate state, will recompute
 	OBJECTSHROUD_CLEAR,					///< object is not shrouded at all (ie, completely visible)
@@ -182,7 +182,7 @@ enum ObjectShroudStatus
 };
 
 //-------------------------------------------------------------------------------------------------
-enum GuardMode
+enum GuardMode CPP_11(: Int)
 {
 	GUARDMODE_NORMAL,
 	GUARDMODE_GUARD_WITHOUT_PURSUIT,	// no pursuit out of guard area
@@ -203,7 +203,7 @@ enum
 
 /// Veterancy level define needed by several files that don't need the full Experience code.
 // NOTE NOTE NOTE: Keep TheVeterencyNames in sync with these.
-enum VeterancyLevel
+enum VeterancyLevel CPP_11(: Int)
 {
 	LEVEL_REGULAR = 0,
 	LEVEL_VETERAN,
@@ -222,7 +222,7 @@ extern const char *TheVeterancyNames[];
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum CommandSourceType 
+enum CommandSourceType CPP_11(: Int) 
 { 
 
 	CMD_FROM_PLAYER = 0, 
@@ -234,7 +234,7 @@ enum CommandSourceType
 };		///< the source of a command
 
 //-------------------------------------------------------------------------------------------------
-enum AbleToAttackType
+enum AbleToAttackType CPP_11(: Int)
 {
 	_ATTACK_FORCED			= 0x01,
 	_ATTACK_CONTINUED		= 0x02,
@@ -472,7 +472,7 @@ class DLINK_ITERATOR
 
 // ------------------------------------------------------------------------
 
-enum WhichTurretType
+enum WhichTurretType CPP_11(: Int)
 {
 	TURRET_INVALID = -1,
 
@@ -495,7 +495,7 @@ inline Real stdAngleDiff(Real a1, Real a2)
 
 // ------------------------------------------------------------------------
 // NOTE NOTE NOTE: Keep TheRelationShipNames in sync with this enum
-enum Relationship
+enum Relationship CPP_11(: Int)
 {
 	ENEMIES = 0,
 	NEUTRAL,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h
index b7fb8a7f83..23462eade4 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h
@@ -36,13 +36,13 @@
 #ifndef _GAME_LOD_H_
 #define _GAME_LOD_H_
 
-enum ParticlePriorityType;
+enum ParticlePriorityType CPP_11(: Int);
 
 #define MAX_LOD_PRESETS_PER_LEVEL	32	//number of hardware configs preset for each low,medium,high
 #define MAX_BENCH_PROFILES	16
 
 //Make sure this enum stays in sync with GameLODNames[]
-enum StaticGameLODLevel
+enum StaticGameLODLevel CPP_11(: Int)
 {
 	STATIC_GAME_LOD_UNKNOWN=-1,
 	STATIC_GAME_LOD_LOW,
@@ -52,7 +52,7 @@ enum StaticGameLODLevel
 	STATIC_GAME_LOD_COUNT
 };
 
-enum DynamicGameLODLevel
+enum DynamicGameLODLevel CPP_11(: Int)
 {
 	DYNAMIC_GAME_LOD_UNKNOWN=-1,
 	DYNAMIC_GAME_LOD_LOW,
@@ -63,7 +63,7 @@ enum DynamicGameLODLevel
 };
 
 //Make sure this stays in sync with CPUNames[] in gamelod.cpp
-enum CpuType
+enum CpuType CPP_11(: Int)
 {
 	XX,	//unknown type
 	P3,
@@ -72,7 +72,7 @@ enum CpuType
 };
 
 //Keep this in sync with VideoNames in Gamelod.cpp
-enum ChipsetType
+enum ChipsetType CPP_11(: Int)
 {	DC_UNKNOWN,
 	DC_VOODOO2,
 	DC_VOODOO3,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h
index 9271cd5e2f..16a098c04e 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h
@@ -51,7 +51,7 @@ typedef void (*IterateSaveFileCallback)( AsciiString filename, void *userData );
 	* save/load menu initialization you can make that menu allow loading only, or allow
 	* both saving and loading from the same menu */
 // ------------------------------------------------------------------------------------------------
-enum SaveLoadLayoutType
+enum SaveLoadLayoutType CPP_11(: Int)
 {
 	SLLT_INVALID = 0,
 	SLLT_SAVE_AND_LOAD,
@@ -82,7 +82,7 @@ struct SaveDate
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum SaveFileType
+enum SaveFileType CPP_11(: Int)
 {
 	SAVE_FILE_TYPE_NORMAL,		///< a regular save game at any arbitrary point in the game
 	SAVE_FILE_TYPE_MISSION,		///< a save game in between missions (a mission save)
@@ -126,7 +126,7 @@ struct AvailableGameInfo
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum SaveCode
+enum SaveCode CPP_11(: Int)
 {
 	SC_INVALID = -1,
 	SC_OK,
@@ -139,7 +139,7 @@ enum SaveCode
 	SC_ERROR,
 };
 
-enum SnapshotType {
+enum SnapshotType CPP_11(: Int) {
 	SNAPSHOT_SAVELOAD,
 	SNAPSHOT_DEEPCRC_LOGICONLY,
 	SNAPSHOT_DEEPCRC,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h
index 7b95bd374a..c969afaaa3 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h
@@ -38,21 +38,21 @@
 #define DEFAULT_WORLD_HEIGHT	64
 
 /// A unique, generic "identifier" used to access Objects.
-enum ObjectID
+enum ObjectID CPP_11(: Int)
 {
 	INVALID_ID = 0,
 	FORCE_OBJECTID_TO_LONG_SIZE = 0x7ffffff
 };
 
 /// A unique, generic "identifier" used to access Drawables.
-enum DrawableID
+enum DrawableID CPP_11(: Int)
 {
 	INVALID_DRAWABLE_ID = 0,
 	FORCE_DRAWABLEID_TO_LONG_SIZE = 0x7ffffff
 };
 
 /// A unique, generic "identifier" used to identify player specified formations.
-enum FormationID
+enum FormationID CPP_11(: Int)
 {
 	NO_FORMATION_ID = 0,					// Unit is not a member of any formation
 	FORCE_FORMATIONID_TO_LONG_SIZE = 0x7ffffff
@@ -65,7 +65,7 @@ class INI;
 //-------------------------------------------------------------------------------------------------
 /** The time of day enumeration, keep in sync with TimeOfDayNames[] */
 //-------------------------------------------------------------------------------------------------
-enum TimeOfDay
+enum TimeOfDay CPP_11(: Int)
 {
 	TIME_OF_DAY_INVALID = 0,
 	TIME_OF_DAY_FIRST = 1,
@@ -81,7 +81,7 @@ extern const char *TimeOfDayNames[];
 // defined in Common/GameType.cpp
 
 //-------------------------------------------------------------------------------------------------
-enum Weather
+enum Weather CPP_11(: Int)
 {
 	WEATHER_NORMAL = 0,
 	WEATHER_SNOWY = 1,
@@ -91,7 +91,7 @@ enum Weather
 
 extern const char *WeatherNames[];
 
-enum Scorches
+enum Scorches CPP_11(: Int)
 {
 	SCORCH_1 = 0,
 	SCORCH_2 = 1,
@@ -170,7 +170,7 @@ enum Scorches
 };
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponSlotType
+enum WeaponSlotType CPP_11(: Int)
 {
 	PRIMARY_WEAPON = 0,
 	SECONDARY_WEAPON,
@@ -188,7 +188,7 @@ enum WeaponSlotType
 // made of structures.
 // Note that the bridges just index in the pathfinder, so you don't actually
 // have a LAYER_BRIDGE_1 enum value.
-enum PathfindLayerEnum {LAYER_INVALID = 0, LAYER_GROUND = 1, LAYER_WALL = 15, LAYER_LAST=15};
+enum PathfindLayerEnum CPP_11(: Int) {LAYER_INVALID = 0, LAYER_GROUND = 1, LAYER_WALL = 15, LAYER_LAST=15};
 
 //-------------------------------------------------------------------------------------------------
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h
index fd35b89f9a..2f08ff5985 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h
@@ -46,7 +46,7 @@ class INI;
 	* order of this geometry and the fact that the values start at 1
 	*/
 //-------------------------------------------------------------------------------------------------
-enum GeometryType
+enum GeometryType CPP_11(: Int)
 {
 	GEOMETRY_SPHERE = 0,	///< partition/collision testing as sphere. (majorRadius = radius)
 	GEOMETRY_CYLINDER,		///< partition/collision testing as cylinder. (majorRadius = radius, height = height)
@@ -68,7 +68,7 @@ static const char *GeometryNames[] =
 
 //-------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(_INTERNAL)
-enum ExtentModType
+enum ExtentModType CPP_11(: Int)
 {
 	EXTENTMOD_INVALID = 0,
 	EXTENTMOD_TYPE = 1,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
index 8dd24109ca..46f83b302f 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
@@ -44,12 +44,12 @@
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 struct FieldParse;
-enum _TerrainLOD;
+enum _TerrainLOD CPP_11(: Int);
 class GlobalData;
 class INI;
 class WeaponBonusSet;
-enum BodyDamageType;
-enum AIDebugOptions;
+enum BodyDamageType CPP_11(: Int);
+enum AIDebugOptions CPP_11(: Int);
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/INI.h b/GeneralsMD/Code/GameEngine/Include/Common/INI.h
index 8ac4254796..4af04f71f3 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h
@@ -42,12 +42,12 @@
 class INI;
 class Xfer;
 class File;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 /** These control the behavior of loading the INI data into items */
 //-------------------------------------------------------------------------------------------------
-enum INILoadType
+enum INILoadType CPP_11(: Int)
 {	
 	INI_LOAD_INVALID,						///< invalid load type
 	INI_LOAD_OVERWRITE,					///< create new or load *over* existing data instance
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h
index 42e60a328f..15de5d358a 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h
@@ -41,7 +41,7 @@
 /** Kind of flags for determining groups of things that belong together
 	* NOTE: You *MUST* keep this in the same order as the KindOfNames[] below */
 //-------------------------------------------------------------------------------------------------
-enum KindOfType
+enum KindOfType CPP_11(: Int)
 {
 	KINDOF_INVALID = -1,
 	KINDOF_FIRST = 0,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h b/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h
index 3fb98c81f2..d71a13005d 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h
@@ -55,7 +55,7 @@ class WorldHeightMap;
 class RenderObjClass;
 class ThingTemplate;
 class Shadow;
-enum WaypointID;
+enum WaypointID CPP_11(: Int);
 
 #define MAP_XY_FACTOR			(10.0f)	 //How wide and tall each height map square is in world space.
 #define MAP_HEIGHT_SCALE	(MAP_XY_FACTOR/16.0f)		//divide all map heights by 8.
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
index 27b5755a4e..ac2d4dc663 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
@@ -46,8 +46,8 @@ typedef UnsignedInt TranslatorID;								///< Unique identifiers for message str
 
 class Drawable;
 class GameMessageList;
-enum ObjectID;
-enum DrawableID;
+enum ObjectID CPP_11(: Int);
+enum DrawableID CPP_11(: Int);
 
 union GameMessageArgumentType														///< Union of possible data for given message type
 {
@@ -65,7 +65,7 @@ union GameMessageArgumentType														///< Union of possible data for given
 	WideChar				wChar;
 };
 
-enum GameMessageArgumentDataType 
+enum GameMessageArgumentDataType CPP_11(: Int) 
 {
 	ARGUMENTDATATYPE_INTEGER,
 	ARGUMENTDATATYPE_REAL,
@@ -716,7 +716,7 @@ class GameMessageList : public SubsystemInterface
 	What to do with a GameMessage after a translator has handled it.
 	Use a custom enum (rather than a Bool) to make the code more obvious.
 */
-enum GameMessageDisposition
+enum GameMessageDisposition CPP_11(: Int)
 {
 	KEEP_MESSAGE,			///< continue processing this message thru other translators
 	DESTROY_MESSAGE		///< destroy this message immediately and don't hand it to any other translators
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h
index 8579d2dcf7..856c99d133 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h
@@ -90,7 +90,7 @@
 // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal"
 // state is defined by the bit being off. That is, the typical "normal" condition
 // has all condition flags set to zero.
-enum ModelConditionFlagType
+enum ModelConditionFlagType CPP_11(: Int)
 {
 	MODELCONDITION_INVALID = -1,
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Module.h b/GeneralsMD/Code/GameEngine/Include/Common/Module.h
index 93b6f5af5d..474baab49d 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Module.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Module.h
@@ -41,8 +41,8 @@
 #include "Common/Snapshot.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-enum TimeOfDay;
-enum StaticGameLODLevel;
+enum TimeOfDay CPP_11(: Int);
+enum StaticGameLODLevel CPP_11(: Int);
 class Drawable;
 class Object;
 class Player;
@@ -55,7 +55,7 @@ struct FieldParse;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ModuleType 
+enum ModuleType CPP_11(: Int) 
 {
 	MODULETYPE_BEHAVIOR = 0,
 
@@ -80,7 +80,7 @@ enum ModuleType
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ModuleInterfaceType 
+enum ModuleInterfaceType CPP_11(: Int) 
 {
 	MODULEINTERFACE_UPDATE					= 0x00000001,
 	MODULEINTERFACE_DIE							= 0x00000002,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h
index 02e7b6d75c..380e9fc6f5 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h
@@ -46,7 +46,7 @@
 	determined at runtime. (The generated code is basically identical, of course.)
 */
 //------------------------------------------------------------------------------------------------- 
-enum NameKeyType
+enum NameKeyType CPP_11(: Int)
 {
 	NAMEKEY_INVALID					= 0,
 	NAMEKEY_MAX							= 1<<23,					// max ordinal value of a NameKey (some code relies on these fitting into 24 bits safely)
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h
index 2396ae6ade..354e94bce9 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h
@@ -35,7 +35,7 @@
 
 class AsciiString;
 
-enum OSDisplayButtonType
+enum OSDisplayButtonType CPP_11(: UnsignedInt)
 {
 	OSDBT_OK										= 0x00000001,
 	OSDBT_CANCEL								= 0x00000002,
@@ -44,7 +44,7 @@ enum OSDisplayButtonType
 	OSDBT_ERROR									= 0x80000000
 };
 
-enum OSDisplayOtherFlags
+enum OSDisplayOtherFlags CPP_11(: UnsignedInt)
 {
 	OSDOF_SYSTEMMODAL						= 0x00000001,
 	OSDOF_APPLICATIONMODAL			= 0x00000002,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h
index 7aaf7859e6..b725f36db8 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h
@@ -40,7 +40,7 @@
 //-------------------------------------------------------------------------------------------------
 /** Object status types */
 //-------------------------------------------------------------------------------------------------
-enum ObjectStatusTypes
+enum ObjectStatusTypes CPP_11(: Int)
 {
 	//These are saved. Do not insert or remove any!
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h
index d1918cfa18..3cef98ee36 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h
@@ -59,7 +59,7 @@ typedef std::vector<PairObjectIDAndUInt> SpacesVec;
 // the first ObjectID is the id of the entry, while the second is the id of the hole
 typedef std::vector<PairObjectID> SolutionVec;
 
-enum SolutionType
+enum SolutionType CPP_11(: Int)
 {
 	PREFER_FAST_SOLUTION = 0,
 	PREFER_CORRECT_SOLUTION = 0x7FFFFFFF
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Player.h b/GeneralsMD/Code/GameEngine/Include/Common/Player.h
index fbeae3e2ee..1c8ab987d1 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Player.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Player.h
@@ -85,11 +85,11 @@ class SpecialPowerModule;
 
 class BattlePlanBonuses;
 
-enum BattlePlanStatus;
-enum UpgradeStatusType;
-enum CommandSourceType;
+enum BattlePlanStatus CPP_11(: Int);
+enum UpgradeStatusType CPP_11(: Int);
+enum CommandSourceType CPP_11(: Int);
 
-enum ScienceAvailabilityType
+enum ScienceAvailabilityType CPP_11(: Int)
 {
 	SCIENCE_AVAILABILITY_INVALID = -1,
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h
index 5099ad586f..49fee39a6f 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h
@@ -60,7 +60,7 @@ class Team;
 class TeamFactory;
 
 //-------------------------------------------------------------------------------------------------
-enum AllowPlayerRelationship
+enum AllowPlayerRelationship CPP_11(: Int)
 {
 	ALLOW_SAME_PLAYER			= 0x01,		///< allow only objects of the same player as m_obj
 	ALLOW_ALLIES					= 0x02,		///< allow objects that m_obj considers allies
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h
index 8dc12d2276..98da900dee 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h
@@ -61,7 +61,7 @@ enum
 /** These event types determine the colors radar events happen in to make it easier for us
 	* to play events with a consistent color scheme */
 //-------------------------------------------------------------------------------------------------
-enum RadarEventType
+enum RadarEventType CPP_11(: Int)
 {
 	RADAR_EVENT_INVALID = 0,
 	RADAR_EVENT_CONSTRUCTION,
@@ -126,7 +126,7 @@ class RadarObject : public MemoryPoolObject,
 //-------------------------------------------------------------------------------------------------
 /** Radar priorities.  Keep this in sync with the priority names list below */
 //-------------------------------------------------------------------------------------------------
-enum RadarPriorityType
+enum RadarPriorityType CPP_11(: Int)
 {
 	RADAR_PRIORITY_INVALID,					// a priority that has not been set (in general it won't show up on the radar)
 	RADAR_PRIORITY_NOT_ON_RADAR,		// object specifically forbidden from being on the radar
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h
index b232b1aabd..4ae303eeda 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h
@@ -45,7 +45,7 @@ class ReplayGameInfo : public GameInfo
 	}
 };
 
-enum RecorderModeType {
+enum RecorderModeType CPP_11(: Int) {
 	RECORDERMODETYPE_RECORD,
 	RECORDERMODETYPE_PLAYBACK,
 	RECORDERMODETYPE_NONE // this is a valid state to be in on the shell map, or in saved games
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h
index d412e7fc47..59d006b0b6 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h
@@ -64,9 +64,9 @@ class STLSpecialAlloc;
 
 // FORWARD DECLARATIONS
 class Object;
-enum NameKeyType;
-enum ObjectID;
-enum DrawableID;
+enum NameKeyType CPP_11(: Int);
+enum ObjectID CPP_11(: Int);
+enum DrawableID CPP_11(: Int);
 
 #include <algorithm>
 #include <bitset>
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Science.h b/GeneralsMD/Code/GameEngine/Include/Common/Science.h
index 445995a5f2..aa84e8fc11 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Science.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Science.h
@@ -40,7 +40,7 @@
 class Player;
 
 //-------------------------------------------------------------------------------------------------
-enum ScienceType
+enum ScienceType CPP_11(: Int)
 {
 	SCIENCE_INVALID = -1
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h
index 0ddadee7af..49ccb8c360 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h
@@ -45,9 +45,9 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class ObjectCreationList;
 class Object;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 struct FieldParse;
-enum AcademyClassificationType;
+enum AcademyClassificationType CPP_11(: Int);
 
 // For SpecialPowerType and SpecialPowerMaskType::s_bitNameList. Part of detangling.
 #include "Common/SpecialPowerType.h"
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h
index 44b3b3aa9a..fc59251168 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h
@@ -37,7 +37,7 @@
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum SpecialPowerType
+enum SpecialPowerType CPP_11(: Int)
 {
 	SPECIAL_INVALID,
 	// don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[]
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
index 403c1540be..cec0d45770 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
@@ -64,7 +64,7 @@ typedef Bool (*StateTransFuncPtr)( State *state, void* userData );
 /**
  * State return codes
  */
-enum StateReturnType 
+enum StateReturnType CPP_11(: Int) 
 { 
 	// note that all positive values are reserved for STATE_SLEEP!
 
@@ -120,7 +120,7 @@ enum
 /** 
  * Parameters for onExit().
  */
-enum StateExitType
+enum StateExitType CPP_11(: Int)
 {
 	EXIT_NORMAL,							///< state exited due to normal state transitioning
 	EXIT_RESET								///< state exited due to state machine reset
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Team.h b/GeneralsMD/Code/GameEngine/Include/Common/Team.h
index d7ea935591..900bfa7897 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Team.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Team.h
@@ -110,7 +110,7 @@ class ThingTemplate;
 class Waypoint;
 class PlayerRelationMap;
 
-enum AttitudeType;
+enum AttitudeType CPP_11(: Int);
 
 typedef struct {
 	Int	minUnits;
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h
index 197b2c4444..955b918702 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h
@@ -33,7 +33,7 @@
 #define __THINGSORT_H_
 
 //-------------------------------------------------------------------------------------------------
-enum EditorSortingType
+enum EditorSortingType CPP_11(: Int)
 {
 	ES_FIRST = 0,
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
index ffa2e08beb..bb597140fa 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
@@ -60,10 +60,10 @@ class ProductionPrerequisite;
 struct FieldParse;
 class Player;
 class INI;
-enum RadarPriorityType;
-enum ScienceType;
-enum EditorSortingType;
-enum ShadowType;
+enum RadarPriorityType CPP_11(: Int);
+enum ScienceType CPP_11(: Int);
+enum EditorSortingType CPP_11(: Int);
+enum ShadowType CPP_11(: Int);
 class WeaponTemplateSet;
 class ArmorTemplateSet;
 class FXList;
@@ -94,7 +94,7 @@ enum
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ThingTemplateAudioType
+enum ThingTemplateAudioType CPP_11(: Int)
 {
 	TTAUDIO_voiceSelect,							///< Response when unit is selected
 	TTAUDIO_voiceGroupSelect,					///< Response when a group of this unit is selected
@@ -195,7 +195,7 @@ class AudioArray
 //-------------------------------------------------------------------------------------------------
 /** Object class type enumeration */
 //-------------------------------------------------------------------------------------------------
-enum BuildCompletionType
+enum BuildCompletionType CPP_11(: Int)
 {
 	BC_INVALID = 0,
 	BC_APPEARS_AT_RALLY_POINT,	///< unit appears at rally point of its #1 prereq
@@ -214,7 +214,7 @@ static const char *BuildCompletionNames[] =
 };
 #endif  // end DEFINE_BUILD_COMPLETION_NAMES
 
-enum BuildableStatus
+enum BuildableStatus CPP_11(: Int)
 {
 	// saved into savegames... do not change or remove values!
 	BSTATUS_YES = 0,
@@ -237,7 +237,7 @@ static const char *BuildableStatusNames[] =
 #endif	// end DEFINE_BUILDABLE_STATUS_NAMES
 
 //-------------------------------------------------------------------------------------------------
-enum ModuleParseMode
+enum ModuleParseMode CPP_11(: Int)
 {
 	MODULEPARSE_NORMAL,
 	MODULEPARSE_ADD_REMOVE_REPLACE,
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h
index eaed50be50..8a6df4bd51 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h
@@ -41,13 +41,13 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Player;
 class UpgradeTemplate;
-enum NameKeyType;
+enum NameKeyType CPP_11(: Int);
 class Image;
-enum AcademyClassificationType;
+enum AcademyClassificationType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum UpgradeStatusType
+enum UpgradeStatusType CPP_11(: Int)
 {
 	UPGRADE_STATUS_INVALID = 0,
 	UPGRADE_STATUS_IN_PRODUCTION,
@@ -145,7 +145,7 @@ class Upgrade : public MemoryPoolObject,
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum UpgradeType
+enum UpgradeType CPP_11(: Int)
 {
 	UPGRADE_TYPE_PLAYER = 0,						// upgrade applies to a player as a whole
 	UPGRADE_TYPE_OBJECT,								// upgrade applies to an object instance only
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Xfer.h b/GeneralsMD/Code/GameEngine/Include/Common/Xfer.h
index e98ba4acbb..449e46710b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Xfer.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Xfer.h
@@ -41,10 +41,10 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Snapshot;
 typedef Int Color;
-enum ObjectID;
-enum DrawableID;
-enum KindOfType;
-enum ScienceType;
+enum ObjectID CPP_11(: Int);
+enum DrawableID CPP_11(: Int);
+enum KindOfType CPP_11(: Int);
+enum ScienceType CPP_11(: Int);
 class Matrix3D;
 
 // ------------------------------------------------------------------------------------------------
@@ -52,7 +52,7 @@ typedef UnsignedByte XferVersion;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum XferMode
+enum XferMode CPP_11(: Int)
 {
 	XFER_INVALID = 0,
 
@@ -65,7 +65,7 @@ enum XferMode
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum XferStatus
+enum XferStatus CPP_11(: Int)
 {
 	XFER_STATUS_INVALID = 0,
 	
@@ -93,7 +93,7 @@ enum XferStatus
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum XferOptions
+enum XferOptions CPP_11(: UnsignedInt)
 {
 	XO_NONE										= 0x00000000,
 	XO_NO_POST_PROCESSING			= 0x00000001,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h
index e55545d7e2..c168aa33e6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h
@@ -40,7 +40,7 @@ class Image;
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum Anim2DMode
+enum Anim2DMode CPP_11(: Int)
 {
 	
 	ANIM_2D_INVALID = 0,
@@ -120,7 +120,7 @@ class Anim2DTemplate : public MemoryPoolObject
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum Anim2DStatus
+enum Anim2DStatus CPP_11(: Int)
 {
 	ANIM_2D_STATUS_NONE			= 0x00,
 	ANIM_2D_STATUS_FROZEN		= 0x01,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
index 67b761a3f8..86a40dd781 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
@@ -80,7 +80,7 @@ class ProcessAnimateWindow;
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-enum AnimTypes
+enum AnimTypes CPP_11(: Int)
 {
 	WIN_ANIMATION_NONE = 0,
 	WIN_ANIMATION_SLIDE_RIGHT,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h
index b535cf5b2b..65381e75f1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h
@@ -32,7 +32,7 @@
 
 #include "GameClient/InGameUI.h"
 
-enum GUICommandType;
+enum GUICommandType CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 class CommandTranslator : public GameMessageTranslator
@@ -72,7 +72,7 @@ class CommandTranslator : public GameMessageTranslator
 };
 
 
-enum FilterTypes
+enum FilterTypes CPP_11(: Int)
 {
 	FT_NULL_FILTER=0,
 	// The following are screen filter shaders, that modify the rendered viewport after it is drawn.
@@ -83,7 +83,7 @@ enum FilterTypes
 	FT_MAX
 };
 
-enum FilterModes
+enum FilterModes CPP_11(: Int)
 {
 	FM_NULL_MODE = 0,
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
index fee923ff98..10b4e187e1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
@@ -61,19 +61,19 @@ class ControlBarResizer;
 class GameWindowTransitionsHandler;
 class DisplayString;
 
-enum ProductionID;
+enum ProductionID CPP_11(: Int);
 
-enum CommandSourceType;
-enum ProductionType;
-enum GadgetGameMessage;
-enum ScienceType;
-enum TimeOfDay;
-enum RadiusCursorType;
+enum CommandSourceType CPP_11(: Int);
+enum ProductionType CPP_11(: Int);
+enum GadgetGameMessage CPP_11(: Int);
+enum ScienceType CPP_11(: Int);
+enum TimeOfDay CPP_11(: Int);
+enum RadiusCursorType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 /** Command options */
 //-------------------------------------------------------------------------------------------------
-enum CommandOption
+enum CommandOption CPP_11(: Int)
 {
 	COMMAND_OPTION_NONE					= 0x00000000,
 	NEED_TARGET_ENEMY_OBJECT		= 0x00000001, // command now needs user to select enemy target
@@ -166,7 +166,7 @@ const UnsignedInt COMMAND_OPTION_NEED_OBJECT_TARGET =
 	* IMPORTANT: Make sure the GUICommandType enum and the TheGuiCommandNames[] have the same
 	*						 entries in the same order */
 //-------------------------------------------------------------------------------------------------
-enum GUICommandType
+enum GUICommandType CPP_11(: Int)
 {
 	GUI_COMMAND_NONE = 0,									///< invalid command
 	GUI_COMMAND_DOZER_CONSTRUCT,					///< dozer construct
@@ -270,7 +270,7 @@ static const char *TheGuiCommandNames[] =
 };
 #endif  // end DEFINE_GUI_COMMAND_NAMES
 
-enum CommandButtonMappedBorderType
+enum CommandButtonMappedBorderType CPP_11(: Int)
 {
 	COMMAND_BUTTON_BORDER_NONE = 0,
 	COMMAND_BUTTON_BORDER_BUILD,
@@ -576,7 +576,7 @@ class SideSelectWindowData
 	* display of commands and information to the user based on what objects are selected
 	* and their capabilities */
 //-------------------------------------------------------------------------------------------------
-enum ControlBarContext
+enum ControlBarContext CPP_11(: Int)
 {
 	CB_CONTEXT_NONE,									///< default view for center bar and portrait window
 //	CB_CONTEXT_PURCHASE_SCIENCE,
@@ -598,7 +598,7 @@ enum ControlBarContext
 	* hide and un-hide these windows and their interface controls in order to make
 	* the control bar context sensitive to the object that is selected */
 //-------------------------------------------------------------------------------------------------
-enum ContextParent
+enum ContextParent CPP_11(: Int)
 {
 	CP_MASTER,									///< *The* control bar window as a whole
 	CP_PURCHASE_SCIENCE,
@@ -615,7 +615,7 @@ enum ContextParent
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum CBCommandStatus
+enum CBCommandStatus CPP_11(: Int)
 {
 	CBC_COMMAND_NOT_USED = 0,		///< gui control message was *not* used
 	CBC_COMMAND_USED						///< gui control message was used
@@ -626,7 +626,7 @@ enum CBCommandStatus
 	* GUI button to be enabled/disabled/checked/unchecked to represent the current
 	* state of that command availability */
 // ------------------------------------------------------------------------------------------------
-enum CommandAvailability
+enum CommandAvailability CPP_11(: Int)
 {
 	COMMAND_RESTRICTED,
 	COMMAND_AVAILABLE,
@@ -636,7 +636,7 @@ enum CommandAvailability
 	COMMAND_CANT_AFFORD,
 };
 
-enum ControlBarStages
+enum ControlBarStages CPP_11(: Int)
 {
 	CONTROL_BAR_STAGE_DEFAULT = 0,		///< full view for the world to see
 	CONTROL_BAR_STAGE_SQUISHED,				///< squished just for expeirenced players
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h
index 2712cbdf72..907c6d0636 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h
@@ -63,7 +63,7 @@
 class AsciiString;
 class playerTemplate;
 class Image;
-enum TimeOfDay;
+enum TimeOfDay CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h
index f52ff2cd08..bf120b7cd7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h
@@ -30,7 +30,7 @@
 
 #include "GameNetwork/DisconnectManager.h"
 
-enum DisconnectMenuStateType {
+enum DisconnectMenuStateType CPP_11(: Int) {
 	DISCONNECTMENUSTATETYPE_SCREENON,
 	DISCONNECTMENUSTATETYPE_SCREENOFF
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h
index d08e5e3a6e..b943339792 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h
@@ -51,7 +51,7 @@ class DebugDisplayInterface;
 class Radar;
 class Image;
 class DisplayString;
-enum StaticGameLODLevel;
+enum StaticGameLODLevel CPP_11(: Int);
 /**
  * The Display class implements the Display interface
  */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h
index ca38307b7d..fb99dcb534 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h
@@ -56,7 +56,7 @@ class ModuleInfo;
 class Anim2DTemplate;
 class Image;
 class DynamicAudioEventInfo;
-enum BodyDamageType;
+enum BodyDamageType CPP_11(: Int);
 
 // this is a very worthwhile performance win. left conditionally defined for now, just 
 // in case, but probably should be made permanent soon. (srj)
@@ -77,7 +77,7 @@ enum BodyDamageType;
 //      each time I add a new icon, and made the arrays dynamic...
 // CD: No so good, core engine components should not be made dynamic in this way
 
-enum DrawableIconType
+enum DrawableIconType CPP_11(: Int)
 {
 /** NOTE: This enum MUST appear in the same order as TheDrawableIconNames array to be
 	* indexed correctly using that array */
@@ -213,7 +213,7 @@ class TintEnvelope : public MemoryPoolObject, public Snapshot
 EMPTY_DTOR(TintEnvelope)
 
 //-----------------------------------------------------------------------------
-enum StealthLookType
+enum StealthLookType CPP_11(: Int)
 {
 	STEALTHLOOK_NONE,								///< unit is not stealthed at all
 	STEALTHLOOK_VISIBLE_FRIENDLY,		///< unit is stealthed-but-visible due to friendly status
@@ -228,7 +228,7 @@ enum StealthLookType
 // ------------------------------------------------------------------------------------------------
 /** Drawable status bits */
 // ------------------------------------------------------------------------------------------------
-enum DrawableStatus
+enum DrawableStatus CPP_11(: Int)
 {
 	DRAWABLE_STATUS_NONE									= 0x00000000,		///< no status
 	DRAWABLE_STATUS_DRAWS_IN_MIRROR				=	0x00000001,		///< drawable can reflect
@@ -238,7 +238,7 @@ enum DrawableStatus
 	DRAWABLE_STATUS_NO_SAVE								= 0x00000010,		///< do *not* save this drawable (UI fluff only). ignored (error, actually) if attached to an object
 };
 
-enum TintStatus
+enum TintStatus CPP_11(: Int)
 {
 	TINT_STATUS_DISABLED		= 0x00000001,///< drawable tint color is deathly dark grey
 	TINT_STATUS_IRRADIATED	= 0x00000002,///< drawable tint color is sickly green
@@ -254,7 +254,7 @@ enum TintStatus
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum TerrainDecalType
+enum TerrainDecalType CPP_11(: Int)
 {
 #ifdef ALLOW_DEMORALIZE
 	TERRAIN_DECAL_DEMORALIZED = 0,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h b/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
index 186c8b0661..a88dff961f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
@@ -27,7 +27,7 @@
 #include "GameNetwork/NetworkDefs.h"
 #include "GameNetwork/NAT.h"
 
-enum EstablishConnectionsMenuStateType {
+enum EstablishConnectionsMenuStateType CPP_11(: Int) {
 	ESTABLISHCONNECTIONSMENUSTATETYPE_SCREENON,
 	ESTABLISHCONNECTIONSMENUSTATETYPE_SCREENOFF
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h
index 61186c257c..9cabbff279 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h
@@ -38,7 +38,7 @@ class INI;
 
 //------------------------------------------------------------------------------------ Eva Messages
 // Keep in sync with TheEvaMessageNames AND Eva::s_shouldPlayFuncs
-enum EvaMessage
+enum EvaMessage CPP_11(: Int)
 {
   EVA_Invalid = -1,
     
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
index 3129336691..deef901544 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
@@ -36,7 +36,7 @@
 #include "GameClient/GameWindowManager.h"
 
 // return codes for message box callbacks
-enum MessageBoxReturnType {
+enum MessageBoxReturnType CPP_11(: Int) {
 	MB_RETURN_CLOSE,
 	MB_RETURN_KEEPOPEN
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h
index 8d3bfd23f5..3c42ac30df 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h
@@ -333,7 +333,7 @@ extern WindowMsgHandledType ReplayControlInput( GameWindow *window, UnsignedInt
 // InGame Chat Controls --------------------------------------------------------------------------------
 extern WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
 extern WindowMsgHandledType InGameChatInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
-enum InGameChatType
+enum InGameChatType CPP_11(: Int)
 {
 	INGAME_CHAT_ALLIES,
 	INGAME_CHAT_EVERYONE,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h
index 3e2a792196..e8e0d48560 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h
@@ -133,7 +133,7 @@ enum
 };
 
 // Gadget game messages (sent to their owners)
-enum GadgetGameMessage
+enum GadgetGameMessage CPP_11(: Int)
 {
 
 	// Generic messages supported by all gadgets
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h
index fb212c0aad..98fa971088 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h
@@ -78,7 +78,7 @@ enum { WIN_COLOR_UNDEFINED = GAME_COLOR_UNDEFINED };
 typedef UnsignedInt WindowMsgData;
 
 //-----------------------------------------------------------------------------
-enum WindowMsgHandledType { MSG_IGNORED, MSG_HANDLED };
+enum WindowMsgHandledType CPP_11(: Int) { MSG_IGNORED, MSG_HANDLED };
 
 // callback types -------------------------------------------------------------
 typedef void (*GameWinMsgBoxFunc)( void ); //used for the Message box callbacks.
@@ -113,7 +113,7 @@ enum
 
 // Game window messages -------------------------------------------------------
 //-----------------------------------------------------------------------------
-enum GameWindowMessage
+enum GameWindowMessage CPP_11(: Int)
 {
 
 	GWM_NONE = 0,
@@ -141,7 +141,7 @@ enum GameWindowMessage
 /** These return codes are returned when after processing events through
 	* the window system */
 //-----------------------------------------------------------------------------
-enum WinInputReturnCode
+enum WinInputReturnCode CPP_11(: Int)
 {
 	WIN_INPUT_NOT_USED = 0,
 	WIN_INPUT_USED,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
index c96fd88656..6ea74f81b4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -60,13 +60,13 @@ class WindowLayout;
 class Anim2DTemplate;
 class Anim2D;
 class Shadow;
-enum LegalBuildCode;
-enum KindOfType;
-enum ShadowType;
-enum CanAttackResult;
+enum LegalBuildCode CPP_11(: Int);
+enum KindOfType CPP_11(: Int);
+enum ShadowType CPP_11(: Int);
+enum CanAttackResult CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
-enum RadiusCursorType
+enum RadiusCursorType CPP_11(: Int)
 {
 	RADIUSCURSOR_NONE = 0,
 	RADIUSCURSOR_ATTACK_DAMAGE_AREA,
@@ -288,7 +288,7 @@ enum
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // ------------------------------------------------------------------------------------------------
-enum WorldAnimationOptions
+enum WorldAnimationOptions CPP_11(: Int)
 {
 	WORLD_ANIM_NO_OPTIONS								= 0x00000000,
 	WORLD_ANIM_FADE_ON_EXPIRE						= 0x00000001,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h
index 6dc472fa8d..a04c53a032 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h
@@ -63,6 +63,7 @@
 #endif
 
 #include <dinput.h>
+#include <Lib/BaseType.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 
@@ -104,7 +105,7 @@
 /** The key tables */
 //=============================================================================
 
-enum KeyDefType
+enum KeyDefType CPP_11(: Int)
 {
 	// keypad keys ---------------------------------------------------------------- 
 	KEY_KP0 								= DIK_NUMPAD0,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h
index 566a0810da..789825dec1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h
@@ -34,7 +34,7 @@
 #include "GameClient/InGameUI.h"
 
 
-enum MappableKeyCategories
+enum MappableKeyCategories CPP_11(: Int)
 {
 	CATEGORY_CONTROL = 0,
 	CATEGORY_INFORMATION,
@@ -67,7 +67,7 @@ static const LookupListRec CategoryListName[] =
 // in particular, "modifier" keys and keypad keys aren't
 // available. Note that MappableKeyType is a SUBSET of
 // KeyDefType; this is extremely important to maintain!
-enum MappableKeyType
+enum MappableKeyType CPP_11(: Int)
 {
 	MK_ESC					= KEY_ESC,
 	MK_BACKSPACE		= KEY_BACKSPACE,
@@ -250,7 +250,7 @@ static const LookupListRec KeyNames[] =
 };
 
 // -------------------------------------------------------------------------------
-enum MappableKeyTransition
+enum MappableKeyTransition CPP_11(: Int)
 {
 	DOWN,
 	UP,
@@ -267,7 +267,7 @@ static const LookupListRec TransitionNames[] =
 
 // -------------------------------------------------------------------------------
 // an easier-to-type subset of the KEY_STATE stuff.
-enum MappableKeyModState
+enum MappableKeyModState CPP_11(: Int)
 {
 	NONE							= 0,
 	CTRL							= KEY_STATE_LCONTROL,
@@ -296,7 +296,7 @@ static const LookupListRec ModifierNames[] =
 
 // -------------------------------------------------------------------------------
 // CommandUsableInType sets in what state the commands are allowed.
-enum CommandUsableInType
+enum CommandUsableInType CPP_11(: Int)
 {
 	COMMANDUSABLE_NONE				= 0,
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h
index d11ac28792..64cebc7957 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h
@@ -61,7 +61,7 @@
 
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 
-enum MouseButtonState
+enum MouseButtonState CPP_11(: Int)
 {
 	MBS_Up = 0,
 	MBS_Down,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h
index e96e4c665a..663df919af 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h
@@ -56,7 +56,7 @@ class INI;
 class DebugWindowDialog;		// really ParticleEditorDialog
 class RenderInfoClass;			// ick
 
-enum ParticleSystemID
+enum ParticleSystemID CPP_11(: Int)
 {
 	INVALID_PARTICLE_SYSTEM_ID = 0
 };
@@ -82,7 +82,7 @@ struct RGBColorKeyframe
 	UnsignedInt frame;
 };
 
-enum ParticlePriorityType
+enum ParticlePriorityType CPP_11(: Int)
 {
 	INVALID_PRIORITY = 0, 
 	PARTICLE_PRIORITY_LOWEST = 1,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h
index 3e211be7ae..5e720d3f54 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h
@@ -34,7 +34,7 @@
 #include "Common/GameType.h"
 #include "GameClient/Color.h"
 
-enum ShadowType;
+enum ShadowType CPP_11(: Int);
 class Player;
 class Shadow;
 class RadiusDecalTemplate;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h
index e8f7efe1ad..f2be765967 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h
@@ -38,7 +38,7 @@
 //
 
 // shadow bit flags, keep this in sync with TheShadowNames
-enum ShadowType
+enum ShadowType CPP_11(: Int)
 {
 	SHADOW_NONE											=	0x00000000, 
 	SHADOW_DECAL										=	0x00000001,		//shadow decal applied via modulate blend
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h
index ac874dfa72..0caf3ed653 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h
@@ -105,7 +105,7 @@ class AnimateWindowManager;
 class GameWindow;
 class ShellMenuSchemeManager;
 
-enum AnimTypes;
+enum AnimTypes CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 /** This is the interface to the shell system to load, display, and
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h
index 38841cd719..a6406ea18d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h
@@ -46,7 +46,7 @@ class AsciiString;
 // ------------------------------------------------------------------------------------------------
 /** Bridges have 4 towers around it that the player can attack or use to repair the bridge */
 // ------------------------------------------------------------------------------------------------
-enum BridgeTowerType
+enum BridgeTowerType CPP_11(: Int)
 {
 	BRIDGE_TOWER_FROM_LEFT = 0,
 	BRIDGE_TOWER_FROM_RIGHT,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h
index 712f3e583f..f6bbae9a2e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h
@@ -57,7 +57,7 @@ struct SeismicSimulationNode; // just a forward declaration folks, no cause for
 class SeismicSimulationFilterBase
 {
 public:
-  enum SeismicSimStatusCode
+  enum SeismicSimStatusCode CPP_11(: Int)
   {
     SEISMIC_STATUS_INVALID,
     SEISMIC_STATUS_ACTIVE,
@@ -170,7 +170,7 @@ class DomeStyleSeismicFilter : public SeismicSimulationFilterBase
 //-------------------------------------------------------------------------------------------------
 /** LOD values for terrain, keep this in sync with TerrainLODNames[] */
 //-------------------------------------------------------------------------------------------------
-typedef enum _TerrainLOD
+typedef enum _TerrainLOD CPP_11(: Int)
 { 
 	TERRAIN_LOD_INVALID								= 0,
 	TERRAIN_LOD_MIN										= 1,  // note that this is less than max
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h
index a309f5d2cf..5ce8f763e6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h
@@ -53,7 +53,7 @@ class LookAtTranslator;
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum PickType
+enum PickType CPP_11(: Int)
 {
 	PICK_TYPE_TERRAIN						= COLL_TYPE_0,
 	PICK_TYPE_SELECTABLE				= COLL_TYPE_1,
@@ -84,7 +84,7 @@ class View : public Snapshot
 	};
 
   // Return values for worldToScreenTriReturn
-  enum WorldToScreenReturn
+  enum WorldToScreenReturn CPP_11(: Int)
   {
     WTS_INSIDE_FRUSTUM = 0, // On the screen (inside frustum of camera)
     WTS_OUTSIDE_FRUSTUM,    // Return is valid but off the screen (outside frustum of camera)
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h
index 06aea0adfd..2ba7480eaa 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h
@@ -69,7 +69,7 @@ class VideoBuffer;
 //-----------------------------------------------------------------------------
 
 
-enum WindowVideoPlayType
+enum WindowVideoPlayType CPP_11(: Int)
 {
 	WINDOW_PLAY_MOVIE_ONCE = 0,
 	WINDOW_PLAY_MOVIE_LOOP,
@@ -78,7 +78,7 @@ enum WindowVideoPlayType
 	WINDOW_PLAY_MOVIE_COUNT
 };
 
-enum WindowVideoStates
+enum WindowVideoStates CPP_11(: Int)
 {
 	WINDOW_VIDEO_STATE_START = 0,
 	WINDOW_VIDEO_STATE_STOP,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
index ecb7d34299..c8cb0c8b01 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
@@ -51,11 +51,11 @@ class PolygonTrigger;
 class UpgradeTemplate;
 class WeaponTemplate;
 
-enum GUICommandType;
-enum HackerAttackMode;
-enum WeaponSetType;
-enum WeaponLockType;
-enum SpecialPowerType;
+enum GUICommandType CPP_11(: Int);
+enum HackerAttackMode CPP_11(: Int);
+enum WeaponSetType CPP_11(: Int);
+enum WeaponLockType CPP_11(: Int);
+enum SpecialPowerType CPP_11(: Int);
 
 typedef std::vector<ObjectID> VecObjectID;
 typedef VecObjectID::iterator VecObjectIDIt;
@@ -63,7 +63,7 @@ typedef VecObjectID::iterator VecObjectIDIt;
 typedef std::list<Object *> ListObjectPtr;
 typedef ListObjectPtr::iterator ListObjectPtrIt;
 
-enum AIDebugOptions
+enum AIDebugOptions CPP_11(: Int)
 {
 	AI_DEBUG_NONE = 0, 
 	AI_DEBUG_PATHS,
@@ -314,7 +314,7 @@ class Weapon;
 // TheSuperHackers @compile xezon 17/03/2025 Renames AI_PASSIVE to not conflict with macro in ws2def.h
 
 // Note - written out in save/load xfer and .map files, don't change these numbers.  
-enum AttitudeType
+enum AttitudeType CPP_11(: Int)
 {
 	ATTITUDE_SLEEP = -2,
 	ATTITUDE_PASSIVE=-1,
@@ -324,7 +324,7 @@ enum AttitudeType
 	ATTITUDE_INVALID=3
 };		///< AI "attitude" behavior modifiers
 
-enum CommandSourceType;
+enum CommandSourceType CPP_11(: Int);
 
 typedef UnsignedInt CommandSourceMask;
 
@@ -343,7 +343,7 @@ static const char *TheCommandSourceMaskNames[] =
 
 //------------------------------------------------------------------------------------------------------------
 
-enum AICommandType	// Stored in save file, do not reorder/renumber.  jba.
+enum AICommandType CPP_11(: Int)	// Stored in save file, do not reorder/renumber.  jba.
 {
 	AICMD_NO_COMMAND = -1,
 	AICMD_MOVE_TO_POSITION = 0,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
index 0a600ad122..1a5cf974f8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
@@ -58,7 +58,7 @@ class Squad;
  * Each of these constants will be associated with an instance of a State class
  * in a given StateMachine.
  */
-enum AIStateType
+enum AIStateType CPP_11(: Int)
 {
 	AI_IDLE,
 	AI_MOVE_TO,																///< move to the GoalObject or GoalPosition
@@ -196,7 +196,7 @@ class AttackStateMachine : public StateMachine
 
 public:
 // Attack states.
-enum StateType
+enum StateType CPP_11(: Int)
 	{
 		CHASE_TARGET,													///< Chase a moving target (optionally following it)
 		APPROACH_TARGET,											///< Approach a non-moving target.
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h
index 446a646f25..54cded619b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h
@@ -43,7 +43,7 @@ class INI;
 // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal"
 // state is defined by the bit being off. That is, the typical "normal" condition
 // has all condition flags set to zero.
-enum ArmorSetType
+enum ArmorSetType CPP_11(: Int)
 {
 	// The access and use of this enum has the bit shifting built in, so this is a 0,1,2,3,4,5 enum
 	ARMORSET_VETERAN		= 0,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
index ed23e3e1b2..90ddbb5de0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
@@ -36,7 +36,7 @@
 #include "Common/Overridable.h"
 #include "Common/Override.h"
 
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 struct crateCreationEntry
 {
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h
index 9037570ade..f1a0a7e96f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h
@@ -47,7 +47,7 @@ class ThingTemplate;
 //-------------------------------------------------------------------------------------------------
 /** Damage types, keep this in sync with DamageTypeFlags::s_bitNameList[] */
 //-------------------------------------------------------------------------------------------------
-enum DamageType
+enum DamageType CPP_11(: Int)
 {	
 	DAMAGE_EXPLOSION							= 0,			
 	DAMAGE_CRUSH									= 1,					
@@ -164,7 +164,7 @@ void initDamageTypeFlags();
 //-------------------------------------------------------------------------------------------------
 /** Death types, keep this in sync with TheDeathNames[] */
 //-------------------------------------------------------------------------------------------------
-enum DeathType
+enum DeathType CPP_11(: Int)
 {	
 	// note that these DELIBERATELY have (slightly) different names from the damage names,
 	// since there isn't necessarily a one-to-one correspondence. e.g., DEATH_BURNED
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
index 04f511a594..96b98e0d07 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
@@ -66,7 +66,7 @@ class WindowLayout;
 class TerrainLogic;
 class GhostObjectManager;
 class CommandButton;
-enum BuildableStatus;
+enum BuildableStatus CPP_11(: Int);
 
 
 typedef const CommandButton* ConstCommandButtonPtr;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h
index 31f8e13abc..5e64f61f1b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h
@@ -43,8 +43,8 @@
 
 class Object;
 class PartitionData;
-enum GeometryType;
-enum ObjectID;
+enum GeometryType CPP_11(: Int);
+enum ObjectID CPP_11(: Int);
 
 class GhostObject : public Snapshot
 {
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
index af1e388794..af8c7f1a97 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
@@ -44,14 +44,14 @@ class Locomotor;
 class LocomotorTemplate;
 class INI;
 class PhysicsBehavior;
-enum BodyDamageType;
-enum PhysicsTurningType;
+enum BodyDamageType CPP_11(: Int);
+enum PhysicsTurningType CPP_11(: Int);
 
 // if we ever re-enable jets circling for landing, we need this. so keep in around just in case. (srj)
 #define NO_CIRCLE_FOR_LANDING
 
 //-------------------------------------------------------------------------------------------------
-enum LocomotorAppearance
+enum LocomotorAppearance CPP_11(: Int)
 {
 	LOCO_LEGS_TWO,
 	LOCO_WHEELS_FOUR,
@@ -64,7 +64,7 @@ enum LocomotorAppearance
 	LOCO_MOTORCYCLE
 };
 
-enum LocomotorPriority
+enum LocomotorPriority CPP_11(: Int)
 {
 	LOCO_MOVES_BACK=0,				// In a group, this one moves toward the back
 	LOCO_MOVES_MIDDLE=1,			// In a group, this one stays in the middle
@@ -89,7 +89,7 @@ static const char *TheLocomotorAppearanceNames[] =
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum LocomotorBehaviorZ
+enum LocomotorBehaviorZ CPP_11(: Int)
 {
 	Z_NO_Z_MOTIVE_FORCE,							// does whatever physics tells it, but has no z-force of its own.
 	Z_SEA_LEVEL,											// keep at surface-of-water level
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h
index ed73635b81..731f0c3885 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h
@@ -46,7 +46,7 @@ class LocomotorTemplate;
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum LocomotorSurfaceType
+enum LocomotorSurfaceType CPP_11(: Int)
 {
 	LOCOMOTORSURFACE_GROUND			= (1 << 0),									///< clear, unobstructed ground
 	LOCOMOTORSURFACE_WATER			= (1 << 1),									///< water area
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
index 95556225a8..409052aedd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
@@ -59,8 +59,8 @@ class HackInternetAIInterface;
 class AssaultTransportAIInterface;
 class JetAIUpdate;
 
-enum AIStateType;
-enum ObjectID;
+enum AIStateType CPP_11(: Int);
+enum ObjectID CPP_11(: Int);
 
 
 //-------------------------------------------------------------------------------------------------
@@ -71,7 +71,7 @@ const Real FAST_AS_POSSIBLE = 999999.0f;
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum LocomotorSetType
+enum LocomotorSetType CPP_11(: Int)
 {
 	LOCOMOTORSET_INVALID = -1,
 
@@ -88,7 +88,7 @@ enum LocomotorSetType
 };
 
 //-------------------------------------------------------------------------------------------------
-enum GuardTargetType
+enum GuardTargetType CPP_11(: Int)
 { 
 	GUARDTARGET_LOCATION,	// Guard a coord3d
 	GUARDTARGET_OBJECT,		// Guard an object
@@ -112,7 +112,7 @@ static const char *TheLocomotorSetNames[] =
 };
 #endif 
 
-enum AutoAcquireStates
+enum AutoAcquireStates CPP_11(: Int)
 {
 	AAS_Idle											= 0x01,
 	AAS_Idle_Stealthed						= 0x02,
@@ -136,7 +136,7 @@ static const char *TheAutoAcquireEnemiesNames[] =
 
 
 //-------------------------------------------------------------------------------------------------
-enum MoodMatrixParameters
+enum MoodMatrixParameters CPP_11(: Int)
 {
 	// Controller_Player and Controller_AI are mutually exclusive
 	MM_Controller_Player		= 0x00000001,
@@ -160,7 +160,7 @@ enum MoodMatrixParameters
 };
 
 //-------------------------------------------------------------------------------------------------
-enum MoodMatrixAction
+enum MoodMatrixAction CPP_11(: Int)
 {
 	MM_Action_Idle,
 	MM_Action_Move,
@@ -169,7 +169,7 @@ enum MoodMatrixAction
 };
 
 //-------------------------------------------------------------------------------------------------
-enum MoodActionAdjustment
+enum MoodActionAdjustment CPP_11(: Int)
 {
 	MAA_Action_Ok										= 0x00000001,
 	MAA_Action_To_Idle							= 0x00000002,
@@ -219,7 +219,7 @@ class AIUpdateModuleData : public UpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-enum AIFreeToExitType // Note - written out in save/load xfer, don't change these numbers.  jba.
+enum AIFreeToExitType CPP_11(: Int) // Note - written out in save/load xfer, don't change these numbers.  jba.
 {
 	FREE_TO_EXIT=0,
 	NOT_FREE_TO_EXIT=1,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h
index 1bc197c774..8ce3590f56 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h
@@ -35,7 +35,7 @@
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
-enum PhysicsTurningType;
+enum PhysicsTurningType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
index 0499d49aab..1c9574241a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
@@ -37,7 +37,7 @@
 #include "GameLogic/Module/AIUpdate.h"
 
 //-------------------------------------------------------------------------------------------------
-enum AssaultStateTypes
+enum AssaultStateTypes CPP_11(: Int)
 {
 	IDLE,							          ///< Not doing anything.
 	ASSAULTING,						      ///< Transport is waiting while troops do fighting.
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
index 3530260b78..19a1091464 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
@@ -53,7 +53,7 @@
 class Object;
 class SpecialPowerTemplate;
 struct FieldParse;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 class BaikonurLaunchPowerModuleData : public SpecialPowerModuleData
 {
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
index 4eb28dbcf2..181b44e7ce 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
@@ -41,8 +41,8 @@ class SpecialPowerModule;
 class ParticleSystem;
 class FXList;
 class AudioEventRTS;
-enum  MaxHealthChangeType;
-enum  CommandOption;
+enum  MaxHealthChangeType CPP_11(: Int);
+enum  CommandOption CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -90,7 +90,7 @@ class BattlePlanUpdateModuleData : public ModuleData
 
 };
 
-enum TransitionStatus
+enum TransitionStatus CPP_11(: Int)
 {
 	TRANSITIONSTATUS_IDLE,
 	TRANSITIONSTATUS_UNPACKING,
@@ -98,7 +98,7 @@ enum TransitionStatus
 	TRANSITIONSTATUS_PACKING,
 };
 
-enum BattlePlanStatus
+enum BattlePlanStatus CPP_11(: Int)
 {
 	PLANSTATUS_NONE,
 	PLANSTATUS_BOMBARDMENT,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
index e16a021bca..03d59283f1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
@@ -207,7 +207,7 @@ inline BehaviorModule::BehaviorModule( Thing *thing, const ModuleData* moduleDat
 inline BehaviorModule::~BehaviorModule() { }
 
 
-enum RunwayReservationType
+enum RunwayReservationType CPP_11(: Int)
 {
 	RESERVATION_TAKEOFF,
 	RESERVATION_LANDING,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
index 81e1cbbf42..8bf0dbca1a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
@@ -50,7 +50,7 @@ class WeaponTemplate;
 	* enumeration being in sequential order
 	*/
 //-------------------------------------------------------------------------------------------------
-enum BodyDamageType
+enum BodyDamageType CPP_11(: Int)
 {
 	BODY_PRISTINE,				///< unit should appear in pristine condition
 	BODY_DAMAGED,					///< unit has been damaged
@@ -72,7 +72,7 @@ static const char* TheBodyDamageTypeNames[] =
 };
 #endif
 
-enum MaxHealthChangeType
+enum MaxHealthChangeType CPP_11(: Int)
 {
 	SAME_CURRENTHEALTH,
 	PRESERVE_RATIO,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
index f6e61b3a4a..5e6cc2aaca 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
@@ -37,7 +37,7 @@
 #include "GameLogic/Module/DamageModule.h" 
 
 //#include "GameLogic/Module/BodyModule.h" -- Yikes... not necessary to include this! (KM)
-enum BodyDamageType; //Ahhhh much better!
+enum BodyDamageType CPP_11(: Int); //Ahhhh much better!
 
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
index bda8f6d510..242cb348fb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
@@ -41,7 +41,7 @@
 #include "GameLogic/Module/UpdateModule.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-enum BridgeTowerType;
+enum BridgeTowerType CPP_11(: Int);
 class FXList;
 class ObjectCreationList;
 class Bridge;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
index ddcfa68984..96bb885130 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
@@ -38,7 +38,7 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum ScaffoldTargetMotion
+enum ScaffoldTargetMotion CPP_11(: Int)
 {
 	STM_STILL,
 	STM_RISE,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
index e23fc701e1..1aa926fdca 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
@@ -39,7 +39,7 @@
 class Object;
 class SpecialPowerTemplate;
 struct FieldParse;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
index cdd11e8e57..fa18529f41 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
@@ -67,7 +67,7 @@ class ChinookAIUpdateModuleData : public SupplyTruckAIUpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-enum ChinookFlightStatus // Stored in save file, don't renumber.  jba. 
+enum ChinookFlightStatus CPP_11(: Int) // Stored in save file, don't renumber.  jba. 
 {
 	CHINOOK_TAKING_OFF				= 0,
 	CHINOOK_FLYING						= 1,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
index 02f2b75bd9..f44272c0e5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
@@ -42,10 +42,10 @@ class Player;
 class ExitInterface;
 class Matrix3D;
 class Weapon;
-enum CommandSourceType;
+enum CommandSourceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
-enum ObjectEnterExitType
+enum ObjectEnterExitType CPP_11(: Int)
 {
 	WANTS_TO_ENTER,
 	WANTS_TO_EXIT,
@@ -53,7 +53,7 @@ enum ObjectEnterExitType
 };
 
 
-enum EvacDisposition
+enum EvacDisposition CPP_11(: Int)
 {
   EVAC_INVALID = 0,
   EVAC_TO_LEFT,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
index 0155c93ebb..e67494da67 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
@@ -39,7 +39,7 @@
 class Thing;
 class Anim2DTemplate;
 class FXList;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class CrateCollideModuleData : public CollideModuleData 
@@ -72,7 +72,7 @@ class CrateCollide : public CollideModule
 
 public:
 
-enum SabotageVictimType
+enum SabotageVictimType CPP_11(: Int)
 {
 	SAB_VICTIM_GENERIC = 0,
 	SAB_VICTIM_COMMAND_CENTER,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
index ae1a1e0a32..791e567601 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
@@ -42,7 +42,7 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
 
-enum CrushEnum
+enum CrushEnum CPP_11(: Int)
 {
 	TOTAL_CRUSH,
 	BACK_END_CRUSH,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
index 6b42a52b29..b8f70f12ae 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
@@ -36,7 +36,7 @@
 #include "GameLogic/Damage.h"
 #include "GameLogic/Module/BehaviorModule.h"
 
-enum BodyDamageType;
+enum BodyDamageType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 /** OBJECT DAMAGE MODULE base class */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
index 0d69e1084c..69eda06917 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
@@ -42,7 +42,7 @@
 class Object;
 class SpecialPowerTemplate;
 struct FieldParse;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
index dfbded3e7f..35e68ebfec 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
@@ -36,7 +36,7 @@
 #include "GameLogic/Module/AIUpdate.h"
 
 //-------------------------------------------------------------------------------------------------
-enum DeployStateTypes
+enum DeployStateTypes CPP_11(: Int)
 {
 	READY_TO_MOVE,							///< Mobile, can't attack.
 	DEPLOY,											///< Not mobile, can't attack, currently unpacking to attack
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
index 87e6f42756..e871d8fc01 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
@@ -68,7 +68,7 @@ class DozerPrimaryStateMachine : public StateMachine
 //-------------------------------------------------------------------------------------------------
 /** Dozer behaviors that use action sub state machines */
 //-------------------------------------------------------------------------------------------------
-enum DozerTask // These enums are saved in the game save file, so DO NOT renumber them. jba.
+enum DozerTask CPP_11(: Int) // These enums are saved in the game save file, so DO NOT renumber them. jba.
 {
 	DOZER_TASK_INVALID = -1,
 	DOZER_TASK_FIRST = 0,
@@ -81,7 +81,7 @@ enum DozerTask // These enums are saved in the game save file, so DO NOT renumbe
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum DozerDockPoint	 // These enums are saved in the game save file, so DO NOT renumber them. jba.
+enum DozerDockPoint CPP_11(: Int)	 // These enums are saved in the game save file, so DO NOT renumber them. jba.
 {
 	DOZER_DOCK_POINT_START	= 0,
 	DOZER_DOCK_POINT_ACTION	= 1,
@@ -91,7 +91,7 @@ enum DozerDockPoint	 // These enums are saved in the game save file, so DO NOT r
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum DozerBuildSubTask  // These enums are saved in the game save file, so DO NOT renumber them. jba.
+enum DozerBuildSubTask CPP_11(: Int)  // These enums are saved in the game save file, so DO NOT renumber them. jba.
 {
 	DOZER_SELECT_BUILD_DOCK_LOCATION		= 0,
 	DOZER_MOVING_TO_BUILD_DOCK_LOCATION	=	1,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h
index e15c567d82..194b82719f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h
@@ -52,7 +52,7 @@
 class Object;
 class SpecialPowerTemplate;
 struct FieldParse;
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 class FireWeaponPowerModuleData : public SpecialPowerModuleData
 {
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
index 9809365687..0074e6266a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
@@ -39,7 +39,7 @@
 
 
 //-------------------------------------------------------------------------------------------------
-enum FlammabilityStatusType
+enum FlammabilityStatusType CPP_11(: Int)
 {
 	// These show the state I last noticed my object was in.
 	FS_NORMAL = 0,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
index 7562269c22..369cf32389 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
@@ -44,7 +44,7 @@ class UpgradeTemplate;
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-enum HordeActionType
+enum HordeActionType CPP_11(: Int)
 {
 	HORDEACTION_HORDE = 0,
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
index cbc70f1c40..8e08e1d1e0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
@@ -39,7 +39,7 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
 class Vector3;
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
index 9baf1771b7..c3aebfc167 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
@@ -37,7 +37,7 @@
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
-enum MaxHealthChangeType;
+enum MaxHealthChangeType CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
index 8b753cfc55..b9bbab54f1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
@@ -38,7 +38,7 @@
 #include "Common/INI.h"
 #include "WWMath/matrix3d.h"
 
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 class FXList;
 
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
index 5a7b6291b2..5b66515b4b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
@@ -43,7 +43,7 @@
 #include "Common/INI.h"
 #include "GameLogic/Module/UpdateModule.h"
 class DamageInfo;
-enum ModelConditionFlagType;
+enum ModelConditionFlagType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class MobMemberSlavedUpdateModuleData : public UpdateModuleData
@@ -79,7 +79,7 @@ class MobMemberSlavedUpdateModuleData : public UpdateModuleData
 };
 
 
-enum MobStates
+enum MobStates CPP_11(: Int)
 {
 	MOB_STATE_NONE,
 	MOB_STATE_IDLE,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h
index c95a6066af..d3e2099ab2 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h
@@ -34,7 +34,7 @@
 
 #include "GameLogic/Module/UpgradeModule.h"
 
-enum ModelConditionFlagType;
+enum ModelConditionFlagType CPP_11(: Int);
 //-----------------------------------------------------------------------------
 class ModelConditionUpgradeModuleData : public UpgradeModuleData
 {
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
index 2aea8e321f..fc977b44c5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
@@ -39,7 +39,7 @@ class FXList;
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum NeutronBlast
+enum NeutronBlast CPP_11(: Int)
 { 
 	NEUTRON_BLAST_1 = 0,
 	NEUTRON_BLAST_2,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
index 3314c688be..d3a05b3f00 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
@@ -39,7 +39,7 @@
 #include "Common/INI.h"
 #include "WWMath/matrix3d.h"
 
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 class FXList;
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
index 67bc738f94..15f76e8c71 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
@@ -39,7 +39,7 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class ObjectCreationList;
 
-enum OCLCreateLocType
+enum OCLCreateLocType CPP_11(: Int)
 {
 	CREATE_AT_EDGE_NEAR_SOURCE,
 	CREATE_AT_EDGE_NEAR_TARGET,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
index 8e774295c9..7e9b81da82 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
@@ -56,7 +56,7 @@ class POWTruckAIUpdateModuleData : public AIUpdateModuleData
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum POWTruckTask	// Stored in save file, do not renumber.  jba.
+enum POWTruckTask CPP_11(: Int)	// Stored in save file, do not renumber.  jba.
 {
 	POW_TRUCK_TASK_WAITING						= 0, ///< Waiting for something to do 
 	POW_TRUCK_TASK_FIND_TARGET				= 1, ///< We need to search out a target to collect
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
index 3a30fb1712..dbebd57eb3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
@@ -42,7 +42,7 @@ class SpecialPowerModule;
 class ParticleSystem;
 class FXList;
 class AudioEventRTS;
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 
 #define MAX_OUTER_NODES 16
 
@@ -113,7 +113,7 @@ class ParticleUplinkCannonUpdateModuleData : public ModuleData
 
 };
 
-enum PUCStatus
+enum PUCStatus CPP_11(: Int)
 {
 	STATUS_IDLE,
 	STATUS_CHARGING,
@@ -126,7 +126,7 @@ enum PUCStatus
 	STATUS_PACKING,
 };
 
-enum LaserStatus
+enum LaserStatus CPP_11(: Int)
 {
 	LASERSTATUS_NONE,
 	LASERSTATUS_BORN,
@@ -134,7 +134,7 @@ enum LaserStatus
 	LASERSTATUS_DEAD,
 };
 
-enum IntensityTypes
+enum IntensityTypes CPP_11(: Int)
 {
 	IT_LIGHT,
 	IT_MEDIUM,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
index f32d771028..766dfba459 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
@@ -37,9 +37,9 @@
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Module/CollideModule.h"
 
-enum ObjectID;
+enum ObjectID CPP_11(: Int);
 
-enum PhysicsTurningType
+enum PhysicsTurningType CPP_11(: Int)
 {
 	TURN_NEGATIVE = -1,
 	TURN_NONE = 0,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
index 34ead41764..8c90ae3ffc 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
@@ -43,12 +43,12 @@ class ThingTemplate;
 class UpgradeTemplate;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-enum ProductionID
+enum ProductionID CPP_11(: Int)
 {
 	PRODUCTIONID_INVALID = 0
 };
 
-enum ProductionType
+enum ProductionType CPP_11(: Int)
 {
 	PRODUCTION_INVALID = 0,
 	PRODUCTION_UNIT,
@@ -141,7 +141,7 @@ class ProductionUpdateModuleData : public UpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-enum CanMakeType;
+enum CanMakeType CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h
index 8f71366514..1337a5ea30 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h
@@ -37,9 +37,9 @@
 
 #define MAX_RIDERS 8 //***NOTE: If you change this, make sure you update the parsing section!
 
-enum WeaponSetType;
-enum ObjectStatusType;
-enum LocomotorSetType;
+enum WeaponSetType CPP_11(: Int);
+enum ObjectStatusType CPP_11(: Int);
+enum LocomotorSetType CPP_11(: Int);
 
 struct RiderInfo
 {
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
index e67ccba7cf..054fe41e7b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
@@ -40,7 +40,7 @@ const Int SLAVED_UPDATE_RATE = LOGICFRAMES_PER_SECOND/4; ///< This is a low prio
 #include "Common/INI.h"
 #include "GameLogic/Module/UpdateModule.h"
 class DamageInfo;
-enum ModelConditionFlagType;
+enum ModelConditionFlagType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class SlavedUpdateModuleData : public UpdateModuleData
@@ -123,7 +123,7 @@ class SlavedUpdateModuleData : public UpdateModuleData
 	}
 };
 
-enum RepairStates
+enum RepairStates CPP_11(: Int)
 {
 	REPAIRSTATE_NONE,
 	REPAIRSTATE_UNPACKING,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
index d39fd21fcc..8a6ab500a4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
@@ -48,7 +48,7 @@ typedef std::vector<const ObjectCreationList*> OCLVec;
 typedef std::vector<const WeaponTemplate*> WeaponTemplateVec;
 
 //-------------------------------------------------------------------------------------------------
-enum SlowDeathPhaseType
+enum SlowDeathPhaseType CPP_11(: Int)
 {
 	SDPHASE_INITIAL = 0,
 	SDPHASE_MIDPOINT,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
index d6666a61cc..835107b6c7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
@@ -44,7 +44,7 @@ const Int SPAWN_UPDATE_RATE = LOGICFRAMES_PER_SECOND/2; ///< This is a low prior
 
 //-------------------------------------------------------------------------------------------------
 class ThingTemplate;
-enum CanAttackResult;
+enum CanAttackResult CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class SpawnBehaviorModuleData : public BehaviorModuleData
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
index ebc3da4072..2ef252b727 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
@@ -42,7 +42,7 @@ class DamageInfo;
 class SpecialPowerTemplate;
 class SpecialPowerModule;
 class FXList;
-enum SpecialPowerType;
+enum SpecialPowerType CPP_11(: Int);
 
 #define SPECIAL_ABILITY_HUGE_DISTANCE 10000000.0f
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h
index 03c07aa915..93bd0375d7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h
@@ -41,15 +41,15 @@ class SpecialPowerModule;
 class ParticleSystem;
 class FXList;
 class AudioEventRTS;
-enum ParticleSystemID;
-enum ScienceType;
+enum ParticleSystemID CPP_11(: Int);
+enum ScienceType CPP_11(: Int);
 
 //#define MAX_OUTER_NODES 16
 
 //#define PUCK
 
 
-enum GunshipCreateLocType
+enum GunshipCreateLocType CPP_11(: Int)
 {
 	CREATE_GUNSHIP_AT_EDGE_NEAR_SOURCE,
   CREATE_GUNSHIP_AT_EDGE_FARTHEST_FROM_SOURCE,
@@ -88,7 +88,7 @@ class SpectreGunshipDeploymentUpdateModuleData : public ModuleData
 
 };
 
-enum GunshipDeployStatus
+enum GunshipDeployStatus CPP_11(: Int)
 {
    GUNSHIPDEPLOY_STATUS_INSERTING,
    GUNSHIPDEPLOY_STATUS_ORBITING,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h
index 4d6ec6c259..18ece53204 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h
@@ -41,7 +41,7 @@ class SpecialPowerModule;
 class ParticleSystem;
 class FXList;
 class AudioEventRTS;
-enum ParticleSystemID;
+enum ParticleSystemID CPP_11(: Int);
 
 //#define MAX_OUTER_NODES 16
 //#define TRACKERS 
@@ -79,7 +79,7 @@ class SpectreGunshipUpdateModuleData : public ModuleData
 
 };
 
-enum GunshipStatus
+enum GunshipStatus CPP_11(: Int)
 {
    GUNSHIP_STATUS_INSERTING,
    GUNSHIP_STATUS_ORBITING,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
index 20194d5a29..351e2b0141 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
@@ -37,8 +37,8 @@
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
-enum StealthLookType;
-enum EvaMessage;
+enum StealthLookType CPP_11(: Int);
+enum EvaMessage CPP_11(: Int);
 class FXList;
 
 enum
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
index a80c9a6b56..03b456501b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
@@ -46,7 +46,7 @@ typedef std::vector<const FXList*> FXVec;
 
 
 //-------------------------------------------------------------------------------------------------
-enum StructureCollapsePhaseType
+enum StructureCollapsePhaseType CPP_11(: Int)
 {
 	SCPHASE_INITIAL = 0,
 	SCPHASE_DELAY,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
index a3a6dd14c2..2b32ceed6d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
@@ -64,7 +64,7 @@ struct AngleFXInfo
 typedef std::vector<AngleFXInfo> AngleFXInfoVector;
 
 //-------------------------------------------------------------------------------------------------
-enum StructureTopplePhaseType
+enum StructureTopplePhaseType CPP_11(: Int)
 {
 	STPHASE_INITIAL = 0,
 	STPHASE_DELAY,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h
index ab6b4e2b5d..a9c62421df 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h
@@ -35,7 +35,7 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
-enum WeaponBonusConditionType;
+enum WeaponBonusConditionType CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
index 21b6e2085a..47d05a00ba 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
@@ -62,10 +62,10 @@ class DamageInfo;
 class ParticleSystemTemplate;
 class CommandButton;
 class Waypoint;
-enum CommandOption;
+enum CommandOption CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
-enum UpdateSleepTime 
+enum UpdateSleepTime CPP_11(: Int) 
 { 
 	UPDATE_SLEEP_INVALID	= 0,
 	UPDATE_SLEEP_NONE			= 1,
@@ -82,7 +82,7 @@ enum UpdateSleepTime
 // in an efficient way while still maintaining order-dependency; you should
 // really never specify anything other than PHASE_NORMAL without very
 // careful deliberation. If you need to, talk it over with folks first. (srj)
-enum SleepyUpdatePhase
+enum SleepyUpdatePhase CPP_11(: Int)
 {
 	// reserve 2 bits for phase. this still leaves us 30 bits for frame counter,
 	// which, at 30fps, will still run for ~414 days without overflowing...
@@ -333,7 +333,7 @@ class DockUpdateInterface
 };
 
 //-------------------------------------------------------------------------------------------------
-enum ExitDoorType
+enum ExitDoorType CPP_11(: Int)
 {
 	DOOR_1 = 0,
 	DOOR_2 = 1,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h
index 607b2a9ba5..bb535c97fb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h
@@ -60,7 +60,7 @@
 //-----------------------------------------------------------------------------
 // FORWARD REFERENCES /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-enum WeaponBonusConditionType;
+enum WeaponBonusConditionType CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
index 896e845ce5..f2b2b7b71d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -109,18 +109,18 @@ class TempWeaponBonusHelper;
 class ObjectWeaponStatusHelper;
 class ObjectDefectionHelper;
 
-enum CommandSourceType;
-enum HackerAttackMode;
-enum NameKeyType;
-enum SpecialPowerType;
-enum WeaponBonusConditionType;
-enum WeaponChoiceCriteria;
-enum WeaponSetConditionType;
-enum WeaponSetType;
-enum ArmorSetType;
-enum WeaponStatus;
-enum RadarPriorityType;
-enum CanAttackResult;
+enum CommandSourceType CPP_11(: Int);
+enum HackerAttackMode CPP_11(: Int);
+enum NameKeyType CPP_11(: Int);
+enum SpecialPowerType CPP_11(: Int);
+enum WeaponBonusConditionType CPP_11(: Int);
+enum WeaponChoiceCriteria CPP_11(: Int);
+enum WeaponSetConditionType CPP_11(: Int);
+enum WeaponSetType CPP_11(: Int);
+enum ArmorSetType CPP_11(: Int);
+enum WeaponStatus CPP_11(: Int);
+enum RadarPriorityType CPP_11(: Int);
+enum CanAttackResult CPP_11(: Int);
 
 // For ObjectStatusTypes
 #include "Common/ObjectStatusTypes.h"
@@ -147,7 +147,7 @@ struct TTriggerInfo
 //----------------------------------------------------
 
 
-enum CrushSquishTestType
+enum CrushSquishTestType CPP_11(: Int)
 {
 	TEST_CRUSH_ONLY, 
 	TEST_SQUISH_ONLY, 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h
index 8faff0920a..7d56d6a420 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h
@@ -39,7 +39,7 @@ class Object;
 
 //-------------------------------------------------------------------------------------------
 /** */
-enum IterOrderType
+enum IterOrderType CPP_11(: Int)
 {
 	ITER_FASTEST,										///< iterate in arbitrary order
 	ITER_SORTED_NEAR_TO_FAR,				///< iterate in nearest-to-farthest order (may be slower)
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
index ae028a0491..a2c83d1670 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
@@ -33,7 +33,7 @@
 //-------------------------------------------------------------------------------------------------
 /** Object status bits */
 //-------------------------------------------------------------------------------------------------
-enum ObjectScriptStatusBit
+enum ObjectScriptStatusBit CPP_11(: Int)
 {
 	OBJECT_STATUS_SCRIPT_DISABLED						= 0x01,		///< this object is disabled via script
 	OBJECT_STATUS_SCRIPT_UNPOWERED					= 0x02,		///< this object is unpowered via script
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
index 69fabd4822..7438ce9475 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -96,10 +96,10 @@ class ThingTemplate;
 class GhostObject;
 class CommandButton;
 
-enum CommandSourceType;
+enum CommandSourceType CPP_11(: Int);
 
 // ----------------------------------------------------------------------------------------------
-enum ValueOrThreat
+enum ValueOrThreat CPP_11(: Int)
 {
 	VOT_CashValue = 1,
 	VOT_ThreatValue,
@@ -107,7 +107,7 @@ enum ValueOrThreat
 };
 
 // ----------------------------------------------------------------------------------------------
-enum FindPositionFlags
+enum FindPositionFlags CPP_11(: Int)
 {
 	FPF_NONE															= 0x00000000,		// no options, default behavior
 	FPF_IGNORE_WATER											= 0x00000001,		// a position found underwater is ok
@@ -150,7 +150,7 @@ struct FindPositionOptions
 //=====================================
 /** */
 //=====================================
-enum DistanceCalculationType
+enum DistanceCalculationType CPP_11(: Int)
 {
 	FROM_CENTER_2D					= 0,	///< measure from Object center in 2d.
 	FROM_CENTER_3D					= 1,	///< measure from Object center in 3d.
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
index 0af9cec891..d71c4df610 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
@@ -37,7 +37,7 @@ class GameWindow;
 class	Team;
 class View;
 
-enum AudioAffect;
+enum AudioAffect CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 // ScriptActionsInterface
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h
index 98150831ab..ea932f5771 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h
@@ -52,7 +52,7 @@ class Matrix3D;
 class WaterHandle;
 class Xfer;
 
-enum WaypointID
+enum WaypointID CPP_11(: Int)
 {
 	INVALID_WAYPOINT_ID = 0x7FFFFFFF
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h
index 5059da270b..dc1e387907 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h
@@ -42,7 +42,7 @@ const Real DEFAULT_PITCH_RATE = 0.01f;
  * Each of these constants will be associated with an instance of a State class
  * in a given StateMachine.
  */
-enum TurretStateType
+enum TurretStateType CPP_11(: Int)
 {
 	TURRETAI_IDLE,
 	TURRETAI_IDLESCAN,
@@ -248,7 +248,7 @@ class TurretAIData : public MemoryPoolObject
 EMPTY_DTOR(TurretAIData)
 
 //-----------------------------------------------------------------------------------------------------
-enum TurretTargetType
+enum TurretTargetType CPP_11(: Int)
 {
 	TARGET_NONE,
 	TARGET_OBJECT,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h
index adf3ae7bdf..1babe438a2 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h
@@ -39,7 +39,7 @@ class Player;
 /*
  * bitfield for specifying which victory conditions will apply in multiplayer games
  */
-enum VictoryType
+enum VictoryType CPP_11(: Int)
 {
 	VICTORY_NOBUILDINGS = 1,
 	VICTORY_NOUNITS = 2,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
index 20b2d829c1..92fbe8a8b8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
@@ -50,13 +50,13 @@ class Weapon;
 class WeaponTemplate;
 class INI;
 class ParticleSystemTemplate;
-enum NameKeyType;
+enum NameKeyType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 const Int NO_MAX_SHOTS_LIMIT = 0x7fffffff;
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponReloadType
+enum WeaponReloadType CPP_11(: Int)
 {
 	AUTO_RELOAD,
 	NO_RELOAD,
@@ -74,7 +74,7 @@ static const char *TheWeaponReloadNames[] =
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponPrefireType
+enum WeaponPrefireType CPP_11(: Int)
 {
 	PREFIRE_PER_SHOT,		///< Use the prefire delay for every shot we make
 	PREFIRE_PER_ATTACK,	///< Use the prefire delay each time we attack a new target
@@ -94,7 +94,7 @@ static const char *TheWeaponPrefireNames[] =
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponAntiMaskType
+enum WeaponAntiMaskType CPP_11(: Int)
 {
 	WEAPON_ANTI_AIRBORNE_VEHICLE	= 0x01,
 	WEAPON_ANTI_GROUND						= 0x02,
@@ -107,7 +107,7 @@ enum WeaponAntiMaskType
 };
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponAffectsMaskType
+enum WeaponAffectsMaskType CPP_11(: Int)
 {
 	WEAPON_AFFECTS_SELF						= 0x01,
 	WEAPON_AFFECTS_ALLIES					= 0x02,
@@ -133,7 +133,7 @@ static const char *TheWeaponAffectsMaskNames[] =
 //#endif
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponCollideMaskType
+enum WeaponCollideMaskType CPP_11(: Int)
 {
 	// all of these apply to *nontargeted* things that might just happen to get in the way...
 	// the target can always be collided with, regardless of flags
@@ -169,7 +169,7 @@ static const char *TheWeaponCollideMaskNames[] =
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-enum WeaponBonusConditionType
+enum WeaponBonusConditionType CPP_11(: Int)
 {
 	// The access and use of this enum has the bit shifting built in, so this is a 0,1,2,3,4,5 enum
 	WEAPONBONUSCONDITION_INVALID = -1,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h
index 802c3198df..bba5c76aaf 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h
@@ -43,8 +43,8 @@ class Object;
 class Weapon;
 class WeaponTemplate;
 
-enum CommandSourceType;
-enum DamageType;
+enum CommandSourceType CPP_11(: Int);
+enum DamageType CPP_11(: Int);
 
 // for WeaponSetType. Part of detangling.
 #include "GameLogic/WeaponSetType.h"
@@ -107,7 +107,7 @@ static const ModelConditionFlagType TheWeaponSetTypeToModelConditionTypeMap[WEAP
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponSetConditionType
+enum WeaponSetConditionType CPP_11(: Int)
 {
 	WSF_INVALID = -1,
 
@@ -170,14 +170,14 @@ typedef std::vector<WeaponTemplateSet> WeaponTemplateSetVector;
 typedef SparseMatchFinder<WeaponTemplateSet, WeaponSetFlags> WeaponTemplateSetFinder;
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponChoiceCriteria
+enum WeaponChoiceCriteria CPP_11(: Int)
 {
 	PREFER_MOST_DAMAGE,		///< choose the weapon that will do the most damage
 	PREFER_LONGEST_RANGE	///< choose the weapon with the longest range (that will do nonzero damage)
 };
 
 //-------------------------------------------------------------------------------------------------
-enum WeaponLockType
+enum WeaponLockType CPP_11(: Int)
 {
 	NOT_LOCKED,							///< Weapon is not locked
 	LOCKED_TEMPORARILY,			///< Weapon is locked until clip is empty, or current "attack" state exits
@@ -185,7 +185,7 @@ enum WeaponLockType
 };
 
 //-------------------------------------------------------------------------------------------------
-enum CanAttackResult
+enum CanAttackResult CPP_11(: Int)
 {
 	//Worst scenario to best scenario -- These must be done this way now!
 	ATTACKRESULT_NOT_POSSIBLE,					//Can't possibly attack target.
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h
index 0cabef6b12..91c60ed3a4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h
@@ -38,7 +38,7 @@
 // IMPORTANT NOTE #2: if you add or modify this list, be sure to update TheWeaponSetNames, 
 // *and* TheWeaponSetTypeToModelConditionTypeMap!
 //
-enum WeaponSetType
+enum WeaponSetType CPP_11(: Int)
 {
 	// The access and use of this enum has the bit shifting built in, so this is a 0,1,2,3,4,5 enum
 	WEAPONSET_VETERAN		= 0,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h
index ab82393d85..255dd29952 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h
@@ -30,7 +30,7 @@
 #ifndef __WEAPONSTATUS_H__
 #define __WEAPONSTATUS_H__
 
-enum WeaponStatus
+enum WeaponStatus CPP_11(: Int)
 {
 	READY_TO_FIRE,
 	OUT_OF_AMMO,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
index 1c083b9328..ba71a0e1d1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
@@ -32,7 +32,7 @@
 #include "Lib/BaseType.h"
 //#include "GameNetwork/ConnectionManager.h"
 
-enum DisconnectStateType {
+enum DisconnectStateType CPP_11(: Int) {
 	DISCONNECTSTATETYPE_SCREENON,
 	DISCONNECTSTATETYPE_SCREENOFF
 //	DISCONNECTSTATETYPE_WAITINGFORPACKETROUTER
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
index 240284d2a0..e36f478b15 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
@@ -69,7 +69,7 @@ struct SpareSocketStruct {
 	UnsignedShort port;
 };
 
-enum FirewallDetectionState {
+enum FirewallDetectionState CPP_11(: Int) {
 	DETECTIONSTATE_IDLE,
 	DETECTIONSTATE_BEGIN,
 	DETECTIONSTATE_TEST1,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h
index 48ee8c6b9b..cfbb977659 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h
@@ -31,7 +31,7 @@
 #include "Lib/BaseType.h"
 #include "GameNetwork/NetCommandList.h"
 
-enum FrameDataReturnType {
+enum FrameDataReturnType CPP_11(: Int) {
 	FRAMEDATA_NOTREADY,
 	FRAMEDATA_RESEND,
 	FRAMEDATA_READY
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h
index 7568a31217..abb37a4da5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h
@@ -36,7 +36,7 @@
 #include "GameNetwork/NetworkDefs.h"
 #include "GameNetwork/FirewallHelper.h"
 
-enum SlotState
+enum SlotState CPP_11(: Int)
 {
 	SLOT_OPEN,
 	SLOT_CLOSED,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
index 3cdd85cc62..678a15fe20 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
@@ -46,7 +46,7 @@ void ToggleGameListType( void );
 void playerTemplateComboBoxTooltip(GameWindow *wndComboBox, WinInstanceData *instData, UnsignedInt mouse);
 void playerTemplateListBoxTooltip(GameWindow *wndListBox, WinInstanceData *instData, UnsignedInt mouse);
 
-enum GameSortType
+enum GameSortType CPP_11(: Int)
 {
 	GAMESORT_ALPHA_ASCENDING = 0,
 	GAMESORT_ALPHA_DESCENDING,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
index 289dfbc418..ac27f1370e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
@@ -44,7 +44,7 @@ class PSPlayerStats;
 typedef std::set<AsciiString> IgnoreList;
 typedef std::map<Int, AsciiString> SavedIgnoreMap;
 
-enum RCItemType
+enum RCItemType CPP_11(: Int)
 {
 	ITEM_BUDDY,
 	ITEM_REQUEST,
@@ -127,7 +127,7 @@ struct AsciiComparator
 
 typedef std::map<AsciiString, PlayerInfo, AsciiComparator> PlayerInfoMap;
 
-enum GameSpyColors {
+enum GameSpyColors CPP_11(: Int) {
 	GSCOLOR_DEFAULT = 0,
 	GSCOLOR_CURRENTROOM,
 	GSCOLOR_ROOM,
@@ -160,7 +160,7 @@ enum GameSpyColors {
 
 extern Color GameSpyColor[GSCOLOR_MAX];
 
-enum GameSpyBuddyStatus {
+enum GameSpyBuddyStatus CPP_11(: Int) {
 	BUDDY_OFFLINE,
 	BUDDY_ONLINE,
 	BUDDY_LOBBY,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
index ee45b41f44..207d02e8d4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
@@ -34,7 +34,7 @@
 #include "gamespy/peer/peer.h"
 #include "GameNetwork/NetworkDefs.h"
 
-enum SerialAuthResult
+enum SerialAuthResult CPP_11(: Int)
 {
 	SERIAL_NONEXISTENT,
 	SERIAL_AUTHFAILED,
@@ -176,7 +176,7 @@ class PeerRequest
 
 //-------------------------------------------------------------------------
 
-enum DisconnectReason
+enum DisconnectReason CPP_11(: Int)
 {
 	DISCONNECT_NICKTAKEN = 1,
 	DISCONNECT_BADNICK,
@@ -200,7 +200,7 @@ enum DisconnectReason
 	DISCONNECT_MAX,
 };
 
-enum QMStatus
+enum QMStatus CPP_11(: Int)
 {
 	QM_IDLE,
 	QM_JOININGQMCHANNEL,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
index a480f8a975..e63547b00b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
@@ -31,7 +31,7 @@
 #ifndef __PERSISTENTSTORAGEDEFS_H__
 #define __PERSISTENTSTORAGEDEFS_H__
 
-enum LocaleType
+enum LocaleType CPP_11(: Int)
 {
     LOC_UNKNOWN = 0,
     LOC_MIN = 1,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
index d41f96a57a..53526dbf73 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
@@ -44,7 +44,7 @@ void GSMessageBoxOkCancel(UnicodeString title, UnicodeString message, GameWinMsg
 void GSMessageBoxYesNo(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc yesFunc, GameWinMsgBoxFunc noFunc);	///< Display a Message box with Yes/No buttons and track it
 void RaiseGSMessageBox( void );		///< Bring GS message box to the foreground (if we transition screens while a message box is up)
 
-enum GSOverlayType
+enum GSOverlayType CPP_11(: Int)
 {
 	GSOVERLAY_PLAYERINFO,
 	GSOVERLAY_MAPSELECT,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
index 8372929104..8f1c02648b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
@@ -78,7 +78,7 @@ void updateGameOptions( void );
 
 //Enum is used for the utility function so other windows do not need
 //to know about controls on LanGameOptions window.
-enum PostToLanGameType{ SEND_GAME_OPTS = 0,
+enum PostToLanGameType CPP_11(: Int){ SEND_GAME_OPTS = 0,
 												MAP_BACK,
 												POST_TO_LAN_GAME_TYPE_COUNT };
 //the utility function mentioned above
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h
index 5a010c5bbd..7039ace4a7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h
@@ -39,7 +39,7 @@
 class Transport;
 class GameSlot;
 
-enum NATStateType {
+enum NATStateType CPP_11(: Int) {
 	NATSTATE_IDLE,
 	NATSTATE_DOCONNECTIONPATHS,
 	NATSTATE_WAITFORSTATS,
@@ -47,7 +47,7 @@ enum NATStateType {
 	NATSTATE_FAILED
 };
 
-enum NATConnectionState {
+enum NATConnectionState CPP_11(: Int) {
 	NATCONNECTIONSTATE_NOSTATE,
 	NATCONNECTIONSTATE_WAITINGTOBEGIN,
 //	NATCONNECTIONSTATE_NETGEARDELAY,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
index 79fb7fce96..01244de2bb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
@@ -45,7 +45,7 @@ extern Int FRAME_DATA_LENGTH;
 extern Int FRAMES_TO_KEEP;
 
 // This is the connection numbering: 1-8 are for players, 9 is a broadcast con.
-enum ConnectionNumbers
+enum ConnectionNumbers CPP_11(: Int)
 {
 	MAX_PLAYER = 7,			// The index of the highest possible player number.  This is 0 based, so the most players allowed in a game is MAX_PLAYER+1.
 	NUM_CONNECTIONS
@@ -112,7 +112,7 @@ struct DelayedTransportMessage
 /**
  * Message types
  */
-enum NetMessageFlag {
+enum NetMessageFlag CPP_11(: Int) {
 	MSG_ACK = 1,
 	MSG_NEEDACK = 2,
 	MSG_SEQUENCED = 4,
@@ -120,7 +120,7 @@ enum NetMessageFlag {
 };
 typedef UnsignedByte NetMessageFlags;
 
-enum NetCommandType {
+enum NetCommandType CPP_11(: Int) {
 	NETCOMMANDTYPE_UNKNOWN = -1,
 	NETCOMMANDTYPE_ACKBOTH = 0,
 	NETCOMMANDTYPE_ACKSTAGE1,
@@ -159,7 +159,7 @@ enum NetCommandType {
 	NETCOMMANDTYPE_MAX
 };
 
-enum NetLocalStatus {
+enum NetLocalStatus CPP_11(: Int) {
 	NETLOCALSTATUS_PREGAME = 0,
 	NETLOCALSTATUS_INGAME,
 	NETLOCALSTATUS_LEAVING,
@@ -167,7 +167,7 @@ enum NetLocalStatus {
 	NETLOCALSTATUS_POSTGAME
 };
 
-enum PlayerLeaveCode {
+enum PlayerLeaveCode CPP_11(: Int) {
 	PLAYERLEAVECODE_CLIENT = 0,
 	PLAYERLEAVECODE_LOCAL,
 	PLAYERLEAVECODE_PACKETROUTER,
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
index e159976017..5e5bff6e5c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
@@ -51,7 +51,7 @@
 #include <Common/GameMemory.h>
 #include "EABrowserDispatch/BrowserDispatch.h"
 #include "FEBDispatch.h"
-#include <Utility/CppMacros.h>
+#include <Lib/BaseType.h>
 
 class GameWindow;
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h
index 4be29673c1..ae1628a0ae 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h
@@ -74,7 +74,7 @@ class UDP
  public:
   // These defines specify a system independent way to
   //   get error codes for socket services.
-  enum sockStat
+  enum sockStat CPP_11(: Int)
   {
     OK           =  0,     // Everything's cool
     UNKNOWN      = -1,     // There was an error of unknown type
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
index 3ecfb04a78..208a87dbaf 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -219,7 +219,7 @@ extern void DoResolutionDialog();
 static Bool ignoreSelected = FALSE;
 WindowLayout *OptionsLayout = NULL;
 
-enum Detail
+enum Detail CPP_11(: Int)
 {
 	HIGHDETAIL = 0,
 	MEDIUMDETAIL,
@@ -1453,7 +1453,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	Color color =  GameMakeColor(255,255,255,255);
 
-  enum AliasingMode
+  enum AliasingMode CPP_11(: Int)
   {
     OFF = 0,
     LOW,
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
index 3057171ab7..6fbc351447 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
@@ -149,7 +149,7 @@ static void handleLadderSelection( Int ladderID )
 }
 
 
-enum PasswordMode
+enum PasswordMode CPP_11(: Int)
 {
 	PASS_NONE,
 	PASS_ENTRY,
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
index 8b17f6bdf9..844ed36ed8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
@@ -52,7 +52,7 @@
 
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-enum ObjectID;
+enum ObjectID CPP_11(: Int);
 
 // ------------------------------------------------------------------------------------------------
 /** This class is used to track objects as they exit our area of influence */
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
index 19e2848423..be6b1ad224 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -694,7 +694,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 EMPTY_DTOR(ApplyRandomForceNugget)
 
 //-------------------------------------------------------------------------------------------------
-enum DebrisDisposition
+enum DebrisDisposition CPP_11(: Int)
 {
 	LIKE_EXISTING						= 0x00000001,
 	ON_GROUND_ALIGNED				= 0x00000002,
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
index fdcd48ee72..87e4cf2ae8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -58,7 +58,7 @@ const Real BIGNUM = 99999.0f;
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum ChinookAIStateType
+enum ChinookAIStateType CPP_11(: Int)
 {
 	// note that these must be distinct (numerically) from AIStateType. ick.
 	ChinookAIStateType_FIRST = 1000,
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
index 5524fee16a..73a26555e5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -74,7 +74,7 @@ static const Real MIN_ACTION_TOLERANCE = 70.0f;
 //-------------------------------------------------------------------------------------------------
 /** Available Dozer actions */
 //-------------------------------------------------------------------------------------------------
-enum DozerActionType
+enum DozerActionType CPP_11(: Int)
 {
 	DOZER_ACTION_PICK_ACTION_POS,		///< pick a location "around" the target to do our action
 	DOZER_ACTION_MOVE_TO_ACTION_POS,///< move to our action pos we've picked
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index cf9886de26..cddafdbb49 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -56,7 +56,7 @@ const Real BIGNUM = 99999.0f;
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum TaxiType
+enum TaxiType CPP_11(: Int)
 {
 	FROM_HANGAR,
 	FROM_PARKING,
@@ -64,7 +64,7 @@ enum TaxiType
 };
 
 //-------------------------------------------------------------------------------------------------
-enum JetAIStateType
+enum JetAIStateType CPP_11(: Int)
 {
 	// note that these must be distinct (numerically) from AIStateType. ick.
 	JETAISTATETYPE_FIRST = 1000,
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h b/GeneralsMD/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
index 0e982e5977..d2c477f4df 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
@@ -28,7 +28,7 @@ class AudioEventRTS;
 
 enum { MAXPROVIDERS = 64 };
 
-enum PlayingAudioType
+enum PlayingAudioType CPP_11(: Int)
 {
 	PAT_Sample,
 	PAT_3DSample,
@@ -36,14 +36,14 @@ enum PlayingAudioType
 	PAT_INVALID
 };
 
-enum PlayingStatus
+enum PlayingStatus CPP_11(: Int)
 {
 	PS_Playing,
 	PS_Stopped,
 	PS_Paused
 };
 
-enum PlayingWhich
+enum PlayingWhich CPP_11(: Int)
 {
 	PW_Attack,
 	PW_Sound,
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
index 9c775904c7..2eeace4eaa 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
@@ -62,7 +62,7 @@ class RenderObjClass;
 class Shadow;
 class TerrainTracksRenderObjClass;
 class HAnimClass;
-enum GameLODLevel;
+enum GameLODLevel CPP_11(: Int);
 //-------------------------------------------------------------------------------------------------
 /** The default client update module */
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
index 6091822a7c..12c5d5a48a 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
@@ -35,7 +35,7 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
-enum ScienceType;
+enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
 class W3DScienceModelDrawModuleData : public W3DModelDrawModuleData
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
index f9cbb08ad8..f89d348d26 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
@@ -27,7 +27,7 @@
 #ifndef __W3DCUSTOMSCENE_H_
 #define __W3DCUSTOMSCENE_H_
 
-enum CustomScenePassModes
+enum CustomScenePassModes CPP_11(: Int)
 {
 	SCENE_PASS_DEFAULT,
 	SCENE_PASS_ALPHA_MASK
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
index b85623a274..c8cb2665fd 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
@@ -103,7 +103,7 @@ struct TRoadSegInfo
 
 // The individual data for a road segment.
 enum {MAX_SEG_VERTEX=500, MAX_SEG_INDEX=2000};
-enum TCorner 
+enum TCorner CPP_11(: Int) 
 {
 	SEGMENT, 
 	CURVE, 
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
index a685fe903c..9ac9f104af 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
@@ -49,7 +49,7 @@
 class W3DDynamicLight;
 class LightClass;
 class Drawable;
-enum CustomScenePassModes;
+enum CustomScenePassModes CPP_11(: Int);
 class MaterialPassClass;
 class W3DShroudMaterialPassClass;
 class W3DMaskMaterialPassClass;
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
index 0aad5043a7..422fded999 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
@@ -37,12 +37,12 @@
 #define __W3DSHADERMANAGER_H_
 
 #include "WW3D2/texture.h"
-enum FilterTypes;
-enum CustomScenePassModes;
-enum StaticGameLODLevel;
-enum ChipsetType;
-enum CpuType;
-enum GraphicsVenderID;
+enum FilterTypes CPP_11(: Int);
+enum CustomScenePassModes CPP_11(: Int);
+enum StaticGameLODLevel CPP_11(: Int);
+enum ChipsetType CPP_11(: Int);
+enum CpuType CPP_11(: Int);
+enum GraphicsVenderID CPP_11(: Int);
 
 class TextureClass;	///forward reference
 /** System for managing complex rendering settings which are either not handled by
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
index 571a1ec04f..64cd2696be 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
@@ -78,7 +78,7 @@ class W3DProjectedShadow;
 //           Type Defines
 //-----------------------------------------------------------------------------
 
-enum W3DToppleState
+enum W3DToppleState CPP_11(: Int)
 {
 	TOPPLE_UPRIGHT = 0,
 	TOPPLE_FALLING,
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
index 4259f8e9ab..2f82e9fcc3 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
@@ -28,7 +28,7 @@
 #ifndef __W3DWaterTracks_H_
 #define __W3DWaterTracks_H_
 
-enum waveType;	//forward reference
+enum waveType CPP_11(: Int);	//forward reference
 
 /// Custom render object that draws animated tracks/waves on the water.
 /**
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
index cbf09f7a72..2349bcb720 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
@@ -212,14 +212,14 @@ extern Real TheSkateDistOverride;
 #endif
 
 // flags that aren't read directly from INI, but set in response to various other situations
-enum INIReadFlagsType
+enum INIReadFlagsType CPP_11(: Int)
 {
 	ANIMS_COPIED_FROM_DEFAULT_STATE = 0,
 	GOT_NONIDLE_ANIMS,
 	GOT_IDLE_ANIMS,
 };
 
-enum ACBits
+enum ACBits CPP_11(: Int)
 {
 	RANDOMIZE_START_FRAME = 0,
 	START_FRAME_FIRST,
@@ -1177,7 +1177,7 @@ const Vector3* W3DModelDrawModuleData::getAttachToDrawableBoneOffset(const Drawa
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum ParseCondStateType
+enum ParseCondStateType CPP_11(: Int)
 {
 	PARSE_NORMAL,
 	PARSE_DEFAULT,
@@ -1225,7 +1225,7 @@ void W3DModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 }
 
 //-------------------------------------------------------------------------------------------------
-enum AnimParseType
+enum AnimParseType CPP_11(: Int)
 {
 	ANIM_NORMAL,
 	ANIM_IDLE
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
index c723dd436e..c2b453212f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
@@ -549,7 +549,7 @@ TextureClass *ground=NULL;
 #define TILE_HEIGHT	10.1f
 #define TILE_DIFFUSE 0x00b4b0a5
 
-enum BlendDirection
+enum BlendDirection CPP_11(: Int)
 {	B_A,	//visible on all sides
 	B_R,	//visible on right
 	B_L,	//visible on left
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
index 14f8203d94..862d7ae22b 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
@@ -2905,7 +2905,7 @@ IDirect3DTexture8 *W3DShaderManager::getRenderTexture(void)
 	return m_renderTexture;
 }
 
-enum GraphicsVenderID
+enum GraphicsVenderID CPP_11(: Int)
 {
 	DC_NVIDIA_VENDOR_ID	= 0x10DE,
 	DC_3DFX_VENDOR_ID	= 0x121A,
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
index df259088ad..55eedb48b2 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
@@ -80,7 +80,7 @@ WaterTracksRenderSystem *TheWaterTracksRenderSystem=NULL;	///< singleton for tra
 
 static Bool pauseWaves=FALSE;
 
-enum waveType
+enum waveType CPP_11(: Int)
 {
 	WaveTypeFirst,
 	WaveTypePond=WaveTypeFirst,