diff --git a/DataSpec/AssetNameMapNull.cpp b/DataSpec/AssetNameMapNull.cpp
index 121f0afe9..b077d2a0f 100644
--- a/DataSpec/AssetNameMapNull.cpp
+++ b/DataSpec/AssetNameMapNull.cpp
@@ -1,11 +1,9 @@
 #include <cstddef>
 #include <cstdint>
 
-extern "C" {
-const uint8_t ASSET_NAME_MP32[] = {0};
-const size_t ASSET_NAME_MP32_SZ = 0;
-const size_t ASSET_NAME_MP32_DECOMPRESSED_SZ = 0;
-const uint8_t ASSET_NAME_MP64[] = {0};
-const size_t ASSET_NAME_MP64_SZ = 0;
-const size_t ASSET_NAME_MP64_DECOMPRESSED_SZ = 0;
-}
+extern "C" const uint8_t ASSET_NAME_MP32[] = {0};
+extern "C" const size_t ASSET_NAME_MP32_SZ = 0;
+extern "C" const size_t ASSET_NAME_MP32_DECOMPRESSED_SZ = 0;
+extern "C" const uint8_t ASSET_NAME_MP64[] = {0};
+extern "C" const size_t ASSET_NAME_MP64_SZ = 0;
+extern "C" const size_t ASSET_NAME_MP64_DECOMPRESSED_SZ = 0;
diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt
index 13c709792..9e79971b0 100644
--- a/Runtime/CMakeLists.txt
+++ b/Runtime/CMakeLists.txt
@@ -136,14 +136,15 @@ endif()
 endfunction()
 
 set(RUNTIME_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-set(RUNTIME_LIBRARIES ${HECL_APPLICATION_REPS_TARGETS_LIST} RetroDataSpec AssetNameMapNull NESEmulator
+set(RUNTIME_LIBRARIES ${HECL_APPLICATION_REPS_TARGETS_LIST} RetroDataSpec NESEmulator
         libjpeg-turbo jbus kabufuda discord-rpc logvisor OptickCore imgui)
 
 add_runtime_common_library(RuntimeCommon ${RUNTIME_SOURCES_A})
 target_include_directories(RuntimeCommon PUBLIC ${RUNTIME_INCLUDES})
+target_link_libraries(RuntimeCommon PUBLIC ${RUNTIME_LIBRARIES})
 add_runtime_common_library(RuntimeCommonB ${RUNTIME_SOURCES_B})
+target_include_directories(RuntimeCommonB PUBLIC ${RUNTIME_INCLUDES})
 target_link_libraries(RuntimeCommonB PUBLIC ${RUNTIME_LIBRARIES})
-target_link_libraries(RuntimeCommon PUBLIC RuntimeCommonB)
 
 if(WIN32)
   configure_file(platforms/win/metaforce.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/metaforce.rc" @ONLY)
@@ -205,7 +206,7 @@ elseif(UNIX)
 endif()
 
 add_executable(metaforce CMain.cpp ${PLAT_SRCS} ImGuiConsole.hpp ImGuiConsole.cpp ImGuiEntitySupport.hpp ImGuiEntitySupport.cpp)
-target_link_libraries(metaforce PUBLIC RuntimeCommon ${PLAT_LIBS})
+target_link_libraries(metaforce PUBLIC RuntimeCommon RuntimeCommonB AssetNameMapNull ${PLAT_LIBS})
 
 if(COMMAND add_sanitizers)
   add_sanitizers(metaforce)