diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43e69b2373..35c327f69c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,7 +439,7 @@ endif()
 include(cmake${BRANCH_DIR_SUFFIX}/find_igc.cmake)
 
 # GmmLib detection
-include(cmake/find_gmmlib.cmake)
+include(cmake${BRANCH_DIR_SUFFIX}/find_gmmlib.cmake)
 
 # Metrics detection
 include(cmake/find_metrics.cmake)
diff --git a/shared/source/gmm_helper/gmm_lib.h b/shared/source/gmm_helper/gmm_lib.h
index e75b87c6d1..321ecf173b 100644
--- a/shared/source/gmm_helper/gmm_lib.h
+++ b/shared/source/gmm_helper/gmm_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -34,7 +34,7 @@
 
 #endif
 
-#include "GmmLib.h"
+#include "neo_gmmlib.h"
 
 #if __clang__
 #pragma clang diagnostic pop
diff --git a/shared/source/gmm_helper/igfxfmid_wrapper/CMakeLists.txt b/shared/source/gmm_helper/igfxfmid_wrapper/CMakeLists.txt
index 668fdc499a..af2f2d4af3 100644
--- a/shared/source/gmm_helper/igfxfmid_wrapper/CMakeLists.txt
+++ b/shared/source/gmm_helper/igfxfmid_wrapper/CMakeLists.txt
@@ -7,6 +7,7 @@
 set(NEO_CORE_GMM_HELPER_IGFXFMID_WRAPPER
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}neo_igfxfmid.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}neo_gmmlib.h
 )
 
 set_property(GLOBAL APPEND PROPERTY NEO_CORE_GMM_HELPER ${NEO_CORE_GMM_HELPER_IGFXFMID_WRAPPER})
diff --git a/shared/source/gmm_helper/igfxfmid_wrapper/neo_gmmlib.h b/shared/source/gmm_helper/igfxfmid_wrapper/neo_gmmlib.h
new file mode 100644
index 0000000000..1157633b62
--- /dev/null
+++ b/shared/source/gmm_helper/igfxfmid_wrapper/neo_gmmlib.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "GmmLib.h"