diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h b/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h
index b97ec772535..f4fe3f56e3b 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "ref_ptr.h"
 #include "refcount.h"
 #include "STLUtils.h"
 #include "stringex.h"
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AI.h b/Generals/Code/GameEngine/Include/GameLogic/AI.h
index 1e56311fbe4..49d989fcfa8 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AI.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AI.h
@@ -34,7 +34,6 @@
 #include "Common/GameType.h"
 #include "GameLogic/Damage.h"
 #include "Common/STLTypedefs.h"
-#include "WWLib/ref_ptr.h"
 
 class AIGroup;
 class AttackPriorityInfo;
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h
index 72e23377b5b..96bb822d239 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Object.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Object.h
@@ -29,7 +29,6 @@
 #pragma once
 
 #include "Lib/BaseType.h"
-#include "WWLib/ref_ptr.h"
 
 #include "Common/Geometry.h"
 #include "Common/Snapshot.h"
diff --git a/Generals/Code/GameEngine/Source/Common/StateMachine.cpp b/Generals/Code/GameEngine/Source/Common/StateMachine.cpp
index b1c5b20e015..592d4de128b 100644
--- a/Generals/Code/GameEngine/Source/Common/StateMachine.cpp
+++ b/Generals/Code/GameEngine/Source/Common/StateMachine.cpp
@@ -37,8 +37,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 
-#include "WWLib/ref_ptr.h"
-
 
 //------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp
index 10790580990..ad0fb2c80bf 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp	
@@ -335,7 +335,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 
 						//safeties
 						tabData->tabCount = max( tabData->tabCount, 1 );
-						tabData->tabCount = min( tabData->tabCount, NUM_TAB_PANES );
+						tabData->tabCount = min( tabData->tabCount, (Int)NUM_TAB_PANES );
 
 						GadgetTabControlComputeTabRegion( tabControl );
 						GadgetTabControlResizeSubPanes( tabControl );
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
index 72260326e04..4023fa13a7b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
@@ -34,7 +34,6 @@
 #include "Common/GameType.h"
 #include "GameLogic/Damage.h"
 #include "Common/STLTypedefs.h"
-#include "WWLib/ref_ptr.h"
 
 class AIGroup;
 class AttackPriorityInfo;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
index bdd19690f52..90fc52b3960 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -29,7 +29,6 @@
 #pragma once
 
 #include "Lib/BaseType.h"
-#include "WWLib/ref_ptr.h"
 
 #include "Common/Geometry.h"
 #include "Common/Snapshot.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp
index 935fba19c5b..655fb036d87 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp
@@ -37,8 +37,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 
-#include "WWLib/ref_ptr.h"
-
 
 //------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp
index 97fe8fd9887..32fe97df88e 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp	
@@ -335,7 +335,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 
 						//safeties
 						tabData->tabCount = max( tabData->tabCount, 1 );
-						tabData->tabCount = min( tabData->tabCount, NUM_TAB_PANES );
+						tabData->tabCount = min( tabData->tabCount, (Int)NUM_TAB_PANES );
 
 						GadgetTabControlComputeTabRegion( tabControl );
 						GadgetTabControlResizeSubPanes( tabControl );