diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp
index 6aafa81d8..1e8c60b33 100644
--- a/Machines/Electron/Electron.cpp
+++ b/Machines/Electron/Electron.cpp
@@ -321,6 +321,12 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
 	return cycles;
 }
 
+void Machine::set_tape(std::shared_ptr<Storage::Tape> tape)
+{
+	_tape.media = tape;
+	get_next_tape_pulse();
+}
+
 inline void Machine::get_next_tape_pulse()
 {
 	_tape.time_into_pulse = 0;
diff --git a/Machines/Electron/Electron.hpp b/Machines/Electron/Electron.hpp
index 89b616348..7913dca92 100644
--- a/Machines/Electron/Electron.hpp
+++ b/Machines/Electron/Electron.hpp
@@ -68,7 +68,7 @@ class Machine: public CPU6502::Processor<Machine> {
 		unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value);
 
 		void set_rom(ROMSlot slot, size_t length, const uint8_t *data);
-		void set_tape(std::shared_ptr<Storage::Tape> tape) { _tape.media = tape; get_next_tape_pulse(); }
+		void set_tape(std::shared_ptr<Storage::Tape> tape);
 
 		void set_key_state(Key key, bool isPressed);
 
diff --git a/Outputs/CRT.cpp b/Outputs/CRT.cpp
index a581b3df9..ffef2e553 100644
--- a/Outputs/CRT.cpp
+++ b/Outputs/CRT.cpp
@@ -15,11 +15,6 @@ using namespace Outputs;
 static const uint32_t kCRTFixedPointRange	= 0xf7ffffff;
 static const uint32_t kCRTFixedPointOffset	= 0x04000000;
 
-typedef uint16_t	kCRTPositionType;
-typedef uint16_t	kCRTTexCoordType;
-typedef uint8_t		kCRTLateralType;
-typedef uint8_t		kCRTPhaseType;
-
 //static const size_t kCRTVertexOffsetOfPosition = 0;
 //static const size_t kCRTVertexOffsetOfTexCoord = 4;
 //static const size_t kCRTVertexOffsetOfLateral = 8;