diff --git a/M6502/inc/Profiler.h b/M6502/inc/Profiler.h
index 12739e6..87a8ae9 100644
--- a/M6502/inc/Profiler.h
+++ b/M6502/inc/Profiler.h
@@ -5,8 +5,8 @@
 #include <cstdint>
 #include <functional>
 
-#include "EventArgs.h"
-#include "Signal.h"
+#include <EventArgs.h>
+#include <Signal.h>
 
 #include "Disassembly.h"
 #include "Symbols.h"
diff --git a/M6502/src/stdafx.h b/M6502/src/stdafx.h
index 8101ea0..d46c91a 100644
--- a/M6502/src/stdafx.h
+++ b/M6502/src/stdafx.h
@@ -4,7 +4,7 @@
 
 #include <cstdint>
 #include <functional>
-#include <stdexcept>
+#include <cassert>
 
 #include <string>
 #include <array>
@@ -18,4 +18,10 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/regex.hpp>
-#include <boost/regex.hpp>
\ No newline at end of file
+#include <boost/regex.hpp>
+
+#include <Bus.h>
+#include <Processor.h>
+#include <Signal.h>
+#include <EventArgs.h>
+#include <Signal.h>
diff --git a/M6502/test/stdafx.h b/M6502/test/stdafx.h
index 756ec5f..730a19b 100644
--- a/M6502/test/stdafx.h
+++ b/M6502/test/stdafx.h
@@ -2,6 +2,8 @@
 #pragma once
 #endif
 
+#include <cstdint>
+
 #include <string>
 
 #include <sstream>
@@ -12,4 +14,12 @@
 
 #ifdef _MSC_VER
 #include <conio.h>
-#endif
\ No newline at end of file
+#endif
+
+#include <Ram.h>
+#include <Bus.h>
+#include <Profiler.h>
+#include <Disassembly.h>
+#include <mos6502.h>
+#include <Symbols.h>
+#include <TestHarness.h>
diff --git a/M6502/test/test.cpp b/M6502/test/test.cpp
index 64f68e6..d00de09 100644
--- a/M6502/test/test.cpp
+++ b/M6502/test/test.cpp
@@ -1,8 +1,9 @@
 #include "stdafx.h"
-#include "TestHarness.h"
 #include "Configuration.h"
 #include "Board.h"
 
+#include <TestHarness.h>
+
 #include <iostream>
 
 int main(int argc, char* argv[]) {