diff --git a/ApplewinExpress9.00.vcproj b/ApplewinExpress9.00.vcproj
index af512f61..a33e5f14 100644
--- a/ApplewinExpress9.00.vcproj
+++ b/ApplewinExpress9.00.vcproj
@@ -803,7 +803,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\source\DiskConsts.h"
+					RelativePath=".\source\DiskDefs.h"
 					>
 				</File>
 				<File
diff --git a/source/Applewin.h b/source/Applewin.h
index 6fa6f896..85ceae66 100644
--- a/source/Applewin.h
+++ b/source/Applewin.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Structs.h"
+#include "Common.h"
 
 void SetCurrentCLK6502();
 void SetCurrentImageDir(const char* pszImageDir);
diff --git a/source/Common.h b/source/Common.h
index 05d339db..9979b5e7 100644
--- a/source/Common.h
+++ b/source/Common.h
@@ -66,9 +66,6 @@ enum AppMode_e
 #define TITLE_PAUSED       TEXT("* PAUSED *")
 #define TITLE_STEPPING     TEXT("Stepping")
 
-#define  REGLOAD(a,b) RegLoadValue(TEXT(REG_CONFIG),a,1,b)
-#define  REGSAVE(a,b) RegSaveValue(TEXT(REG_CONFIG),a,1,b)
-
 // Configuration
 #define REG_CONFIG						"Configuration"
 #define  REGVALUE_APPLE2_TYPE        "Apple2 Type"
diff --git a/source/Configuration/Config.h b/source/Configuration/Config.h
index 626ba0a7..2915d6cb 100644
--- a/source/Configuration/Config.h
+++ b/source/Configuration/Config.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include "..\AppleWin.h"
-#include "..\HardDisk.h"
+#include "..\Disk.h"		// BOOL enhancedisk
+#include "..\HardDisk.h"	// HD_CardIsEnabled()
 
 class CConfigNeedingRestart
 {
diff --git a/source/Configuration/PageAdvanced.cpp b/source/Configuration/PageAdvanced.cpp
index 27036958..de469041 100644
--- a/source/Configuration/PageAdvanced.cpp
+++ b/source/Configuration/PageAdvanced.cpp
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "..\Structs.h"
+#include "..\Common.h"
 
-#include "..\Disk.h"
 #include "..\ParallelPrinter.h"
 #include "..\Registry.h"
 #include "..\SaveState.h"
diff --git a/source/Configuration/PageConfig.cpp b/source/Configuration/PageConfig.cpp
index 0421b3c1..78ba4116 100644
--- a/source/Configuration/PageConfig.cpp
+++ b/source/Configuration/PageConfig.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "..\AppleWin.h"
-#include "..\Disk.h"
 #include "..\Frame.h"
 #include "..\Registry.h"
 #include "..\SerialComms.h"
diff --git a/source/Configuration/PageDisk.cpp b/source/Configuration/PageDisk.cpp
index 60a551de..0545de84 100644
--- a/source/Configuration/PageDisk.cpp
+++ b/source/Configuration/PageDisk.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "..\AppleWin.h"
-#include "..\Disk.h"
 #include "..\Frame.h"
 #include "..\Registry.h"
 #include "..\resource\resource.h"
diff --git a/source/Configuration/PageInput.cpp b/source/Configuration/PageInput.cpp
index e9cd7f01..9326afee 100644
--- a/source/Configuration/PageInput.cpp
+++ b/source/Configuration/PageInput.cpp
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "..\Structs.h"
+#include "..\Common.h"
 
-#include "..\Disk.h"
 #include "..\Keyboard.h"
 #include "..\Registry.h"
 #include "..\resource\resource.h"
diff --git a/source/Configuration/PageSound.cpp b/source/Configuration/PageSound.cpp
index f8f1117e..92e73002 100644
--- a/source/Configuration/PageSound.cpp
+++ b/source/Configuration/PageSound.cpp
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "..\Structs.h"
+#include "..\Common.h"
 
-#include "..\Disk.h"
 #include "..\Mockingboard.h"
 #include "..\Registry.h"
 #include "..\Speaker.h"
diff --git a/source/Configuration/PropertySheet.cpp b/source/Configuration/PropertySheet.cpp
index 3c00c3f5..293f22c9 100644
--- a/source/Configuration/PropertySheet.cpp
+++ b/source/Configuration/PropertySheet.cpp
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "..\AppleWin.h"
-#include "..\Disk.h"
 #include "..\Frame.h"
 #include "..\resource\resource.h"
 #include "PropertySheet.h"
diff --git a/source/Debugger/Debug.h b/source/Debugger/Debug.h
index 81ece75c..24aec96e 100644
--- a/source/Debugger/Debug.h
+++ b/source/Debugger/Debug.h
@@ -6,6 +6,7 @@
 using namespace std;
 
 #include "..\Structs.h"
+#include "..\Common.h"
 
 #include "Debugger_Types.h"
 #include "Debugger_DisassemblerData.h"
diff --git a/source/DiskConsts.h b/source/DiskDefs.h
similarity index 100%
rename from source/DiskConsts.h
rename to source/DiskDefs.h
diff --git a/source/DiskImage.cpp b/source/DiskImage.cpp
index f38ae244..86992b97 100644
--- a/source/DiskImage.cpp
+++ b/source/DiskImage.cpp
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "Structs.h"
+#include "Common.h"
+
 #include "DiskImage.h"
 #include "DiskImageHelper.h"
 
diff --git a/source/DiskImage.h b/source/DiskImage.h
index 8ae72fc3..b712399f 100644
--- a/source/DiskImage.h
+++ b/source/DiskImage.h
@@ -23,7 +23,7 @@ along with AppleWin; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "DiskConsts.h"
+#include "DiskDefs.h"
 
 	#define TRACK_DENIBBLIZED_SIZE (16 * 256)	// #Sectors x Sector-size
 
diff --git a/source/DiskImageHelper.cpp b/source/DiskImageHelper.cpp
index d1f6d8c7..4eeef4a8 100644
--- a/source/DiskImageHelper.cpp
+++ b/source/DiskImageHelper.cpp
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "stdafx.h"
 #include "Structs.h"
+#include "Common.h"
 
 #include "zlib.h"
 #include "unzip.h"
diff --git a/source/MouseInterface.cpp b/source/MouseInterface.cpp
index b4bc5664..2d0bf6a6 100644
--- a/source/MouseInterface.cpp
+++ b/source/MouseInterface.cpp
@@ -42,6 +42,7 @@ Etc.
 
 #include "stdafx.h"
 #include "Structs.h"
+#include "Common.h"
 
 #include "CPU.h"
 #include "Frame.h"	// FrameSetCursorPosByMousePos()
diff --git a/source/Registry.h b/source/Registry.h
index a1ab9120..a9f2b990 100644
--- a/source/Registry.h
+++ b/source/Registry.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#define  REGLOAD(a,b) RegLoadValue(TEXT(REG_CONFIG),a,1,b)
+#define  REGSAVE(a,b) RegSaveValue(TEXT(REG_CONFIG),a,1,b)
+
 BOOL    RegLoadString (LPCTSTR,LPCTSTR,BOOL,LPTSTR,DWORD);
 BOOL    RegLoadValue (LPCTSTR,LPCTSTR,BOOL,DWORD *);
 void    RegSaveString (LPCTSTR,LPCTSTR,BOOL,LPCTSTR);
diff --git a/source/Structs.h b/source/Structs.h
index e8d5f66e..f2af25ac 100644
--- a/source/Structs.h
+++ b/source/Structs.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "Common.h"
-#include "DiskConsts.h"
+#include "DiskDefs.h"
 
 // Structs used by save-state file