diff --git a/modules/resourceid/CMakeLists.txt b/modules/resourceid/CMakeLists.txt
index 34e568bb8..9acc860b9 100644
--- a/modules/resourceid/CMakeLists.txt
+++ b/modules/resourceid/CMakeLists.txt
@@ -13,6 +13,7 @@ set(resourceid_SOURCES
 add_library(resourceid STATIC ${resourceid_SOURCES})
 
 target_link_libraries(resourceid PRIVATE core_private)
+target_include_directories(resourceid PUBLIC fsw/inc)
 
 # Add unit test coverage subdirectory
 if(ENABLE_UNIT_TESTS)
diff --git a/modules/resourceid/option_inc/cfe_resourceid_osal_compatible.h b/modules/resourceid/fsw/inc/cfe_resourceid_basevalue.h
similarity index 95%
rename from modules/resourceid/option_inc/cfe_resourceid_osal_compatible.h
rename to modules/resourceid/fsw/inc/cfe_resourceid_basevalue.h
index 93bbaffa7..ec0b2aa85 100644
--- a/modules/resourceid/option_inc/cfe_resourceid_osal_compatible.h
+++ b/modules/resourceid/fsw/inc/cfe_resourceid_basevalue.h
@@ -38,8 +38,8 @@
  * OSAL ID structure.
  */
 
-#ifndef CFE_RESOURCEID_OSAL_COMPATIBLE_H
-#define CFE_RESOURCEID_OSAL_COMPATIBLE_H
+#ifndef CFE_RESOURCEID_BASEVALUE_H
+#define CFE_RESOURCEID_BASEVALUE_H
 
 /*
 ** Include Files
@@ -74,4 +74,4 @@
  */
 #define CFE_RESOURCEID_MAKE_BASE(offset) (CFE_RESOURCEID_MARK | ((offset) << CFE_RESOURCEID_SHIFT))
 
-#endif /* CFE_RESOURCEID_OSAL_COMPATIBLE_H */
+#endif /* CFE_RESOURCEID_BASEVALUE_H */
diff --git a/modules/resourceid/mission_build.cmake b/modules/resourceid/mission_build.cmake
index 9319c48d6..158f4c9a2 100644
--- a/modules/resourceid/mission_build.cmake
+++ b/modules/resourceid/mission_build.cmake
@@ -20,13 +20,3 @@ generate_config_includefile(
     FILE_NAME           "cfe_resourceid_typedef.h"
     FALLBACK_FILE       "${CMAKE_CURRENT_LIST_DIR}/option_inc/${RESOURCEID_HDR_FILE}"
 )
-
-# Resource ID base value header
-# Currently the "osal compatible" version is the only provided implementation,
-# but missions can provide their own if desired to override this.
-generate_config_includefile(
-    FILE_NAME           "cfe_resourceid_basevalue.h"
-    FALLBACK_FILE       "${CMAKE_CURRENT_LIST_DIR}/option_inc/cfe_resourceid_osal_compatible.h"
-)
-
-include_directories(${CMAKE_CURRENT_LIST_DIR}/inc)