diff --git a/VkCppGenerator.cpp b/VkCppGenerator.cpp
index d2888ae..887c163 100644
--- a/VkCppGenerator.cpp
+++ b/VkCppGenerator.cpp
@@ -1867,6 +1867,8 @@ int main( int argc, char **argv )
   std::ofstream ofs( "vk_cpp.h" );
   ofs << licenseHeader << std::endl;
 
+  ofs << std::endl << "#pragma once" << std::endl;
+
   ofs << "#include <array>" << std::endl
       << "#include <cstdint>" << std::endl
       << "#include <cstring>" << std::endl
diff --git a/tinyxml2 b/tinyxml2
new file mode 160000
index 0000000..c8dad95
--- /dev/null
+++ b/tinyxml2
@@ -0,0 +1 @@
+Subproject commit c8dad95d4488663c0381d502b3274df7dbf2fc55
diff --git a/vulkan/vk_cpp.h b/vulkan/vk_cpp.h
index 114f08c..dfa4d72 100644
--- a/vulkan/vk_cpp.h
+++ b/vulkan/vk_cpp.h
@@ -24,8 +24,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+#pragma once
 #include <array>
-#include <stdint.h>
+#include <cstdint>
+#include <cstring>
 #include <vulkan/vulkan.h>
 #ifdef VKCPP_ENHANCED_MODE
 # include <vector>