diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94772cc..7c57178 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,162 @@
+cmake_minimum_required(VERSION 3.15)
+
 project(NintendoSDK CXX ASM)
 
+set(NN_GFX_TARGET "NVN" CACHE STRING "Set nn::gfx build target")
+set_property(CACHE NN_GFX_TARGET PROPERTY STRINGS "" "NVN")
+
+set(NVN_API "C" CACHE STRING "Set NVN platform type")
+set_property(CACHE NVN_API PROPERTY STRINGS "C" "CPP")
+
+set(NN_SOURCES "")
+
+if(NN_GFX_TARGET)
+  # gfx_NvnHelper.cpp includes the C impl
+  if(NVN_API STREQUAL "C")
+    unset(NVN_API CACHE)
+  endif()
+
+  set(NN_GFX_SOURCES 
+    include/nn/gfx/detail/gfx_DataContainer.h
+    include/nn/gfx/detail/gfx_Fwd.h
+    include/nn/gfx/detail/gfx_Misc.h
+    include/nn/gfx/detail/gfx_RequiredMemory.h
+    include/nn/gfx/detail/gfx_ResShaderImpl.h
+    include/nn/gfx/detail/gfx_RootSignature-api.common.h
+    include/nn/gfx/util/gfx_PrimitiveShape.h
+
+    include/nn/gfx/gfx_Buffer.h
+    include/nn/gfx/gfx_BufferInfo.h
+    include/nn/gfx/gfx_BufferInfoData.h
+    include/nn/gfx/gfx_CommandBuffer.h
+    include/nn/gfx/gfx_CommandBufferInfo.h
+    include/nn/gfx/gfx_CommandBufferInfoData.h
+    include/nn/gfx/gfx_Common.h
+    include/nn/gfx/gfx_DescriptorPool.h
+    include/nn/gfx/gfx_DescriptorPoolInfo.h
+    include/nn/gfx/gfx_DescriptorPoolInfoData.h
+    include/nn/gfx/gfx_DescriptorSlot.h
+    include/nn/gfx/gfx_Device.h
+    include/nn/gfx/gfx_DeviceInfo.h
+    include/nn/gfx/gfx_DeviceInfoData.h
+    include/nn/gfx/gfx_Enum.h
+    include/nn/gfx/gfx_GpuAddress.h
+    include/nn/gfx/gfx_MemoryPool.h
+    include/nn/gfx/gfx_MemoryPoolInfo.h
+    include/nn/gfx/gfx_MemoryPoolInfoData.h
+    include/nn/gfx/gfx_Queue.h
+    include/nn/gfx/gfx_QueueInfo.h
+    include/nn/gfx/gfx_QueueInfoData.h
+    include/nn/gfx/gfx_ResShader.h
+    include/nn/gfx/gfx_ResShaderData.h
+    include/nn/gfx/gfx_ResTexture.h
+    include/nn/gfx/gfx_ResTextureData.h
+    include/nn/gfx/gfx_ResUserData.h
+    include/nn/gfx/gfx_ResUserDataData.h
+    include/nn/gfx/gfx_RootSignatureData-api.common.h
+    include/nn/gfx/gfx_RootSignatureInfo.h
+    include/nn/gfx/gfx_RootSignatureInfoData.h
+    include/nn/gfx/gfx_Sampler.h
+    include/nn/gfx/gfx_SamplerInfo.h
+    include/nn/gfx/gfx_SamplerInfoData.h
+    include/nn/gfx/gfx_Shader.h
+    include/nn/gfx/gfx_ShaderInfo.h
+    include/nn/gfx/gfx_ShaderInfoData.h
+    include/nn/gfx/gfx_State.h
+    include/nn/gfx/gfx_StateInfo.h
+    include/nn/gfx/gfx_StateInfoData.h
+    include/nn/gfx/gfx_SwapChain.h
+    include/nn/gfx/gfx_SwapChainInfo.h
+    include/nn/gfx/gfx_SwapChainInfoData.h
+    include/nn/gfx/gfx_Sync.h
+    include/nn/gfx/gfx_SyncInfo.h
+    include/nn/gfx/gfx_SyncInfoData.h
+    include/nn/gfx/gfx_Texture.h
+    include/nn/gfx/gfx_TextureInfo.h
+    include/nn/gfx/gfx_TextureInfoData.h
+    include/nn/gfx/gfx_Types.h
+    include/nn/gfx/gfx_VariationBase.h
+    
+    src/NintendoSDK/gfx/detail/gfx_CommonHelper.cpp
+    src/NintendoSDK/gfx/detail/gfx_CommonHelper.h
+    src/NintendoSDK/gfx/util/gfx_PrimitiveShape.cpp
+
+    src/NintendoSDK/gfx/gfx_BufferInfo.cpp
+    src/NintendoSDK/gfx/gfx_CommandBufferInfo.cpp
+    src/NintendoSDK/gfx/gfx_DescriptorPoolInfo.cpp
+    src/NintendoSDK/gfx/gfx_DeviceInfo.cpp
+    src/NintendoSDK/gfx/gfx_MemoryPoolInfo.cpp
+    src/NintendoSDK/gfx/gfx_QueueInfo.cpp
+    src/NintendoSDK/gfx/gfx_ResShader.cpp
+    src/NintendoSDK/gfx/gfx_ResTexture.cpp
+    src/NintendoSDK/gfx/gfx_SamplerInfo.cpp
+    src/NintendoSDK/gfx/gfx_ShaderInfo.cpp
+    src/NintendoSDK/gfx/gfx_StateInfo.cpp
+    src/NintendoSDK/gfx/gfx_SwapChainInfo.cpp
+    src/NintendoSDK/gfx/gfx_SyncInfo.cpp
+    src/NintendoSDK/gfx/gfx_TextureInfo.cpp
+  )
+
+  if(NN_GFX_TARGET STREQUAL "NVN")
+    list(APPEND NN_GFX_SOURCES
+      include/nn/gfx/detail/gfx_Buffer-api.nvn.8.h
+      include/nn/gfx/detail/gfx_CommandBuffer-api.nvn.8.h
+      include/nn/gfx/detail/gfx_Common-api.nvn.h
+      include/nn/gfx/detail/gfx_DescriptorPool-api.nvn.8.h
+      include/nn/gfx/detail/gfx_Device-api.nvn.8.h
+      include/nn/gfx/detail/gfx_MemoryPool-api.nvn.8.h
+      include/nn/gfx/detail/gfx_Pipeline-api.nvn.8.h
+      include/nn/gfx/detail/gfx_Queue-api.nvn.8.h
+      include/nn/gfx/detail/gfx_RootSignature-api.nvn.8.h
+      include/nn/gfx/detail/gfx_Sampler-api.nvn.8.h
+      include/nn/gfx/detail/gfx_Shader-api.nvn.8.h
+      include/nn/gfx/detail/gfx_State-api.nvn.8.h
+      include/nn/gfx/detail/gfx_SwapChain-api.nvn.8.h
+      include/nn/gfx/detail/gfx_Sync-api.nvn.8.h
+      include/nn/gfx/detail/gfx_Texture-api.nvn.8.h
+
+      include/nn/gfx/gfx_BufferData-api.nvn.8.h
+      include/nn/gfx/gfx_CommandBufferData-api.nvn.8.h
+      include/nn/gfx/gfx_DescriptorPoolData-api.nvn.8.h
+      include/nn/gfx/gfx_DeviceData-api.nvn.8.h
+      include/nn/gfx/gfx_Interoperation-api.nvn.8.h
+      include/nn/gfx/gfx_MemoryPoolData-api.nvn.8.h
+      include/nn/gfx/gfx_PipelineData-api.nvn.8.h
+      include/nn/gfx/gfx_QueueData-api.nvn.8.h
+      include/nn/gfx/gfx_ResShaderData-api.nvn.h
+      include/nn/gfx/gfx_SamplerData-api.nvn.8.h
+      include/nn/gfx/gfx_ShaderData-api.nvn.8.h
+      include/nn/gfx/gfx_StateData-api.nvn.8.h
+      include/nn/gfx/gfx_SwapChainData-api.nvn.8.h
+      include/nn/gfx/gfx_SyncData-api.nvn.8.h
+      include/nn/gfx/gfx_TextureData-api.nvn.8.h
+
+      src/NintendoSDK/gfx/detail/gfx_Buffer-api.nvn.8.cpp
+      src/NintendoSDK/gfx/detail/gfx_CommandBuffer-api.nvn.8.cpp
+      src/NintendoSDK/gfx/detail/gfx_DescriptorPool-api.nvn.8.cpp
+      src/NintendoSDK/gfx/detail/gfx_Device-api.nvn.8-os.horizon.cpp
+      src/NintendoSDK/gfx/detail/gfx_GlslcFunction.cpp
+      src/NintendoSDK/gfx/detail/gfx_MemoryPool-api.nvn.8.cpp
+      src/NintendoSDK/gfx/detail/gfx_NvnHelper-os.horizon.cpp
+      src/NintendoSDK/gfx/detail/gfx_NvnHelper.cpp
+      src/NintendoSDK/gfx/detail/gfx_NvnHelper.h
+      src/NintendoSDK/gfx/detail/gfx_ResShader-api.nvn.8.cpp
+      src/NintendoSDK/gfx/detail/gfx_Sampler-api.nvn.8.cpp
+      src/NintendoSDK/gfx/detail/gfx_Shader-api.nvn.8.cpp
+      src/NintendoSDK/gfx/detail/gfx_State-api.nvn.8.cpp
+      src/NintendoSDK/gfx/detail/gfx_Texture-api.nvn.8.cpp
+
+      src/NintendoSDK/gfx/util/gfx_ObjectDebugLabel-api.nvn.8.cpp
+      src/NintendoSDK/gfx/gfx_Interoperation-api.nvn.cpp
+    )
+  endif()
+
+  list(APPEND NN_SOURCES ${NN_GFX_SOURCES})
+endif()
+
 add_library(NintendoSDK OBJECT
-  include/nvn/nvn_FuncPtrBase.h
-  include/nvn/nvn_FuncPtrImpl.h
-  include/nvn/nvn_FuncPtrInline.h
-  include/nvn/nvn.h
+  ${NN_SOURCES}
+
   include/nn/types.h
   include/nn/fs.h
   include/nn/os.h
@@ -84,94 +236,6 @@ add_library(NintendoSDK OBJECT
   include/nn/init.h
   include/nn/crypto.h
   include/nn/ssl.h
-  include/nn/gfx/detail/gfx_Buffer-api.nvn.8.h
-  include/nn/gfx/detail/gfx_CommandBuffer-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Common-api.nvn.h
-  include/nn/gfx/detail/gfx_DataContainer.h
-  include/nn/gfx/detail/gfx_DescriptorPool-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Device-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Fwd.h
-  include/nn/gfx/detail/gfx_MemoryPool-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Misc.h
-  include/nn/gfx/detail/gfx_Pipeline-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Queue-api.nvn.8.h
-  include/nn/gfx/detail/gfx_RequiredMemory.h
-  include/nn/gfx/detail/gfx_ResShaderImpl.h
-  include/nn/gfx/detail/gfx_RootSignature-api.common.h
-  include/nn/gfx/detail/gfx_RootSignature-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Sampler-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Shader-api.nvn.8.h
-  include/nn/gfx/detail/gfx_State-api.nvn.8.h
-  include/nn/gfx/detail/gfx_SwapChain-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Sync-api.nvn.8.h
-  include/nn/gfx/detail/gfx_Texture-api.nvn.8.h
-  include/nn/gfx/util/gfx_PrimitiveShape.h
-  include/nn/gfx/gfx_Buffer.h
-  include/nn/gfx/gfx_BufferData-api.nvn.8.h
-  include/nn/gfx/gfx_BufferInfo.h
-  include/nn/gfx/gfx_BufferInfoData.h
-  include/nn/gfx/gfx_CommandBuffer.h
-  include/nn/gfx/gfx_CommandBufferData-api.nvn.8.h
-  include/nn/gfx/gfx_CommandBufferInfo.h
-  include/nn/gfx/gfx_CommandBufferInfoData.h
-  include/nn/gfx/gfx_Common.h
-  include/nn/gfx/gfx_DescriptorPool.h
-  include/nn/gfx/gfx_DescriptorPoolData-api.nvn.8.h
-  include/nn/gfx/gfx_DescriptorPoolInfo.h
-  include/nn/gfx/gfx_DescriptorPoolInfoData.h
-  include/nn/gfx/gfx_DescriptorSlot.h
-  include/nn/gfx/gfx_Device.h
-  include/nn/gfx/gfx_DeviceData-api.nvn.8.h
-  include/nn/gfx/gfx_DeviceInfo.h
-  include/nn/gfx/gfx_DeviceInfoData.h
-  include/nn/gfx/gfx_Enum.h
-  include/nn/gfx/gfx_GpuAddress.h
-  include/nn/gfx/gfx_Interoperation-api.nvn.8.h
-  include/nn/gfx/gfx_MemoryPool.h
-  include/nn/gfx/gfx_MemoryPoolData-api.nvn.8.h
-  include/nn/gfx/gfx_MemoryPoolInfo.h
-  include/nn/gfx/gfx_MemoryPoolInfoData.h
-  include/nn/gfx/gfx_PipelineData-api.nvn.8.h
-  include/nn/gfx/gfx_Queue.h
-  include/nn/gfx/gfx_QueueData-api.nvn.8.h
-  include/nn/gfx/gfx_QueueInfo.h
-  include/nn/gfx/gfx_QueueInfoData.h
-  include/nn/gfx/gfx_ResShader.h
-  include/nn/gfx/gfx_ResShaderData-api.nvn.h
-  include/nn/gfx/gfx_ResShaderData.h
-  include/nn/gfx/gfx_ResTexture.h
-  include/nn/gfx/gfx_ResTextureData.h
-  include/nn/gfx/gfx_ResUserData.h
-  include/nn/gfx/gfx_ResUserDataData.h
-  include/nn/gfx/gfx_RootSignatureData-api.common.h
-  include/nn/gfx/gfx_RootSignatureInfo.h
-  include/nn/gfx/gfx_RootSignatureInfoData.h
-  include/nn/gfx/gfx_Sampler.h
-  include/nn/gfx/gfx_SamplerData-api.nvn.8.h
-  include/nn/gfx/gfx_SamplerInfo.h
-  include/nn/gfx/gfx_SamplerInfoData.h
-  include/nn/gfx/gfx_Shader.h
-  include/nn/gfx/gfx_ShaderData-api.nvn.8.h
-  include/nn/gfx/gfx_ShaderInfo.h
-  include/nn/gfx/gfx_ShaderInfoData.h
-  include/nn/gfx/gfx_State.h
-  include/nn/gfx/gfx_StateData-api.nvn.8.h
-  include/nn/gfx/gfx_StateInfo.h
-  include/nn/gfx/gfx_StateInfoData.h
-  include/nn/gfx/gfx_SwapChain.h
-  include/nn/gfx/gfx_SwapChainData-api.nvn.8.h
-  include/nn/gfx/gfx_SwapChainInfo.h
-  include/nn/gfx/gfx_SwapChainInfoData.h
-  include/nn/gfx/gfx_Sync.h
-  include/nn/gfx/gfx_SyncData-api.nvn.8.h
-  include/nn/gfx/gfx_SyncInfo.h
-  include/nn/gfx/gfx_SyncInfoData.h
-  include/nn/gfx/gfx_Texture.h
-  include/nn/gfx/gfx_TextureData-api.nvn.8.h
-  include/nn/gfx/gfx_TextureInfo.h
-  include/nn/gfx/gfx_TextureInfoData.h
-  include/nn/gfx/gfx_Types.h
-  include/nn/gfx/gfx_VariationBase.h
   include/nn/fs/fs_bcat.h
   include/nn/fs/fs_directories.h
   include/nn/fs/fs_files.h
@@ -184,7 +248,14 @@ add_library(NintendoSDK OBJECT
   include/nn/audio.h
   include/nn/friends.h
   include/nn/mem.h
-  include/nv.h
+
+  include/nvn/nvn_Cpp.h
+  include/nvn/nvn_CppFuncPtrBase.h
+  include/nvn/nvn_CppMethods.h
+  include/nvn/nvn_FuncPtrBase.h
+  include/nvn/nvn_FuncPtrInline.h
+  include/nvn/nvn.h
+  
   include/vapours/results.hpp
   include/vapours/results/sf_results.hpp
   include/vapours/results/capsrv_results.hpp
@@ -218,55 +289,46 @@ add_library(NintendoSDK OBJECT
   include/vapours/results/fatal_results.hpp
   include/vapours/results/sm_results.hpp
   include/vapours/results/psc_results.hpp
-  
-  src/NintendoSDK/gfx/detail/gfx_Buffer-api.nvn.8.cpp
-  src/NintendoSDK/gfx/detail/gfx_CommandBuffer-api.nvn.8.cpp
-  src/NintendoSDK/gfx/detail/gfx_CommonHelper.cpp
-  src/NintendoSDK/gfx/detail/gfx_CommonHelper.h
-  src/NintendoSDK/gfx/detail/gfx_DescriptorPool-api.nvn.8.cpp
-  src/NintendoSDK/gfx/detail/gfx_Device-api.nvn.8-os.horizon.cpp
-  src/NintendoSDK/gfx/detail/gfx_GlslcFunction.cpp
-  src/NintendoSDK/gfx/detail/gfx_MemoryPool-api.nvn.8.cpp
-  src/NintendoSDK/gfx/detail/gfx_NvnHelper-os.horizon.cpp
-  src/NintendoSDK/gfx/detail/gfx_NvnHelper.cpp
-  src/NintendoSDK/gfx/detail/gfx_NvnHelper.h
-  src/NintendoSDK/gfx/detail/gfx_ResShader-api.nvn.8.cpp
-  src/NintendoSDK/gfx/detail/gfx_Sampler-api.nvn.8.cpp
-  src/NintendoSDK/gfx/detail/gfx_Shader-api.nvn.8.cpp
-  src/NintendoSDK/gfx/detail/gfx_State-api.nvn.8.cpp
-  src/NintendoSDK/gfx/detail/gfx_Texture-api.nvn.8.cpp
-  src/NintendoSDK/gfx/util/gfx_ObjectDebugLabel-api.nvn.8.cpp
-  src/NintendoSDK/gfx/util/gfx_PrimitiveShape.cpp
-  src/NintendoSDK/gfx/gfx_BufferInfo.cpp
-  src/NintendoSDK/gfx/gfx_CommandBufferInfo.cpp
-  src/NintendoSDK/gfx/gfx_DescriptorPoolInfo.cpp
-  src/NintendoSDK/gfx/gfx_DeviceInfo.cpp
-  src/NintendoSDK/gfx/gfx_Interoperation-api.nvn.cpp
-  src/NintendoSDK/gfx/gfx_MemoryPoolInfo.cpp
-  src/NintendoSDK/gfx/gfx_QueueInfo.cpp
-  src/NintendoSDK/gfx/gfx_ResShader.cpp
-  src/NintendoSDK/gfx/gfx_ResTexture.cpp
-  src/NintendoSDK/gfx/gfx_SamplerInfo.cpp
-  src/NintendoSDK/gfx/gfx_ShaderInfo.cpp
-  src/NintendoSDK/gfx/gfx_StateInfo.cpp
-  src/NintendoSDK/gfx/gfx_SwapChainInfo.cpp
-  src/NintendoSDK/gfx/gfx_SyncInfo.cpp
-  src/NintendoSDK/gfx/gfx_TextureInfo.cpp
+  include/nv.h
+
+  src/NintendoSDK/nvn/nvn_CppFuncPtrImpl.h
+  src/NintendoSDK/nvn/nvn_FuncPtrImpl.h
+  src/NintendoSDK/nvn/nvn_Impl.cpp
   src/NintendoSDK/nnSdk/util.cpp
 )
 
 target_include_directories(NintendoSDK PUBLIC include/)
+target_include_directories(NintendoSDK PRIVATE src/NintendoSDK/)
 target_compile_options(NintendoSDK PRIVATE -fno-strict-aliasing)
 target_compile_options(NintendoSDK PRIVATE -fno-exceptions)
 target_compile_options(NintendoSDK PRIVATE -Wall -Wextra)
 target_compile_options(NintendoSDK PRIVATE -Wno-invalid-offsetof)
 
-target_compile_definitions(NintendoSDK PRIVATE
-	NN_SDK_MAJOR=${NN_SDK_MAJOR}
-	NN_SDK_MINOR=${NN_SDK_MINOR}
-	NN_SDK_PATCH=${NN_SDK_PATCH}
-	NN_SDK_TYPE="${NN_SDK_TYPE}"
-	NN_WARE_MAJOR=${NN_WARE_MAJOR}
-	NN_WARE_MINOR=${NN_WARE_MINOR}
-	NN_WARE_PATCH=${NN_WARE_PATCH}
-)
+if (NVN_API)
+  target_compile_definitions(NintendoSDK PRIVATE NVN_API_${NVN_API})
+endif()
+
+function(nn_ver ID)
+  set(VER ${${ID}})
+  string(REPLACE "." ";" VER "${VER}")
+
+  list(LENGTH VER SEGS)
+  if(SEGS LESS 3)
+    set(DEF_VER 1 0 0)
+    list(SUBLIST DEF_VER ${SEGS} -1 DEF_VER)
+    list(APPEND VER ${DEF_VER})
+
+    message(AUTHOR_WARNING "${ID} semver is not complete (%d.%d.%d): ${${ID}}")
+  endif()
+
+  list(POP_FRONT VER MAJOR MINOR PATCH)
+  
+  foreach(VAR IN ITEMS MAJOR MINOR PATCH)
+    target_compile_definitions(NintendoSDK PRIVATE ${ID}_${VAR}=${${VAR}})
+  endforeach()
+endfunction()
+
+nn_ver(NN_WARE)
+nn_ver(NN_SDK)
+target_compile_definitions(NintendoSDK PRIVATE NN_SDK_TYPE="${NN_SDK_TYPE}")
+
diff --git a/include/nn/util.h b/include/nn/util.h
index 5c244bd..3e2bc5f 100644
--- a/include/nn/util.h
+++ b/include/nn/util.h
@@ -25,13 +25,21 @@ void ReferSymbol(const void*);
 }  // namespace util
 }  // namespace nn
 
-#ifndef NN_SDK_MAJOR
+#define NN_MAKE_VER(major, minor, patch) (((major) << 16) | ((minor) << 8) | (patch))
+
+#ifdef NN_SDK_MAJOR
+#define NN_SDK_VER NN_MAKE_VER(NN_SDK_MAJOR, NN_SDK_MINOR, NN_SDK_PATCH)
+#else
+#define NN_SDK_VER 0
 #define NN_SDK_MAJOR 0
 #define NN_SDK_MINOR 0
 #define NN_SDK_PATCH 0
 #endif
 
-#ifndef NN_WARE_MAJOR
+#ifdef NN_WARE_MAJOR
+#define NN_WARE_VER NN_MAKE_VER(NN_WARE_MAJOR, NN_WARE_MINOR, NN_WARE_PATCH)
+#else
+#define NN_WARE_VER 0
 #define NN_WARE_MAJOR 0
 #define NN_WARE_MINOR 0
 #define NN_WARE_PATCH 0
@@ -41,19 +49,11 @@ void ReferSymbol(const void*);
 #define NN_SDK_TYPE "Release"
 #endif
 
-#ifndef NN_MAKE_VER
-#define NN_MAKE_VER(major, minor, patch) ((major << 16) | (minor << 8) | (patch))
-
-#define NN_SDK_VER NN_MAKE_VER(NN_SDK_MAJOR, NN_SDK_MINOR, NN_SDK_PATCH)
-#define NN_WARE_VER NN_MAKE_VER(NN_WARE_MAJOR, NN_WARE_MINOR, NN_WARE_PATCH)
-
-#define NN_STRINGIFY1(s) #s
-#define NN_STRINGIFY(s) NN_STRINGIFY1(s)
+#define NN_STR(s) #s
+#define NN_XSTR(s) NN_STR(s)
 
 #define NN_SDK_BUILD_STR                                                                           \
-    "-" NN_STRINGIFY(NN_SDK_MAJOR) "_" NN_STRINGIFY(NN_SDK_MINOR) "_" NN_STRINGIFY(                \
-        NN_SDK_PATCH) "-" NN_SDK_TYPE
-#endif
+    "-" NN_XSTR(NN_SDK_MAJOR) "_" NN_XSTR(NN_SDK_MINOR) "_" NN_XSTR(NN_SDK_PATCH) "-" NN_SDK_TYPE
 
 #define NN_MIDDLEWARE(var, company, name)                                                          \
     static const char var[] __attribute__((section(".api_info"))) = "SDK MW+" company "+" name
diff --git a/src/NintendoSDK/gfx/detail/gfx_NvnHelper.cpp b/src/NintendoSDK/gfx/detail/gfx_NvnHelper.cpp
index 5456449..cf55b22 100644
--- a/src/NintendoSDK/gfx/detail/gfx_NvnHelper.cpp
+++ b/src/NintendoSDK/gfx/detail/gfx_NvnHelper.cpp
@@ -2,7 +2,8 @@
 
 #include <nn/gfx/gfx_SwapChainInfo.h>
 #include <nn/gfx/gfx_TextureInfo.h>
-#include <nvn/nvn_FuncPtrBase.h>
+
+#include "nvn/nvn_FuncPtrImpl.h"
 
 #include <algorithm>
 
diff --git a/src/NintendoSDK/gfx/gfx_StateInfo.cpp b/src/NintendoSDK/gfx/gfx_StateInfo.cpp
index 7ee998f..3d70eb9 100644
--- a/src/NintendoSDK/gfx/gfx_StateInfo.cpp
+++ b/src/NintendoSDK/gfx/gfx_StateInfo.cpp
@@ -135,4 +135,4 @@ void ViewportScissorStateInfo::SetDefault() {
     SetScissorStateInfoArray(nullptr, 0);
 }
 
-}  // namespace nn::gfx
\ No newline at end of file
+}  // namespace nn::gfx
diff --git a/include/nvn/nvn_CppFuncPtrImpl.h b/src/NintendoSDK/nvn/nvn_CppFuncPtrImpl.h
similarity index 100%
rename from include/nvn/nvn_CppFuncPtrImpl.h
rename to src/NintendoSDK/nvn/nvn_CppFuncPtrImpl.h
diff --git a/include/nvn/nvn_FuncPtrImpl.h b/src/NintendoSDK/nvn/nvn_FuncPtrImpl.h
similarity index 100%
rename from include/nvn/nvn_FuncPtrImpl.h
rename to src/NintendoSDK/nvn/nvn_FuncPtrImpl.h
diff --git a/src/NintendoSDK/nvn/nvn_Impl.cpp b/src/NintendoSDK/nvn/nvn_Impl.cpp
new file mode 100644
index 0000000..6a84ebd
--- /dev/null
+++ b/src/NintendoSDK/nvn/nvn_Impl.cpp
@@ -0,0 +1,7 @@
+#ifdef NVN_API_C
+#include "nvn_FuncPtrImpl.h"
+#endif
+
+#ifdef NVN_API_CPP
+#include "nvn_CppFuncPtrImpl.h"
+#endif