diff --git a/ApplewinExpress9.00.vcproj b/ApplewinExpress9.00.vcproj
index a33e5f14..55966eea 100644
--- a/ApplewinExpress9.00.vcproj
+++ b/ApplewinExpress9.00.vcproj
@@ -266,6 +266,10 @@
 					RelativePath=".\source\Debugger\Debug.h"
 					>
 				</File>
+				<File
+					RelativePath=".\source\Debugger\DebugDefs.h"
+					>
+				</File>
 				<File
 					RelativePath=".\source\Debugger\Debugger_Assembler.cpp"
 					>
diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp
index 2af6a2ca..604b70fc 100644
--- a/source/Debugger/Debug.cpp
+++ b/source/Debugger/Debug.cpp
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "Debug.h"
+#include "DebugDefs.h"
 
 #include "..\AppleWin.h"
 #include "..\CPU.h"
@@ -211,15 +212,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 // Memory _____________________________________________________________________
 
-	const          int _6502_BRANCH_POS      = +127;
-	const          int _6502_BRANCH_NEG      = -128;
-	const unsigned int _6502_ZEROPAGE_END    = 0x00FF;
-	const unsigned int _6502_STACK_END       = 0x01FF;
-	const unsigned int _6502_IO_BEGIN        = 0xC000;
-	const unsigned int _6502_IO_END          = 0xC0FF;
-	const unsigned int _6502_MEM_BEGIN = 0x0000;
-	const unsigned int _6502_MEM_END   = 0xFFFF;
-
 	MemoryDump_t g_aMemDump[ NUM_MEM_DUMPS ];
 
 	// Made global so operator @# can be used with other commands.
diff --git a/source/Debugger/DebugDefs.h b/source/Debugger/DebugDefs.h
new file mode 100644
index 00000000..48edd7f9
--- /dev/null
+++ b/source/Debugger/DebugDefs.h
@@ -0,0 +1,10 @@
+#pragma once
+
+	const          int _6502_BRANCH_POS      = +127;
+	const          int _6502_BRANCH_NEG      = -128;
+	const unsigned int _6502_ZEROPAGE_END    = 0x00FF;
+	const unsigned int _6502_STACK_END       = 0x01FF;
+	const unsigned int _6502_IO_BEGIN        = 0xC000;
+	const unsigned int _6502_IO_END          = 0xC0FF;
+	const unsigned int _6502_MEM_BEGIN = 0x0000;
+	const unsigned int _6502_MEM_END   = 0xFFFF;
diff --git a/source/Memory.cpp b/source/Memory.cpp
index d33b2f49..e3ec453b 100644
--- a/source/Memory.cpp
+++ b/source/Memory.cpp
@@ -50,10 +50,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Z80VICE\z80.h"
 #include "..\resource\resource.h"
 #include "Configuration\PropertySheet.h"
-
-#include <map>
-using namespace std;
-#include "Debugger\Debugger_Types.h"	// Needs <map> and namespace std
+#include "Debugger\DebugDefs.h"
 
 // Memory Flag
 #define  MF_80STORE    0x00000001