diff --git a/Intel8080/inc/Disassembler.h b/Intel8080/inc/Disassembler.h
index b6dee36..eb87555 100644
--- a/Intel8080/inc/Disassembler.h
+++ b/Intel8080/inc/Disassembler.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <cstdint>
 #include <string>
+#include <sstream>
 #include <boost/format.hpp>
 
 namespace EightBit {
diff --git a/Intel8080/inc/Intel8080.h b/Intel8080/inc/Intel8080.h
index 369e162..0115222 100644
--- a/Intel8080/inc/Intel8080.h
+++ b/Intel8080/inc/Intel8080.h
@@ -2,10 +2,18 @@
 
 // Auxiliary carry logic from https://github.com/begoon/i8080-core
 
+#include <cstdint>
+#include <stdexcept>
+
 #include <IntelProcessor.h>
-#include <InputOutput.h>
+#include <Signal.h>
+#include <Register.h>
 
 namespace EightBit {
+
+	class InputOutput;
+	class Bus;
+
 	class Intel8080 : public IntelProcessor {
 	public:
 		enum StatusBits {
diff --git a/Intel8080/src/stdafx.h b/Intel8080/src/stdafx.h
index 5aad53c..0449783 100644
--- a/Intel8080/src/stdafx.h
+++ b/Intel8080/src/stdafx.h
@@ -3,6 +3,7 @@
 #endif
 
 #include <cstdint>
+#include <stdexcept>
 
 #include <string>
 #include <array>