diff --git a/Analyser/Static/Acorn/Target.hpp b/Analyser/Static/Acorn/Target.hpp
index f049f3e8f..1ef46c291 100644
--- a/Analyser/Static/Acorn/Target.hpp
+++ b/Analyser/Static/Acorn/Target.hpp
@@ -9,7 +9,7 @@
 #ifndef Analyser_Static_Acorn_Target_h
 #define Analyser_Static_Acorn_Target_h
 
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 #include <string>
 
diff --git a/Analyser/Static/AmstradCPC/Target.hpp b/Analyser/Static/AmstradCPC/Target.hpp
index 586398e6e..6f708d4b0 100644
--- a/Analyser/Static/AmstradCPC/Target.hpp
+++ b/Analyser/Static/AmstradCPC/Target.hpp
@@ -9,8 +9,8 @@
 #ifndef Analyser_Static_AmstradCPC_Target_h
 #define Analyser_Static_AmstradCPC_Target_h
 
-#include "../../../Reflection/Enum.h"
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Enum.hpp"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 #include <string>
 
diff --git a/Analyser/Static/AppleII/Target.hpp b/Analyser/Static/AppleII/Target.hpp
index eb67b2af2..988e7d4ee 100644
--- a/Analyser/Static/AppleII/Target.hpp
+++ b/Analyser/Static/AppleII/Target.hpp
@@ -9,8 +9,8 @@
 #ifndef Target_h
 #define Target_h
 
-#include "../../../Reflection/Enum.h"
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Enum.hpp"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 
 namespace Analyser {
diff --git a/Analyser/Static/AtariST/Target.hpp b/Analyser/Static/AtariST/Target.hpp
index 4933c8776..fd025baf8 100644
--- a/Analyser/Static/AtariST/Target.hpp
+++ b/Analyser/Static/AtariST/Target.hpp
@@ -9,7 +9,7 @@
 #ifndef Analyser_Static_AtariST_Target_h
 #define Analyser_Static_AtariST_Target_h
 
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 
 namespace Analyser {
diff --git a/Analyser/Static/Commodore/Target.hpp b/Analyser/Static/Commodore/Target.hpp
index dd08b87d9..9da8506ec 100644
--- a/Analyser/Static/Commodore/Target.hpp
+++ b/Analyser/Static/Commodore/Target.hpp
@@ -9,8 +9,8 @@
 #ifndef Analyser_Static_Commodore_Target_h
 #define Analyser_Static_Commodore_Target_h
 
-#include "../../../Reflection/Enum.h"
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Enum.hpp"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 #include <string>
 
diff --git a/Analyser/Static/MSX/Target.hpp b/Analyser/Static/MSX/Target.hpp
index 7e16ae25a..f0d7a9f6a 100644
--- a/Analyser/Static/MSX/Target.hpp
+++ b/Analyser/Static/MSX/Target.hpp
@@ -9,8 +9,8 @@
 #ifndef Analyser_Static_MSX_Target_h
 #define Analyser_Static_MSX_Target_h
 
-#include "../../../Reflection/Enum.h"
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Enum.hpp"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 #include <string>
 
diff --git a/Analyser/Static/Macintosh/Target.hpp b/Analyser/Static/Macintosh/Target.hpp
index 243ccf36e..f00cb4a24 100644
--- a/Analyser/Static/Macintosh/Target.hpp
+++ b/Analyser/Static/Macintosh/Target.hpp
@@ -9,8 +9,8 @@
 #ifndef Analyser_Static_Macintosh_Target_h
 #define Analyser_Static_Macintosh_Target_h
 
-#include "../../../Reflection/Enum.h"
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Enum.hpp"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 
 namespace Analyser {
diff --git a/Analyser/Static/Oric/Target.hpp b/Analyser/Static/Oric/Target.hpp
index e0f81f6d7..66aead3dd 100644
--- a/Analyser/Static/Oric/Target.hpp
+++ b/Analyser/Static/Oric/Target.hpp
@@ -9,8 +9,8 @@
 #ifndef Analyser_Static_Oric_Target_h
 #define Analyser_Static_Oric_Target_h
 
-#include "../../../Reflection/Enum.h"
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Enum.hpp"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 #include <string>
 
diff --git a/Analyser/Static/Sega/Target.hpp b/Analyser/Static/Sega/Target.hpp
index f0926d689..3eceb774d 100644
--- a/Analyser/Static/Sega/Target.hpp
+++ b/Analyser/Static/Sega/Target.hpp
@@ -9,8 +9,8 @@
 #ifndef Analyser_Static_Sega_Target_h
 #define Analyser_Static_Sega_Target_h
 
-#include "../../../Reflection/Enum.h"
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Enum.hpp"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 
 namespace Analyser {
diff --git a/Analyser/Static/ZX8081/Target.hpp b/Analyser/Static/ZX8081/Target.hpp
index 3461974ed..c7dd7e60d 100644
--- a/Analyser/Static/ZX8081/Target.hpp
+++ b/Analyser/Static/ZX8081/Target.hpp
@@ -9,8 +9,8 @@
 #ifndef Analyser_Static_ZX8081_Target_h
 #define Analyser_Static_ZX8081_Target_h
 
-#include "../../../Reflection/Enum.h"
-#include "../../../Reflection/Struct.h"
+#include "../../../Reflection/Enum.hpp"
+#include "../../../Reflection/Struct.hpp"
 #include "../StaticAnalyser.hpp"
 #include <string>
 
diff --git a/Configurable/Configurable.hpp b/Configurable/Configurable.hpp
index cbb037ff3..d1aebbdfa 100644
--- a/Configurable/Configurable.hpp
+++ b/Configurable/Configurable.hpp
@@ -9,7 +9,7 @@
 #ifndef Configurable_h
 #define Configurable_h
 
-#include "../Reflection/Struct.h"
+#include "../Reflection/Struct.hpp"
 
 #include <memory>
 
diff --git a/Configurable/StandardOptions.hpp b/Configurable/StandardOptions.hpp
index 4980b3315..abc7c284c 100644
--- a/Configurable/StandardOptions.hpp
+++ b/Configurable/StandardOptions.hpp
@@ -9,7 +9,7 @@
 #ifndef StandardOptions_hpp
 #define StandardOptions_hpp
 
-#include "../Reflection/Enum.h"
+#include "../Reflection/Enum.hpp"
 
 namespace Configurable {
 
diff --git a/Machines/Utility/MachineForTarget.hpp b/Machines/Utility/MachineForTarget.hpp
index 5d481e0d4..066ef51b7 100644
--- a/Machines/Utility/MachineForTarget.hpp
+++ b/Machines/Utility/MachineForTarget.hpp
@@ -10,7 +10,7 @@
 #define MachineForTarget_hpp
 
 #include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../Reflection/Struct.h"
+#include "../../Reflection/Struct.hpp"
 
 #include "../DynamicMachine.hpp"
 
diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj
index 2e5b8d107..881f5f442 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj	
@@ -1038,8 +1038,8 @@
 		4B38F3471F2EC11D00D9235D /* AmstradCPC.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = AmstradCPC.hpp; path = AmstradCPC/AmstradCPC.hpp; sourceTree = "<group>"; };
 		4B3940E51DA83C8300427841 /* AsyncTaskQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AsyncTaskQueue.cpp; path = ../../Concurrency/AsyncTaskQueue.cpp; sourceTree = "<group>"; };
 		4B3940E61DA83C8300427841 /* AsyncTaskQueue.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = AsyncTaskQueue.hpp; path = ../../Concurrency/AsyncTaskQueue.hpp; sourceTree = "<group>"; };
-		4B3AF7D02413470E00873C0B /* Enum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Enum.h; sourceTree = "<group>"; };
-		4B3AF7D12413472200873C0B /* Struct.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Struct.h; sourceTree = "<group>"; };
+		4B3AF7D02413470E00873C0B /* Enum.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Enum.hpp; sourceTree = "<group>"; };
+		4B3AF7D12413472200873C0B /* Struct.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Struct.hpp; sourceTree = "<group>"; };
 		4B3BA0C21D318AEB005DD7A7 /* C1540Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = C1540Tests.swift; sourceTree = "<group>"; };
 		4B3BA0C51D318B44005DD7A7 /* C1540Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = C1540Bridge.h; sourceTree = "<group>"; };
 		4B3BA0C61D318B44005DD7A7 /* C1540Bridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = C1540Bridge.mm; sourceTree = "<group>"; };
@@ -2197,8 +2197,8 @@
 		4B3AF7CF2413470E00873C0B /* Reflection */ = {
 			isa = PBXGroup;
 			children = (
-				4B3AF7D02413470E00873C0B /* Enum.h */,
-				4B3AF7D12413472200873C0B /* Struct.h */,
+				4B3AF7D02413470E00873C0B /* Enum.hpp */,
+				4B3AF7D12413472200873C0B /* Struct.hpp */,
 				4B47F6C4241C87A100ED06F7 /* Struct.cpp */,
 			);
 			name = Reflection;
diff --git a/OSBindings/SDL/main.cpp b/OSBindings/SDL/main.cpp
index 07692ed41..451f3c8d9 100644
--- a/OSBindings/SDL/main.cpp
+++ b/OSBindings/SDL/main.cpp
@@ -34,8 +34,8 @@
 #include "../../Outputs/OpenGL/ScanTarget.hpp"
 #include "../../Outputs/OpenGL/Screenshot.hpp"
 
-#include "../../Reflection/Enum.h"
-#include "../../Reflection/Struct.h"
+#include "../../Reflection/Enum.hpp"
+#include "../../Reflection/Struct.hpp"
 
 namespace {
 
diff --git a/Reflection/Enum.h b/Reflection/Enum.hpp
similarity index 98%
rename from Reflection/Enum.h
rename to Reflection/Enum.hpp
index ede607246..09fd48719 100644
--- a/Reflection/Enum.h
+++ b/Reflection/Enum.hpp
@@ -1,13 +1,13 @@
 //
-//  Enum.h
+//  Enum.hpp
 //  Clock Signal
 //
 //  Created by Thomas Harte on 17/02/2020.
 //  Copyright © 2020 Thomas Harte. All rights reserved.
 //
 
-#ifndef Enum_h
-#define Enum_h
+#ifndef Enum_hpp
+#define Enum_hpp
 
 #include <algorithm>
 #include <cctype>
@@ -170,4 +170,4 @@ class Enum {
 
 }
 
-#endif /* Enum_h */
+#endif /* Enum_hpp */
diff --git a/Reflection/Struct.cpp b/Reflection/Struct.cpp
index dadad2fd8..19096e0ad 100644
--- a/Reflection/Struct.cpp
+++ b/Reflection/Struct.cpp
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Thomas Harte. All rights reserved.
 //
 
-#include "Struct.h"
+#include "Struct.hpp"
 
 #include <algorithm>
 
diff --git a/Reflection/Struct.h b/Reflection/Struct.hpp
similarity index 98%
rename from Reflection/Struct.h
rename to Reflection/Struct.hpp
index a1a2d99d4..e6423deae 100644
--- a/Reflection/Struct.h
+++ b/Reflection/Struct.hpp
@@ -1,13 +1,13 @@
 //
-//  Struct.h
+//  Struct.hpp
 //  Clock Signal
 //
 //  Created by Thomas Harte on 06/03/2020.
 //  Copyright © 2020 Thomas Harte. All rights reserved.
 //
 
-#ifndef Struct_h
-#define Struct_h
+#ifndef Struct_hpp
+#define Struct_hpp
 
 #include <cstdarg>
 #include <cstring>
@@ -17,7 +17,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "Enum.h"
+#include "Enum.hpp"
 
 namespace Reflection {
 
@@ -269,4 +269,4 @@ template <typename Owner> class StructImpl: public Struct {
 
 }
 
-#endif /* Struct_h */
+#endif /* Struct_hpp */