diff --git a/CMakeLists.txt b/CMakeLists.txt
index d348e318..cacd97ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1259,6 +1259,9 @@ else(JVX_COMPILE_BUILDTOOLS)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/standalone-cfg.cmake DESTINATION ${INSTALL_PATH_RELEASE_ROOT}/cmake)
     install(DIRECTORY ${JVX_BASE_ROOT}/cmake-sdk DESTINATION ${INSTALL_PATH_RELEASE_ROOT}/cmake FILES_MATCHING PATTERN "*.cmake")
     install(DIRECTORY ${JVX_SUBPRODUCT_ROOT}/cmake-sdk DESTINATION ${INSTALL_PATH_RELEASE_ROOT}/cmake FILES_MATCHING PATTERN "*.cmake")
+	configure_file(${JVX_BASE_ROOT}/cmake-sdk/cmake-ayf-minimal-header-includes.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake-ayf-minimal-header-includes.cmake  @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake-ayf-minimal-header-includes.cmake DESTINATION ${INSTALL_PATH_RELEASE_ROOT}/cmake/cmake-sdk)
+	
     install(DIRECTORY ${JVX_BASE_ROOT}/software/codeFragments/jvxHosts/common DESTINATION ${INSTALL_PATH_RELEASE_ROOT}/software/codeFragments/jvxHosts) # FILES_MATCHING PATTERN "*.dylib")
     install(DIRECTORY ${JVX_BASE_ROOT}/software/codeFragments/simplify DESTINATION ${INSTALL_PATH_RELEASE_ROOT}/software/codeFragments) # FILES_MATCHING PATTERN "*.dylib")
     ## install(DIRECTORY ${JVX_BASE_ROOT}/software/codeFragments/commandline DESTINATION ${INSTALL_PATH_RELEASE_ROOT}/software/codeFragments) # FILES_MATCHING PATTERN "*.dylib")
diff --git a/cmake-sdk/cmake-ayf-minimal-header-includes.cmake b/cmake-sdk/cmake-ayf-minimal-header-includes.cmake.in
similarity index 82%
rename from cmake-sdk/cmake-ayf-minimal-header-includes.cmake
rename to cmake-sdk/cmake-ayf-minimal-header-includes.cmake.in
index 22401987..035aa3d7 100644
--- a/cmake-sdk/cmake-ayf-minimal-header-includes.cmake
+++ b/cmake-sdk/cmake-ayf-minimal-header-includes.cmake.in
@@ -1,9 +1,9 @@
 list(APPEND AYF_MINIMAL_SDK_HEADER_INCLUDE_LIST
 	"${AYF_SDK_PATH}/include/include"
 	"${AYF_SDK_PATH}/include/jvx-system-min/include"
-	"${AYF_SDK_PATH}/include/jvx-system-min/include/platform/windows"
+	"${AYF_SDK_PATH}/include/jvx-system-min/include/platform/@JVX_OS@"
 	"${AYF_SDK_PATH}/include/jvx-system-base/include"
-	"${AYF_SDK_PATH}/include/jvx-system-base/include/platform/windows"
+	"${AYF_SDK_PATH}/include/jvx-system-base/include/platform/@JVX_OS@"
 	"${AYF_SDK_PATH}/include/jvx-system-product/include"
 	"${AYF_SDK_PATH}/include/jvx-callprot/include"
 	"${AYF_SDK_PATH}/software"
diff --git a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt
index be2d381c..c0112873 100644
--- a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt
+++ b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt
@@ -41,7 +41,7 @@ endif()
 list(APPEND PLUGIN_SOURCES
   "ayfcorepack_plugin.cpp"
   "ayfcorepack_plugin.h"
-  "ayf-sdk-local-headers.h"
+  "../common/ayf-sdk-local-headers.h"
   "${AYF_SDK_PATH}/software/codeFragments/jvxApplications/native-config/exports/windows/exports-flutter-native-config.def"
   "${AYF_SDK_PATH}/include/${AYF_CORE_PACK_INCLUDE}/include/ayfstarter-native-config.h"
 
@@ -70,7 +70,8 @@ target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL)
 # Source include directories and library dependencies. Add any plugin-specific
 # dependencies here.
 target_include_directories(${PLUGIN_NAME} INTERFACE
-  "${CMAKE_CURRENT_SOURCE_DIR}/include")
+  "${CMAKE_CURRENT_SOURCE_DIR}/include"
+  "${CMAKE_CURRENT_SOURCE_DIR}/")
 
 # target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin)
 
diff --git a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.h b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.h
index a63766c1..33c7a7ea 100644
--- a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.h
+++ b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.h
@@ -1,7 +1,7 @@
 #ifndef FLUTTER_PLUGIN_AYFCOREPACK_PLUGIN_H_
 #define FLUTTER_PLUGIN_AYFCOREPACK_PLUGIN_H_
 
-#include "ayf-sdk-local-headers.h"
+#include "../common/ayf-sdk-local-headers.h"
 
 #include <flutter/method_channel.h>
 #include <flutter/plugin_registrar_windows.h>
diff --git a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin_c_api.cpp b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin_c_api.cpp
index 50ef0990..43dde2ea 100644
--- a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin_c_api.cpp
+++ b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin_c_api.cpp
@@ -1,4 +1,4 @@
-#include "ayf-sdk-local-headers.h"
+#include "../common/ayf-sdk-local-headers.h"
 #include "include/ayfcorepack/ayfcorepack_plugin_c_api.h"
 
 #include <flutter/plugin_registrar_windows.h>