diff --git a/src/Vulkan/BUILD.gn b/src/Vulkan/BUILD.gn
index 830a39c..d73f2d8 100644
--- a/src/Vulkan/BUILD.gn
+++ b/src/Vulkan/BUILD.gn
@@ -58,28 +58,28 @@
 
 swiftshader_source_set("swiftshader_libvulkan_headers") {
   sources = [
-    "Version.h",
+    "Version.hpp",
     "VkBuffer.hpp",
     "VkBufferView.hpp",
     "VkCommandBuffer.hpp",
     "VkCommandPool.hpp",
-    "VkConfig.h",
+    "VkConfig.hpp",
     "VkDescriptorPool.hpp",
     "VkDescriptorSet.hpp",
     "VkDescriptorSetLayout.hpp",
     "VkDescriptorUpdateTemplate.hpp",
-    "VkDestroy.h",
+    "VkDestroy.hpp",
     "VkDevice.hpp",
     "VkDeviceMemory.hpp",
     "VkEvent.hpp",
     "VkFence.hpp",
-    "VkFormat.h",
+    "VkFormat.hpp",
     "VkFramebuffer.hpp",
-    "VkGetProcAddress.h",
+    "VkGetProcAddress.hpp",
     "VkImage.hpp",
     "VkImageView.hpp",
     "VkInstance.hpp",
-    "VkMemory.h",
+    "VkMemory.hpp",
     "VkObject.hpp",
     "VkPhysicalDevice.hpp",
     "VkPipeline.hpp",
@@ -93,7 +93,7 @@
     "VkShaderModule.hpp",
     "VkSpecializationInfo.hpp",
     "VkStringify.hpp",
-    "VulkanPlatform.h",
+    "VulkanPlatform.hpp",
   ]
   if (is_linux || is_android) {
     sources += [
diff --git a/src/Vulkan/CMakeLists.txt b/src/Vulkan/CMakeLists.txt
index fdd0117..0117533 100644
--- a/src/Vulkan/CMakeLists.txt
+++ b/src/Vulkan/CMakeLists.txt
@@ -21,7 +21,7 @@
     libVulkan.cpp
     main.cpp
     resource.h
-    Version.h
+    Version.hpp
     VkBuffer.cpp
     VkBuffer.hpp
     VkBufferView.cpp
@@ -30,7 +30,7 @@
     VkCommandBuffer.hpp
     VkCommandPool.cpp
     VkCommandPool.hpp
-    VkConfig.h
+    VkConfig.hpp
     VkDescriptorPool.cpp
     VkDescriptorPool.hpp
     VkDescriptorSet.hpp
@@ -38,7 +38,7 @@
     VkDescriptorSetLayout.hpp
     VkDescriptorUpdateTemplate.cpp
     VkDescriptorUpdateTemplate.hpp
-    VkDestroy.h
+    VkDestroy.hpp
     VkDevice.cpp
     VkDevice.hpp
     VkDeviceMemory.cpp
@@ -48,11 +48,11 @@
     VkEvent.hpp
     VkFence.hpp
     VkFormat.cpp
-    VkFormat.h
+    VkFormat.hpp
     VkFramebuffer.cpp
     VkFramebuffer.hpp
     VkGetProcAddress.cpp
-    VkGetProcAddress.h
+    VkGetProcAddress.hpp
     VkImage.cpp
     VkImage.hpp
     VkImageView.cpp
@@ -60,7 +60,7 @@
     VkInstance.cpp
     VkInstance.hpp
     VkMemory.cpp
-    VkMemory.h
+    VkMemory.hpp
     VkObject.hpp
     VkPhysicalDevice.cpp
     VkPhysicalDevice.hpp
@@ -89,7 +89,7 @@
     VkShaderModule.hpp
     VkStringify.cpp
     VkStringify.hpp
-    VulkanPlatform.h
+    VulkanPlatform.hpp
 )
 
 if(WIN32)
diff --git a/src/Vulkan/Version.h b/src/Vulkan/Version.hpp
similarity index 100%
rename from src/Vulkan/Version.h
rename to src/Vulkan/Version.hpp
diff --git a/src/Vulkan/VkBuffer.cpp b/src/Vulkan/VkBuffer.cpp
index 129d5bd..f19785e 100644
--- a/src/Vulkan/VkBuffer.cpp
+++ b/src/Vulkan/VkBuffer.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "VkBuffer.hpp"
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDeviceMemory.hpp"
 
 #include <cstring>
diff --git a/src/Vulkan/VkBufferView.cpp b/src/Vulkan/VkBufferView.cpp
index 3e048f1..3312f23 100644
--- a/src/Vulkan/VkBufferView.cpp
+++ b/src/Vulkan/VkBufferView.cpp
@@ -14,7 +14,7 @@
 
 #include "VkBufferView.hpp"
 #include "VkBuffer.hpp"
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 
 namespace vk {
 
diff --git a/src/Vulkan/VkBufferView.hpp b/src/Vulkan/VkBufferView.hpp
index aa13fb5..8488a84 100644
--- a/src/Vulkan/VkBufferView.hpp
+++ b/src/Vulkan/VkBufferView.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_BUFFER_VIEW_HPP_
 #define VK_BUFFER_VIEW_HPP_
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 #include "VkImageView.hpp"
 #include "VkObject.hpp"
 
diff --git a/src/Vulkan/VkCommandBuffer.cpp b/src/Vulkan/VkCommandBuffer.cpp
index f8aa8d8..03d04c1 100644
--- a/src/Vulkan/VkCommandBuffer.cpp
+++ b/src/Vulkan/VkCommandBuffer.cpp
@@ -15,7 +15,7 @@
 #include "VkCommandBuffer.hpp"
 
 #include "VkBuffer.hpp"
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDevice.hpp"
 #include "VkEvent.hpp"
 #include "VkFence.hpp"
diff --git a/src/Vulkan/VkCommandBuffer.hpp b/src/Vulkan/VkCommandBuffer.hpp
index 825844d..00efb1d 100644
--- a/src/Vulkan/VkCommandBuffer.hpp
+++ b/src/Vulkan/VkCommandBuffer.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_COMMAND_BUFFER_HPP_
 #define VK_COMMAND_BUFFER_HPP_
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDescriptorSet.hpp"
 #include "VkObject.hpp"
 #include "Device/Context.hpp"
diff --git a/src/Vulkan/VkCommandPool.cpp b/src/Vulkan/VkCommandPool.cpp
index fe467e0..96a833f 100644
--- a/src/Vulkan/VkCommandPool.cpp
+++ b/src/Vulkan/VkCommandPool.cpp
@@ -14,7 +14,7 @@
 
 #include "VkCommandPool.hpp"
 #include "VkCommandBuffer.hpp"
-#include "VkDestroy.h"
+#include "VkDestroy.hpp"
 #include <algorithm>
 #include <new>
 
diff --git a/src/Vulkan/VkConfig.h b/src/Vulkan/VkConfig.hpp
similarity index 97%
rename from src/Vulkan/VkConfig.h
rename to src/Vulkan/VkConfig.hpp
index eaf0b1d..a83ca91 100644
--- a/src/Vulkan/VkConfig.h
+++ b/src/Vulkan/VkConfig.hpp
@@ -15,9 +15,9 @@
 #ifndef VK_CONFIG_HPP_
 #define VK_CONFIG_HPP_
 
-#include "Version.h"
+#include "Version.hpp"
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace vk {
 
diff --git a/src/Vulkan/VkDestroy.h b/src/Vulkan/VkDestroy.hpp
similarity index 100%
rename from src/Vulkan/VkDestroy.h
rename to src/Vulkan/VkDestroy.hpp
diff --git a/src/Vulkan/VkDevice.cpp b/src/Vulkan/VkDevice.cpp
index 389348b..879b4e2 100644
--- a/src/Vulkan/VkDevice.cpp
+++ b/src/Vulkan/VkDevice.cpp
@@ -14,7 +14,7 @@
 
 #include "VkDevice.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDescriptorSetLayout.hpp"
 #include "VkFence.hpp"
 #include "VkQueue.hpp"
diff --git a/src/Vulkan/VkDeviceMemory.cpp b/src/Vulkan/VkDeviceMemory.cpp
index 014557f..191916f 100644
--- a/src/Vulkan/VkDeviceMemory.cpp
+++ b/src/Vulkan/VkDeviceMemory.cpp
@@ -16,7 +16,7 @@
 #include "VkBuffer.hpp"
 #include "VkImage.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 
 namespace vk {
 
diff --git a/src/Vulkan/VkDeviceMemory.hpp b/src/Vulkan/VkDeviceMemory.hpp
index ea014d6..6a388fb 100644
--- a/src/Vulkan/VkDeviceMemory.hpp
+++ b/src/Vulkan/VkDeviceMemory.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_DEVICE_MEMORY_HPP_
 #define VK_DEVICE_MEMORY_HPP_
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkObject.hpp"
 
 namespace vk {
diff --git a/src/Vulkan/VkFormat.cpp b/src/Vulkan/VkFormat.cpp
index 7d4d314..c392fdc 100644
--- a/src/Vulkan/VkFormat.cpp
+++ b/src/Vulkan/VkFormat.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 
 #include "System/Debug.hpp"
 #include "System/Math.hpp"
diff --git a/src/Vulkan/VkFormat.h b/src/Vulkan/VkFormat.hpp
similarity index 97%
rename from src/Vulkan/VkFormat.h
rename to src/Vulkan/VkFormat.hpp
index 06752e1..6265130 100644
--- a/src/Vulkan/VkFormat.h
+++ b/src/Vulkan/VkFormat.hpp
@@ -17,7 +17,7 @@
 
 #include "System/Types.hpp"
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace vk {
 
diff --git a/src/Vulkan/VkGetProcAddress.cpp b/src/Vulkan/VkGetProcAddress.cpp
index 2c762b8..81da95a 100644
--- a/src/Vulkan/VkGetProcAddress.cpp
+++ b/src/Vulkan/VkGetProcAddress.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "VkGetProcAddress.h"
+#include "VkGetProcAddress.hpp"
 #include "VkDevice.hpp"
 
 #include <string>
diff --git a/src/Vulkan/VkGetProcAddress.h b/src/Vulkan/VkGetProcAddress.hpp
similarity index 97%
rename from src/Vulkan/VkGetProcAddress.h
rename to src/Vulkan/VkGetProcAddress.hpp
index 5918673..584a1f7 100644
--- a/src/Vulkan/VkGetProcAddress.h
+++ b/src/Vulkan/VkGetProcAddress.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_UTILS_HPP_
 #define VK_UTILS_HPP_
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace vk {
 
diff --git a/src/Vulkan/VkImage.hpp b/src/Vulkan/VkImage.hpp
index 99860be..0401df3 100644
--- a/src/Vulkan/VkImage.hpp
+++ b/src/Vulkan/VkImage.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_IMAGE_HPP_
 #define VK_IMAGE_HPP_
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 #include "VkObject.hpp"
 
 #ifdef __ANDROID__
diff --git a/src/Vulkan/VkImageView.hpp b/src/Vulkan/VkImageView.hpp
index 2993950..1a2240e 100644
--- a/src/Vulkan/VkImageView.hpp
+++ b/src/Vulkan/VkImageView.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_IMAGE_VIEW_HPP_
 #define VK_IMAGE_VIEW_HPP_
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 #include "VkImage.hpp"
 #include "VkObject.hpp"
 
diff --git a/src/Vulkan/VkInstance.cpp b/src/Vulkan/VkInstance.cpp
index 46a61be..14f7142 100644
--- a/src/Vulkan/VkInstance.cpp
+++ b/src/Vulkan/VkInstance.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "VkInstance.hpp"
-#include "VkDestroy.h"
+#include "VkDestroy.hpp"
 
 namespace vk {
 
diff --git a/src/Vulkan/VkMemory.cpp b/src/Vulkan/VkMemory.cpp
index 753040e..3957522 100644
--- a/src/Vulkan/VkMemory.cpp
+++ b/src/Vulkan/VkMemory.cpp
@@ -15,9 +15,9 @@
 #ifndef VK_OBJECT_HPP_
 #define VK_OBJECT_HPP_
 
-#include "VkMemory.h"
+#include "VkMemory.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "System/Memory.hpp"
 
 namespace vk {
diff --git a/src/Vulkan/VkMemory.h b/src/Vulkan/VkMemory.hpp
similarity index 96%
rename from src/Vulkan/VkMemory.h
rename to src/Vulkan/VkMemory.hpp
index e6f51b7..337b23e 100644
--- a/src/Vulkan/VkMemory.h
+++ b/src/Vulkan/VkMemory.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_MEMORY_HPP_
 #define VK_MEMORY_HPP_
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace vk {
 
diff --git a/src/Vulkan/VkObject.hpp b/src/Vulkan/VkObject.hpp
index d0fcba6..24b3200 100644
--- a/src/Vulkan/VkObject.hpp
+++ b/src/Vulkan/VkObject.hpp
@@ -15,12 +15,12 @@
 #ifndef VK_OBJECT_HPP_
 #define VK_OBJECT_HPP_
 
-#include "VkConfig.h"
-#include "VkMemory.h"
+#include "VkConfig.hpp"
+#include "VkMemory.hpp"
 
 #include "System/Debug.hpp"
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 #include <vulkan/vk_icd.h>
 #include <new>
 
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index fcb09da..02f649d 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -14,7 +14,7 @@
 
 #include "VkPhysicalDevice.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "Pipeline/SpirvShader.hpp"  // sw::SIMD::Width
 #include "Reactor/Reactor.hpp"
 
diff --git a/src/Vulkan/VkPhysicalDevice.hpp b/src/Vulkan/VkPhysicalDevice.hpp
index 0193c71..ea74d16 100644
--- a/src/Vulkan/VkPhysicalDevice.hpp
+++ b/src/Vulkan/VkPhysicalDevice.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_PHYSICAL_DEVICE_HPP_
 #define VK_PHYSICAL_DEVICE_HPP_
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 #include "VkObject.hpp"
 
 #ifdef VK_USE_PLATFORM_ANDROID_KHR
diff --git a/src/Vulkan/VkPipelineLayout.hpp b/src/Vulkan/VkPipelineLayout.hpp
index 4dc252b..1ce716c 100644
--- a/src/Vulkan/VkPipelineLayout.hpp
+++ b/src/Vulkan/VkPipelineLayout.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_PIPELINE_LAYOUT_HPP_
 #define VK_PIPELINE_LAYOUT_HPP_
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDescriptorSetLayout.hpp"
 
 namespace vk {
diff --git a/src/Vulkan/VkPromotedExtensions.cpp b/src/Vulkan/VkPromotedExtensions.cpp
index b9e6e7a..b3a9a24 100644
--- a/src/Vulkan/VkPromotedExtensions.cpp
+++ b/src/Vulkan/VkPromotedExtensions.cpp
@@ -40,7 +40,7 @@
 // VK_KHR_storage_buffer_storage_class (no functions in this extension)
 // VK_KHR_variable_pointers (no functions in this extension)
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 extern "C" {
 
diff --git a/src/Vulkan/VkSemaphore.cpp b/src/Vulkan/VkSemaphore.cpp
index 21a05f9..aa9a7fc 100644
--- a/src/Vulkan/VkSemaphore.cpp
+++ b/src/Vulkan/VkSemaphore.cpp
@@ -14,7 +14,7 @@
 
 #include "VkSemaphore.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkStringify.hpp"
 
 #include "marl/blockingcall.h"
diff --git a/src/Vulkan/VkSemaphore.hpp b/src/Vulkan/VkSemaphore.hpp
index 652389b..3f32111 100644
--- a/src/Vulkan/VkSemaphore.hpp
+++ b/src/Vulkan/VkSemaphore.hpp
@@ -15,7 +15,7 @@
 #ifndef VK_SEMAPHORE_HPP_
 #define VK_SEMAPHORE_HPP_
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkObject.hpp"
 
 #include "marl/event.h"
diff --git a/src/Vulkan/Vulkan.rc b/src/Vulkan/Vulkan.rc
index 3800c7c..51c5b93 100644
--- a/src/Vulkan/Vulkan.rc
+++ b/src/Vulkan/Vulkan.rc
@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include <windows.h>
-#include "Version.h"
+#include "Version.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -36,7 +36,7 @@
 2 TEXTINCLUDE
 BEGIN
     "#include ""afxres.h""\r\n"
-    "#include ""Version.h""\0"
+    "#include ""Version.hpp""\0"
 END
 
 3 TEXTINCLUDE
diff --git a/src/Vulkan/VulkanPlatform.h b/src/Vulkan/VulkanPlatform.hpp
similarity index 100%
rename from src/Vulkan/VulkanPlatform.h
rename to src/Vulkan/VulkanPlatform.hpp
diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index f235a6f..07e9b0a 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -16,17 +16,17 @@
 #include "VkBufferView.hpp"
 #include "VkCommandBuffer.hpp"
 #include "VkCommandPool.hpp"
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDescriptorPool.hpp"
 #include "VkDescriptorSetLayout.hpp"
 #include "VkDescriptorUpdateTemplate.hpp"
-#include "VkDestroy.h"
+#include "VkDestroy.hpp"
 #include "VkDevice.hpp"
 #include "VkDeviceMemory.hpp"
 #include "VkEvent.hpp"
 #include "VkFence.hpp"
 #include "VkFramebuffer.hpp"
-#include "VkGetProcAddress.h"
+#include "VkGetProcAddress.hpp"
 #include "VkImage.hpp"
 #include "VkImageView.hpp"
 #include "VkInstance.hpp"
@@ -45,7 +45,7 @@
 #include "System/Debug.hpp"
 
 #if defined(VK_USE_PLATFORM_METAL_EXT) || defined(VK_USE_PLATFORM_MACOS_MVK)
-#	include "WSI/MetalSurface.h"
+#	include "WSI/MetalSurface.hpp"
 #endif
 
 #ifdef VK_USE_PLATFORM_XCB_KHR