From 0263afdb9ab55892bea0f3dccb8ad12196574597 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Thu, 15 May 2025 19:41:27 +0100
Subject: [PATCH 1/2] Fix header self-sufficiency issues affecting MSVC on
 Windows

---
 include/vsg/utils/CoordinateSpace.h | 1 +
 include/vsg/vk/Queue.h              | 1 +
 include/vsg/vk/Slots.h              | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/include/vsg/utils/CoordinateSpace.h b/include/vsg/utils/CoordinateSpace.h
index 2e29f08908..ed5fe94854 100644
--- a/include/vsg/utils/CoordinateSpace.h
+++ b/include/vsg/utils/CoordinateSpace.h
@@ -12,6 +12,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 </editor-fold> */
 
+#include <vsg/core/Export.h>
 #include <vsg/maths/color.h>
 
 namespace vsg
diff --git a/include/vsg/vk/Queue.h b/include/vsg/vk/Queue.h
index e4dbc167e7..a00a44f248 100644
--- a/include/vsg/vk/Queue.h
+++ b/include/vsg/vk/Queue.h
@@ -12,6 +12,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 </editor-fold> */
 
+#include <vsg/core/Inherit.h>
 #include <vsg/core/Object.h>
 #include <vsg/vk/vulkan.h>
 
diff --git a/include/vsg/vk/Slots.h b/include/vsg/vk/Slots.h
index 9abfd2fac5..410cfaedb9 100644
--- a/include/vsg/vk/Slots.h
+++ b/include/vsg/vk/Slots.h
@@ -12,6 +12,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 </editor-fold> */
 
+#include <cstdint>
+
 namespace vsg
 {
 

From 214bab1de6c098eb0ed3dfb080f518b57267f79b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Fri, 16 May 2025 17:49:49 +0100
Subject: [PATCH 2/2] Add missing includes for GCC

---
 include/vsg/core/IntrusiveAllocator.h | 1 +
 include/vsg/io/read_line.h            | 1 +
 include/vsg/threading/FrameBlock.h    | 2 ++
 include/vsg/vk/vk_buffer.h            | 1 +
 4 files changed, 5 insertions(+)

diff --git a/include/vsg/core/IntrusiveAllocator.h b/include/vsg/core/IntrusiveAllocator.h
index e85aba5e6a..8ebf4eee6b 100644
--- a/include/vsg/core/IntrusiveAllocator.h
+++ b/include/vsg/core/IntrusiveAllocator.h
@@ -16,6 +16,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #include <list>
 #include <vector>
+#include <string>
 
 namespace vsg
 {
diff --git a/include/vsg/io/read_line.h b/include/vsg/io/read_line.h
index a3bbf307dd..aa7aabb7f0 100644
--- a/include/vsg/io/read_line.h
+++ b/include/vsg/io/read_line.h
@@ -10,6 +10,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 </editor-fold> */
 
+#include <cstdint>
 #include <istream>
 
 namespace vsg
diff --git a/include/vsg/threading/FrameBlock.h b/include/vsg/threading/FrameBlock.h
index fc277a5935..6d7d8f10be 100644
--- a/include/vsg/threading/FrameBlock.h
+++ b/include/vsg/threading/FrameBlock.h
@@ -15,6 +15,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <vsg/threading/ActivityStatus.h>
 #include <vsg/ui/ApplicationEvent.h>
 
+#include <condition_variable>
+
 namespace vsg
 {
 
diff --git a/include/vsg/vk/vk_buffer.h b/include/vsg/vk/vk_buffer.h
index 5877fb71e0..eb4833022c 100644
--- a/include/vsg/vk/vk_buffer.h
+++ b/include/vsg/vk/vk_buffer.h
@@ -15,6 +15,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <vsg/core/Version.h>
 
 #include <array>
+#include <cstdint>
 #include <vector>
 
 namespace vsg