diff --git a/include/gryphn/gryphn_platform.h b/include/gryphn/gryphn_platform.h
index 81d2438..a730a85 100644
--- a/include/gryphn/gryphn_platform.h
+++ b/include/gryphn/gryphn_platform.h
@@ -1,3 +1,3 @@
 #pragma once
-#include <platform/gryphn_platform_include.h>
+#include <gryphn_platform_include.h>
 #include <window_surface/gryphn_surface_create_functions.h>
diff --git a/projects/apis/metal/CMakeLists.txt b/projects/apis/metal/CMakeLists.txt
index db08935..c7de4e3 100644
--- a/projects/apis/metal/CMakeLists.txt
+++ b/projects/apis/metal/CMakeLists.txt
@@ -14,6 +14,7 @@ target_include_directories(GryphnMetalImpl PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/
     ${CMAKE_CURRENT_SOURCE_DIR}/../../
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../platform/
     ${CMAKE_CURRENT_SOURCE_DIR}/src/
     depends/SPIRV-Cross/
 )
diff --git a/projects/apis/vulkan/CMakeLists.txt b/projects/apis/vulkan/CMakeLists.txt
index 5340e02..7293961 100644
--- a/projects/apis/vulkan/CMakeLists.txt
+++ b/projects/apis/vulkan/CMakeLists.txt
@@ -17,6 +17,7 @@ target_include_directories(GryphnVulkanImpl PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/src/
     ${CMAKE_CURRENT_SOURCE_DIR}/../../core/src/
     ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../platform/
     ${CMAKE_CURRENT_SOURCE_DIR}/../../
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/
 )
diff --git a/projects/core/CMakeLists.txt b/projects/core/CMakeLists.txt
index aa0a569..f64b6a7 100644
--- a/projects/core/CMakeLists.txt
+++ b/projects/core/CMakeLists.txt
@@ -13,3 +13,4 @@ target_include_directories(GryphnCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../)
 target_include_directories(GryphnCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/)
 target_include_directories(GryphnCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include/)
 target_include_directories(GryphnCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../utils)
+target_include_directories(GryphnCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../platform/)
diff --git a/projects/core/src/window_surface/gryphn_surface.h b/projects/core/src/window_surface/gryphn_surface.h
index 184efdf..d90562b 100644
--- a/projects/core/src/window_surface/gryphn_surface.h
+++ b/projects/core/src/window_surface/gryphn_surface.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <platform/gryphn_platform_include.h>
+#include <gryphn_platform_include.h>
 #include <utils/gryphn_image_format.h>
 #include <instance/gryphn_instance.h>
 #include "output_device/gryphn_physical_output_device.h"
diff --git a/projects/core/src/window_surface/gryphn_surface_create_functions.h b/projects/core/src/window_surface/gryphn_surface_create_functions.h
index f83354b..1d2dacb 100644
--- a/projects/core/src/window_surface/gryphn_surface_create_functions.h
+++ b/projects/core/src/window_surface/gryphn_surface_create_functions.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <platform/gryphn_platform_include.h>
+#include <gryphn_platform_include.h>
 #include <gryphn_handles.h>
 #include <utils/gryphn_error_code.h>
 
diff --git a/projects/platform/CMakeLists.txt b/projects/platform/CMakeLists.txt
index 349a9f2..eadccd0 100644
--- a/projects/platform/CMakeLists.txt
+++ b/projects/platform/CMakeLists.txt
@@ -7,3 +7,5 @@ endif()
 add_library(GryphnPlatform STATIC ${APPLE_FILES})
 target_include_directories(GryphnPlatform PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../utils/)
 target_include_directories(GryphnPlatform PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../core/)
+target_include_directories(GryphnPlatform PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../core/src/)
+target_include_directories(GryphnPlatform PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/projects/platform/gryphn_platform_include.h b/projects/platform/gryphn_platform_include.h
index 4a97b62..e4f0598 100644
--- a/projects/platform/gryphn_platform_include.h
+++ b/projects/platform/gryphn_platform_include.h
@@ -1,19 +1,20 @@
 #pragma once
-#include "gryphn_rendering_api.h"
+#include <gryphn_rendering_api.h>
 
 #ifdef GN_PLATFORM_LINUX
-#include <platform/platform_linux/gryphn_platform_linux.h>
+#include <platform_linux/gryphn_platform_linux.h>
 #endif
 
 #ifdef GN_PLATFORM_MACOS
-#include <platform/platform_macos/gryphn_platform_macos.h>
+#include <platform_macos/gryphn_platform_macos.h>
 #endif
 
 #ifdef GN_PLATFORM_WINDOWS
-#include "platform_windows/gryphn_platform_windows.h"
+#include <platform_windows/gryphn_platform_windows.h>
 #endif
 
 gnRenderingAPI* gnGetSupportedRenderingAPIs(int* count);
+gnBool gnSupportsRenderingAPI(gnRenderingAPI api);
 
 // #ifdef __cplusplus
 // template <typename function>
diff --git a/projects/platform/platform_macos/gryphn_platform_macos.m b/projects/platform/platform_macos/gryphn_platform_macos.m
index 5a07556..7c12c82 100644
--- a/projects/platform/platform_macos/gryphn_platform_macos.m
+++ b/projects/platform/platform_macos/gryphn_platform_macos.m
@@ -15,6 +15,10 @@ gnRenderingAPI* gnGetSupportedRenderingAPIs(int* count) {
     return renderingAPIs;
 }
 
+gnBool gnSupportsRenderingAPI(gnRenderingAPI api) {
+    for (int i = 0; i < 3; i++) if (api == renderingAPIs[i]) return gnTrue;
+    return gnFalse;
+}
 
 CAMetalLayer* gnCreateCAMetalLayer(NSWindow* window) {
     NSView* view = window.contentView;
diff --git a/projects/validation_layers/function_loader/CMakeLists.txt b/projects/validation_layers/function_loader/CMakeLists.txt
index 02e9d96..2009596 100644
--- a/projects/validation_layers/function_loader/CMakeLists.txt
+++ b/projects/validation_layers/function_loader/CMakeLists.txt
@@ -7,3 +7,4 @@ add_library(GryphnFunctionValidator STATIC ${SOURCE_FILES} ${LOADER_FILES})
 target_include_directories(GryphnFunctionValidator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../utils)
 target_include_directories(GryphnFunctionValidator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../)
 target_include_directories(GryphnFunctionValidator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../core/src/)
+target_include_directories(GryphnFunctionValidator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../platform/)