diff --git a/CPU.h b/CPU.h
index 1ca4a0f..9218f90 100644
--- a/CPU.h
+++ b/CPU.h
@@ -5,6 +5,9 @@
 
 class Stream;
 
+#define O(o, e) case o: e(); break;
+#define D(e) default: e(); break;
+
 class CPU: public Checkpointable {
 public:
 	virtual void run(unsigned instructions) =0;
diff --git a/i8080.cpp b/i8080.cpp
index 408f2ae..8fdcad9 100644
--- a/i8080.cpp
+++ b/i8080.cpp
@@ -97,9 +97,6 @@ uint8_t parity_tbl(uint8_t r) {
 	return m == (b & m);
 }
 
-#define O(o, e) case o: e(); break;
-#define D(e) default: e(); break;
-
 void i8080::_op(uint8_t op) {
 
 	switch(op) {
diff --git a/r6502.cpp b/r6502.cpp
index 9c18ca7..e62dd6b 100644
--- a/r6502.cpp
+++ b/r6502.cpp
@@ -174,9 +174,6 @@ void r6502::reset()
 	PC = vector(resvec);
 }
 
-#define O(o, e) case o: e(); break;
-#define D(e) default: e(); break;
-
 void r6502::_op(uint8_t op) {
 
 	switch (op) {