diff --git a/src/core/sal/ConcreteCPU.hpp b/src/core/sal/ConcreteCPU.hpp
index 629f6dcc..759c5b5d 100644
--- a/src/core/sal/ConcreteCPU.hpp
+++ b/src/core/sal/ConcreteCPU.hpp
@@ -10,7 +10,11 @@
 		#error Active config currently not supported!
 	#endif
 #elif defined BUILD_QEMU
-	#include "qemu/QEMUConfig.hpp"
+	#if defined BUILD_X86
+		#include "qemu/QEMUx86CPU.hpp"
+	#else
+		#error Active config currently not supported!
+	#endif
 #elif defined BUILD_T32
 	#include "t32/T32Config.hpp"
 	#if defined BUILD_ARM
diff --git a/src/core/sal/qemu/QEMUController.hpp b/src/core/sal/qemu/QEMUController.hpp
index 2b4a2162..f0a2ba63 100644
--- a/src/core/sal/qemu/QEMUController.hpp
+++ b/src/core/sal/qemu/QEMUController.hpp
@@ -22,7 +22,7 @@ class TimerListener;
  */
 class QEMUController : public SimulatorController {
 public:
-	CPUX86State *m_cpuenv;
+	CPUX86State *m_cpu0env;
 
 	// Initialize the controller.
 	QEMUController();
@@ -60,7 +60,7 @@ public:
 	 */
 	void reboot() {}
 	/* internal, QEMU-specific stuff */
-	void setCPUEnv(struct CPUX86State *env) { m_cpuenv = env; }
+	void setCPUEnv(struct CPUX86State *env) { m_cpu0env = env; }
 };
 
 } // end-of-namespace: fail
diff --git a/src/core/sal/qemu/QEMUListener.ah b/src/core/sal/qemu/QEMUListener.ah
index 1ee027af..2eb3fb9d 100644
--- a/src/core/sal/qemu/QEMUListener.ah
+++ b/src/core/sal/qemu/QEMUListener.ah
@@ -41,7 +41,7 @@ aspect QEMUListener
 		bool onAddition()
 		{
 			//std::cout << "QEMUMemWriteListener::onAddition" << std::endl;
-			if (failqemu_add_watchpoint(simulator.m_cpuenv, m_WatchAddr, m_WatchWidth, 1) != 0) {
+			if (failqemu_add_watchpoint(simulator.m_cpu0env, m_WatchAddr, m_WatchWidth, 1) != 0) {
 				std::cout << "adding watchpoint failed!" << std::endl;
 				return false;
 			}
@@ -51,7 +51,7 @@ aspect QEMUListener
 		void onDeletion()
 		{
 			//std::cout << "QEMUMemWriteListener::onDeletion" << std::endl;
-			failqemu_remove_watchpoint(simulator.m_cpuenv, m_WatchAddr, m_WatchWidth, 1);
+			failqemu_remove_watchpoint(simulator.m_cpu0env, m_WatchAddr, m_WatchWidth, 1);
 		}
 	};
 };
diff --git a/src/core/sal/qemu/lol.h b/src/core/sal/qemu/lol.h
deleted file mode 100644
index 43e5548d..00000000
--- a/src/core/sal/qemu/lol.h
+++ /dev/null
@@ -1 +0,0 @@
-#error YO DAWG