diff --git a/BasiliskII/src/Unix/sigsegv.cpp b/BasiliskII/src/Unix/sigsegv.cpp
index 91712332..951b4c66 100644
--- a/BasiliskII/src/Unix/sigsegv.cpp
+++ b/BasiliskII/src/Unix/sigsegv.cpp
@@ -55,7 +55,7 @@ using std::list;
 // particular, on ILP32 systems with a 64-bit kernel (HP-UX/ia64?)
 #if defined(HAVE_WIN32_VM)
 // Windows is either ILP32 or LLP64
-#include <BaseTsd.h>
+#include <basetsd.h>
 typedef UINT_PTR sigsegv_uintptr_t;
 #else
 // Other systems are sane enough to follow ILP32 or LP64 models
diff --git a/BasiliskII/src/Windows/main_windows.cpp b/BasiliskII/src/Windows/main_windows.cpp
index 99074173..38eb80e3 100755
--- a/BasiliskII/src/Windows/main_windows.cpp
+++ b/BasiliskII/src/Windows/main_windows.cpp
@@ -353,12 +353,13 @@ int main(int argc, char **argv)
 	vm_init();
 
 	// Create areas for Mac RAM and ROM
-	RAMBaseHost = (uint8 *)vm_acquire_mac(RAMSize);
-	ROMBaseHost = (uint8 *)vm_acquire_mac(0x100000);
-	if (RAMBaseHost == VM_MAP_FAILED || ROMBaseHost == VM_MAP_FAILED) {
+	uint8 *ram_rom_area = (uint8 *)vm_acquire_mac(RAMSize + 0x100000);
+	if (ram_rom_area == VM_MAP_FAILED) {
 		ErrorAlert(STR_NO_MEM_ERR);
 		QuitEmulator();
 	}
+	RAMBaseHost = ram_rom_area;
+	ROMBaseHost = RAMBaseHost + RAMSize;
 
 #if USE_SCRATCHMEM_SUBTERFUGE
 	// Allocate scratch memory