diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
index 7ed0d509212cc4..808aac13e22cd1 100644
--- a/src/coreclr/CMakeLists.txt
+++ b/src/coreclr/CMakeLists.txt
@@ -125,6 +125,9 @@ add_subdirectory(pal/prebuilt/inc)
 set(EP_GENERATED_HEADER_PATH "${GENERATED_INCLUDE_DIR}")
 include (${CLR_SRC_NATIVE_DIR}/eventpipe/configure.cmake)
 
+add_subdirectory(${CLR_SRC_NATIVE_DIR}/containers containers)
+add_subdirectory(${CLR_SRC_NATIVE_DIR}/eventpipe eventpipe)
+
 if(NOT CLR_CMAKE_HOST_MACCATALYST AND NOT CLR_CMAKE_HOST_IOS AND NOT CLR_CMAKE_HOST_TVOS)
   add_subdirectory(debug/debug-pal)
 endif()
diff --git a/src/coreclr/debug/debug-pal/CMakeLists.txt b/src/coreclr/debug/debug-pal/CMakeLists.txt
index adc8efacab4ae9..b803de3b6db1ad 100644
--- a/src/coreclr/debug/debug-pal/CMakeLists.txt
+++ b/src/coreclr/debug/debug-pal/CMakeLists.txt
@@ -1,8 +1,6 @@
 include_directories(../inc)
 include_directories(../../pal/inc)
-include_directories(${EP_GENERATED_HEADER_PATH})
 
-set(SHARED_EVENTPIPE_SOURCE_PATH ${CLR_SRC_NATIVE_DIR}/eventpipe)
 add_definitions(-DFEATURE_CORECLR)
 add_definitions(-DFEATURE_PERFTRACING)
 add_definitions(-DFEATURE_PERFTRACING_STANDALONE_PAL)
@@ -12,9 +10,7 @@ if(CLR_CMAKE_HOST_WIN32)
     include_directories(../../inc) #needed for warning control
 
     if(CLR_CMAKE_TARGET_WIN32)
-            set (EVENTPIPE_PAL_SOURCES "${SHARED_EVENTPIPE_SOURCE_PATH}/ds-ipc-pal-namedpipe.c")
-            set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES LANGUAGE CXX)
-
+        set(DEBUG_PAL_REFEREENCE_DIAGNOSTICSERVER ON)
         set(TWO_WAY_PIPE_SOURCES
             ${EVENTPIPE_PAL_SOURCES}
             win/twowaypipe.cpp
@@ -28,14 +24,11 @@ if(CLR_CMAKE_HOST_WIN32)
 endif(CLR_CMAKE_HOST_WIN32)
 
 if(CLR_CMAKE_HOST_UNIX)
+    set(DEBUG_PAL_REFEREENCE_DIAGNOSTICSERVER ON)
 
     add_definitions(-DPAL_IMPLEMENTATION)
     add_definitions(-D_POSIX_C_SOURCE=200809L)
 
-    set (EVENTPIPE_PAL_SOURCES "${SHARED_EVENTPIPE_SOURCE_PATH}/ds-ipc-pal-socket.c")
-    set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES LANGUAGE CXX)
-    set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-
     set(TWO_WAY_PIPE_SOURCES
       ${EVENTPIPE_PAL_SOURCES}
       unix/twowaypipe.cpp
@@ -45,3 +38,13 @@ if(CLR_CMAKE_HOST_UNIX)
 endif(CLR_CMAKE_HOST_UNIX)
 
 add_library_clr(debug-pal OBJECT ${TWO_WAY_PIPE_SOURCES})
+
+if (DEBUG_PAL_REFEREENCE_DIAGNOSTICSERVER)
+    target_link_libraries(debug-pal PRIVATE dn-diagnosticserver-pal)
+
+    # The DiagnosticServer Runtime implementation in CoreCLR is C++,
+    # but the Diagnostic Server PAL is written in C.
+    # Override those files to build as C++.
+    get_property(ds_pal_sources TARGET dn-diagnosticserver-pal PROPERTY INTERFACE_SOURCES)
+    set_source_files_properties(${ds_pal_sources} PROPERTIES LANGUAGE CXX)
+endif()
diff --git a/src/coreclr/nativeaot/Runtime/eventpipe/CMakeLists.txt b/src/coreclr/nativeaot/Runtime/eventpipe/CMakeLists.txt
index 19ea228f01b62c..537e2f5f2b5f4b 100644
--- a/src/coreclr/nativeaot/Runtime/eventpipe/CMakeLists.txt
+++ b/src/coreclr/nativeaot/Runtime/eventpipe/CMakeLists.txt
@@ -106,47 +106,16 @@ endif()
 
 set(AOT_EVENTPIPE_SHIM_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
-set (CONTAINER_SOURCES "")
-set (CONTAINER_HEADERS "")
 set (MINIPAL_SOURCES "")
 set (EVENTPIPE_SOURCES "")
-set (EVENTPIPE_HEADERS "")
 
-# Use TCP for EventPipe on mobile platforms
-if (CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_ANDROID)
-  set(FEATURE_PERFTRACING_PAL_TCP 1)
-  set(FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT 1)
-endif()
-
-set (SHARED_CONTAINERS_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/containers")
-set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
 set (SHARED_MINIPAL_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/minipal")
-include (${SHARED_EVENTPIPE_SOURCE_PATH}/eventpipe.cmake)
-include (${SHARED_CONTAINERS_SOURCE_PATH}/containers.cmake)
 
 list(APPEND MINIPAL_SOURCES
   utf8.c
 )
 
-if(CLR_CMAKE_HOST_WIN32)
-  list(APPEND SHARED_DIAGNOSTIC_SERVER_SOURCES
-    ds-ipc-pal-namedpipe.c
-  )
-
-  list(APPEND SHARED_DIAGNOSTIC_SERVER_HEADERS
-    ds-ipc-pal-namedpipe.h
-  )
-endif(CLR_CMAKE_HOST_WIN32)
-
 if(CLR_CMAKE_HOST_UNIX)
-  list(APPEND SHARED_DIAGNOSTIC_SERVER_SOURCES
-    ds-ipc-pal-socket.c
-  )
-
-  list(APPEND SHARED_DIAGNOSTIC_SERVER_HEADERS
-    ds-ipc-pal-socket.h
-  )
-
   include(${CLR_SRC_NATIVE_DIR}/minipal/configure.cmake)
   list(APPEND MINIPAL_SOURCES
     random.c
@@ -154,41 +123,11 @@ if(CLR_CMAKE_HOST_UNIX)
 
 endif(CLR_CMAKE_HOST_UNIX)
 
-list(APPEND EVENTPIPE_SOURCES
-  ${SHARED_EVENTPIPE_SOURCES}
-  ${SHARED_DIAGNOSTIC_SERVER_SOURCES}
-)
-
-list(APPEND EVENTPIPE_HEADERS
-  ${SHARED_EVENTPIPE_HEADERS}
-  ${SHARED_DIAGNOSTIC_SERVER_HEADERS}
-)
-
-addprefix(CONTAINER_SOURCES ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_SOURCES}")
-addprefix(CONTAINER_HEADERS ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_HEADERS}")
 addprefix(MINIPAL_SOURCES ${SHARED_MINIPAL_SOURCE_PATH} "${MINIPAL_SOURCES}")
 
-addprefix(EVENTPIPE_SOURCES ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_SOURCES}")
-addprefix(EVENTPIPE_HEADERS ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_HEADERS}")
-
-set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ep-sources.c PROPERTIES COMPILE_DEFINITIONS EP_FORCE_INCLUDE_SOURCE_FILES)
-set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ds-sources.c PROPERTIES COMPILE_DEFINITIONS DS_FORCE_INCLUDE_SOURCE_FILES)
-
-set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES LANGUAGE CXX)
-set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES LANGUAGE CXX)
-
-if(CLR_CMAKE_HOST_UNIX)
-    set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-    set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-endif(CLR_CMAKE_HOST_UNIX)
-
-if (CLR_CMAKE_TARGET_WIN32)
-    set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES COMPILE_FLAGS "/FI\"${RUNTIME_DIR}/eventpipe/NativeaotEventPipeSupport.h\"")
-endif()
-
 list(APPEND AOT_EVENTPIPE_SHIM_SOURCES
   ${AOT_EVENTPIPE_SHIM_DIR}/ep-rt-aot.cpp
-  ${AOT_EVENTPIPE_SHIM_DIR}/ds-rt-aot.cpp  
+  ${AOT_EVENTPIPE_SHIM_DIR}/ds-rt-aot.cpp
 )
 
 list(APPEND AOT_EVENTPIPE_SHIM_HEADERS
@@ -229,18 +168,56 @@ if (FEATURE_EVENT_TRACE)
   endif()
 endif()
 
-
+# The NativeAOT EventPipe runtime is C++, but the EventPipe and DiagnosticServer sources are C.
+# Forcibly override them to build as C++.
+get_property(diagnosticserver_sources TARGET dn-diagnosticserver PROPERTY INTERFACE_SOURCES)
+get_property(diagnosticserver_pal_sources TARGET dn-diagnosticserver-pal PROPERTY INTERFACE_SOURCES)
+get_property(eventpipe_sources TARGET dn-eventpipe PROPERTY INTERFACE_SOURCES)
+set_source_files_properties(${diagnosticserver_sources} ${diagnosticserver_pal_sources} ${eventpipe_sources} PROPERTIES LANGUAGE CXX)
+
+add_library(eventpipe-shared-objects OBJECT)
+target_link_libraries(eventpipe-shared-objects PRIVATE dn-diagnosticserver dn-eventpipe dn-diagnosticserver-pal)
+# Build EventPipe and DiagnosticServer as unity-builds for better inlining.
+set_target_properties(eventpipe-shared-objects PROPERTIES
+  UNITY_BUILD ON
+  UNITY_BUILD_BATCH_SIZE 0
+  COMPILE_PDB_NAME "eventpipe-shared-objects"
+  COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>"
+)
+if (CLR_CMAKE_TARGET_WIN32)
+    add_library(eventpipe-shared-objects.GuardCF OBJECT)
+    target_link_libraries(eventpipe-shared-objects.GuardCF PRIVATE dn-diagnosticserver dn-eventpipe dn-diagnosticserver-pal)
+
+    target_compile_options(eventpipe-shared-objects PRIVATE
+        "/FI${RUNTIME_DIR}/eventpipe/NativeaotEventPipeSupport.h")
+
+    target_compile_options(eventpipe-shared-objects.GuardCF PRIVATE
+        "/FI${RUNTIME_DIR}/eventpipe/NativeaotEventPipeSupport.h")
+
+    # Build EventPipe and DiagnosticServer as unity-builds for better inlining.
+    set_target_properties(eventpipe-shared-objects.GuardCF PROPERTIES
+        UNITY_BUILD ON
+        UNITY_BUILD_BATCH_SIZE 0
+        CLR_CONTROL_FLOW_GUARD ON
+        COMPILE_PDB_NAME "eventpipe-shared-objects.GuardCF"
+        COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+
+    # Install the compile PDB for the eventpipe unity builds.
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/eventpipe-shared-objects.pdb" DESTINATION aotsdk COMPONENT nativeaot)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/eventpipe-shared-objects.GuardCF.pdb" DESTINATION aotsdk COMPONENT nativeaot)
+    # For the container library, we need to produce a compile PDB and install it
+    set_target_properties(dn-containers-no-lto PROPERTIES
+        COMPILE_PDB_NAME "dn-containers"
+        COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/dn-containers.pdb" DESTINATION aotsdk COMPONENT nativeaot)
+endif()
 
 list(APPEND EVENTPIPE_SOURCES
   ${AOT_EVENTPIPE_SHIM_SOURCES}
-  ${AOT_EVENTPIPE_SHIM_HEADERS}
   ${AOT_EVENTPIPE_MANAGED_TO_NATIVE_SOURCES}
   ${AOT_EVENTTRACE_SOURCES}
-  ${SHARED_EVENTPIPE_CONFIG_HEADERS}
   ${GEN_EVENTPIPE_PROVIDER_SOURCES}
   ${GEN_EVENTPIPE_PLAT_AGNOSTIC_SOURCES}
-  ${CONTAINER_SOURCES}
-  ${CONTAINER_HEADERS}
   ${MINIPAL_SOURCES}
 )
 
@@ -253,6 +230,8 @@ list(APPEND AOT_EVENTPIPE_DISABLED_SOURCES
 )
 
 add_library(eventpipe-enabled STATIC ${EVENTPIPE_SOURCES})
+
+target_link_libraries(eventpipe-enabled PRIVATE eventpipe-shared-objects dn-containers-no-lto)
 add_dependencies(eventpipe-enabled aot_eventing_headers)
 if(CLR_CMAKE_TARGET_WIN32)
   add_dependencies(eventpipe-enabled aot_etw_headers)
@@ -263,6 +242,7 @@ add_dependencies(eventpipe-disabled aot_eventing_headers)
 
 if (CLR_CMAKE_TARGET_WIN32)
   add_library(eventpipe-enabled.GuardCF STATIC ${EVENTPIPE_SOURCES})
+  target_link_libraries(eventpipe-enabled.GuardCF PRIVATE eventpipe-shared-objects.GuardCF dn-containers-no-lto)
   add_dependencies(eventpipe-enabled.GuardCF aot_eventing_headers)
   add_dependencies(eventpipe-enabled.GuardCF aot_etw_headers)
   add_library(eventpipe-disabled.GuardCF STATIC ${AOT_EVENTPIPE_DISABLED_SOURCES})
@@ -276,4 +256,4 @@ install_static_library(eventpipe-disabled aotsdk nativeaot)
 if (CLR_CMAKE_TARGET_WIN32)
   install_static_library(eventpipe-enabled.GuardCF aotsdk nativeaot)
   install_static_library(eventpipe-disabled.GuardCF aotsdk nativeaot)
-endif (CLR_CMAKE_TARGET_WIN32)
\ No newline at end of file
+endif (CLR_CMAKE_TARGET_WIN32)
diff --git a/src/coreclr/vm/eventing/eventpipe/CMakeLists.txt b/src/coreclr/vm/eventing/eventpipe/CMakeLists.txt
index 666761a1123928..e6a4ba24e3bead 100644
--- a/src/coreclr/vm/eventing/eventpipe/CMakeLists.txt
+++ b/src/coreclr/vm/eventing/eventpipe/CMakeLists.txt
@@ -28,47 +28,6 @@ add_custom_command(OUTPUT ${GEN_EVENTPIPE_SOURCES}
   COMMAND ${GENERATE_COMMAND}
   DEPENDS ${GENERATE_SCRIPT} ${EVENT_MANIFEST} ${EVENT_EXCLUSIONS})
 
-set (CONTAINER_SOURCES "")
-set (CONTAINER_HEADERS "")
-set (EVENTPIPE_SOURCES "")
-set (EVENTPIPE_HEADERS "")
-set (CORECLR_EVENTPIPE_SHIM_SOURCES "")
-set (CORECLR_EVENTPIPE_SHIM_HEADERS "")
-
-set (SHARED_CONTAINERS_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/containers")
-set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
-set (CORECLR_EVENTPIPE_SHIM_SOURCE_PATH "${CORECLR_EVENTPIPE_SHIM_DIR}")
-
-include (${SHARED_CONTAINERS_SOURCE_PATH}/containers.cmake)
-include (${SHARED_EVENTPIPE_SOURCE_PATH}/eventpipe.cmake)
-
-list(APPEND EVENTPIPE_SOURCES
-  ${SHARED_EVENTPIPE_SOURCES}
-  ${SHARED_DIAGNOSTIC_SERVER_SOURCES}
-)
-
-list(APPEND EVENTPIPE_HEADERS
-  ${SHARED_EVENTPIPE_HEADERS}
-  ${SHARED_DIAGNOSTIC_SERVER_HEADERS}
-)
-
-addprefix(CONTAINER_SOURCES ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_SOURCES}")
-addprefix(CONTAINER_HEADERS ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_HEADERS}")
-
-addprefix(EVENTPIPE_SOURCES ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_SOURCES}")
-addprefix(EVENTPIPE_HEADERS ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_HEADERS}")
-
-set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ep-sources.c PROPERTIES COMPILE_DEFINITIONS EP_FORCE_INCLUDE_SOURCE_FILES)
-set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ds-sources.c PROPERTIES COMPILE_DEFINITIONS DS_FORCE_INCLUDE_SOURCE_FILES)
-
-set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES LANGUAGE CXX)
-set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES LANGUAGE CXX)
-
-if(CLR_CMAKE_HOST_UNIX)
-    set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-    set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-endif(CLR_CMAKE_HOST_UNIX)
-
 list(APPEND CORECLR_EVENTPIPE_SHIM_SOURCES
   ep-rt-coreclr.cpp
 )
@@ -81,28 +40,28 @@ list(APPEND CORECLR_EVENTPIPE_SHIM_HEADERS
   ep-rt-types-coreclr.h
 )
 
-addprefix(CORECLR_EVENTPIPE_SHIM_SOURCES ${CORECLR_EVENTPIPE_SHIM_SOURCE_PATH} "${CORECLR_EVENTPIPE_SHIM_SOURCES}")
-addprefix(CORECLR_EVENTPIPE_SHIM_HEADERS ${CORECLR_EVENTPIPE_SHIM_SOURCE_PATH} "${CORECLR_EVENTPIPE_SHIM_HEADERS}")
-
-
-list(APPEND EVENTPIPE_SOURCES
-  ${CORECLR_EVENTPIPE_SHIM_SOURCES}
-  ${CORECLR_EVENTPIPE_SHIM_HEADERS}
-  ${EVENTPIPE_HEADERS}
-  ${SHARED_EVENTPIPE_CONFIG_HEADERS}
-  ${CONTAINER_SOURCES}
-  ${CONTAINER_HEADERS}
-)
-
 add_library_clr(eventpipe_gen_objs OBJECT ${GEN_EVENTPIPE_SOURCES})
 target_precompile_headers(eventpipe_gen_objs PRIVATE [["common.h"]])
 set_target_properties(eventpipe_gen_objs PROPERTIES LINKER_LANGUAGE CXX)
 add_dependencies(eventpipe_gen_objs eventing_headers)
 
-add_library_clr(eventpipe_objs OBJECT ${EVENTPIPE_SOURCES})
-target_precompile_headers(eventpipe_objs PRIVATE [["common.h"]])
-set_target_properties(eventpipe_objs PROPERTIES LINKER_LANGUAGE CXX)
+add_library_clr(eventpipe_objs OBJECT ${CORECLR_EVENTPIPE_SHIM_SOURCES} ${CORECLR_EVENTPIPE_SHIM_HEADERS})
+set_target_properties(eventpipe_objs PROPERTIES
+    LINKER_LANGUAGE CXX
+    UNITY_BUILD ON
+    UNITY_BUILD_BATCH_SIZE 0
+)
 add_dependencies(eventpipe_objs eventing_headers)
+target_link_libraries(eventpipe_objs PRIVATE dn-diagnosticserver dn-eventpipe)
+
+# The CoreCLR EventPipe runtime is C++, but the EventPipe and DiagnosticServer sources are C.
+# Forcibly override them to build as C++.
+get_property(diagnosticserver_sources TARGET dn-diagnosticserver PROPERTY INTERFACE_SOURCES)
+get_property(eventpipe_sources TARGET dn-eventpipe PROPERTY INTERFACE_SOURCES)
+set_source_files_properties(${diagnosticserver_sources} ${eventpipe_sources} PROPERTIES LANGUAGE CXX)
+
+# Build EventPipe and DiagnosticServer as unity-builds.
+set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
 
 add_library(eventpipe INTERFACE)
-target_sources(eventpipe INTERFACE $<TARGET_OBJECTS:eventpipe_gen_objs> $<TARGET_OBJECTS:eventpipe_objs>)
+target_sources(eventpipe INTERFACE $<TARGET_OBJECTS:eventpipe_gen_objs> $<TARGET_OBJECTS:eventpipe_objs> $<TARGET_OBJECTS:dn-containers>)
diff --git a/src/mono/mono/component/CMakeLists.txt b/src/mono/mono/component/CMakeLists.txt
index f61b3dc09e172a..578ee25d3bd7e6 100644
--- a/src/mono/mono/component/CMakeLists.txt
+++ b/src/mono/mono/component/CMakeLists.txt
@@ -9,6 +9,9 @@ set(MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME "diagnostics_tracing")
 set(MONO_DEBUGGER_COMPONENT_NAME "debugger")
 set(MONO_MARSHAL_ILGEN_COMPONENT_NAME "marshal-ilgen")
 
+add_subdirectory(${SHARED_CONTAINERS_SOURCE_PATH} containers)
+add_subdirectory(${SHARED_EVENTPIPE_SOURCE_PATH} eventpipe)
+
 # a list of every component.
 set(components "")
 # a list of components needed by the AOT compiler
@@ -70,7 +73,6 @@ include_directories(
 )
 
 set(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-sources
-  ${container_sources}
   ${eventpipe_sources}
   ${diagnostic_server_sources}
   ${MONO_COMPONENT_PATH}/event_pipe.c
@@ -213,6 +215,29 @@ elseif(AOT_COMPONENTS OR (NOT DISABLE_COMPONENTS AND STATIC_COMPONENTS))
 
 endif()
 
+if (ENABLE_PERFTRACING AND "${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}" IN_LIST components_to_build)
+    # Build EventPipe and DiagnosticServer with the Mono runtime implementation as unity-builds.
+    add_library(eventpipe-mono-objects OBJECT)
+    set_target_properties(
+        eventpipe-mono-objects
+        PROPERTIES
+        UNITY_BUILD ON
+        UNITY_BUILD_BATCH_SIZE 0
+    )
+    target_link_libraries(eventpipe-mono-objects PRIVATE component_base eglib_api dn-eventpipe dn-diagnosticserver dn-diagnosticserver-pal)
+    # Link the diagnostics_tracing component to the EventPipe and DiagnosticServer libraries.
+    if (TARGET ${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-objects)
+        target_sources(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-objects PRIVATE $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
+        list(APPEND mono-components-objects $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
+    endif()
+    if (TARGET mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-static)
+        target_sources(mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-static PRIVATE $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
+    endif()
+    if (TARGET mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME})
+        target_sources(mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME} PRIVATE $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
+    endif()
+endif()
+
 # define a list of mono-components-stubs objects that will be linked into
 # the runtime to be used as fallbacks if the dynamic components are not
 # available or when only static component stubs are requested.
diff --git a/src/mono/mono/eventpipe/eventpipe.cmake b/src/mono/mono/eventpipe/eventpipe.cmake
index 6f3c0bf16cd374..642173c80dea1c 100644
--- a/src/mono/mono/eventpipe/eventpipe.cmake
+++ b/src/mono/mono/eventpipe/eventpipe.cmake
@@ -1,28 +1,6 @@
 include(${MONO_EVENTPIPE_SHIM_SOURCE_PATH}/gen-eventing.cmake)
 
-# For feature detection to work correctly, this needs to be outside of the conditional.
-set(EP_GENERATED_HEADER_PATH "${MONO_EVENTPIPE_GEN_INCLUDE_PATH}")
-include(${SHARED_EVENTPIPE_SOURCE_PATH}configure.cmake)
-
 if(ENABLE_PERFTRACING)
-
-    if (TARGET_S390X)
-        add_definitions(-DBIGENDIAN)
-    endif (TARGET_S390X)
-
-    include (${SHARED_CONTAINERS_SOURCE_PATH}containers.cmake)
-
-    set(container_sources "")
-
-    list(APPEND container_sources
-        ${SHARED_CONTAINER_SOURCES}
-        ${SHARED_CONTAINER_HEADERS}
-    )
-
-    addprefix(container_sources ${SHARED_CONTAINERS_SOURCE_PATH} "${container_sources}")
-
-    include (${SHARED_EVENTPIPE_SOURCE_PATH}eventpipe.cmake)
-
     set(MONO_EVENTPIPE_SHIM_SOURCES "")
     set(MONO_EVENTPIPE_SHIM_HEADERS "")
 
@@ -50,24 +28,10 @@ if(ENABLE_PERFTRACING)
         ds-rt-types-mono.h
     )
 
-    set(shared_eventpipe_sources_base "")
     set(mono_eventpipe_shim_sources_base "")
 
-    set(shared_diagnostic_server_sources_base "")
     set(mono_diagnostic_server_shim_sources_base "")
 
-    list(APPEND shared_eventpipe_sources_base
-        ${SHARED_EVENTPIPE_SOURCES}
-        ${SHARED_EVENTPIPE_HEADERS}
-    )
-
-    list(APPEND shared_diagnostic_server_sources_base
-        ${SHARED_DIAGNOSTIC_SERVER_SOURCES}
-        ${SHARED_DIAGNOSTIC_SERVER_HEADERS}
-        ${SHARED_DIAGNOSTIC_SERVER_PAL_SOURCES}
-        ${SHARED_DIAGNOSTIC_SERVER_PAL_HEADERS}
-    )
-
     list(APPEND mono_eventpipe_shim_sources_base
         ${MONO_EVENTPIPE_SHIM_SOURCES}
         ${MONO_EVENTPIPE_SHIM_HEADERS}
@@ -78,16 +42,11 @@ if(ENABLE_PERFTRACING)
         ${MONO_DIAGNOSTIC_SERVER_SHIM_HEADERS}
     )
 
-    addprefix(shared_eventpipe_sources_base ${SHARED_EVENTPIPE_SOURCE_PATH} "${shared_eventpipe_sources_base}")
     addprefix(mono_eventpipe_shim_sources_base ${MONO_EVENTPIPE_SHIM_SOURCE_PATH} "${mono_eventpipe_shim_sources_base}")
 
-    addprefix(shared_diagnostic_server_sources_base ${SHARED_EVENTPIPE_SOURCE_PATH} "${shared_diagnostic_server_sources_base}")
     addprefix(mono_diagnostic_server_shim_sources_base ${MONO_EVENTPIPE_SHIM_SOURCE_PATH} "${mono_diagnostic_server_shim_sources_base}")
 
-    set(eventpipe_sources ${shared_eventpipe_sources_base} ${SHARED_EVENTPIPE_CONFIG_HEADERS} ${mono_eventpipe_shim_sources_base} ${MONO_EVENTPIPE_GEN_HEADERS} ${MONO_EVENTPIPE_GEN_SOURCES})
-    set(diagnostic_server_sources ${shared_diagnostic_server_sources_base} ${mono_diagnostic_server_shim_sources_base})
-
-    set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ep-sources.c PROPERTIES COMPILE_DEFINITIONS EP_FORCE_INCLUDE_SOURCE_FILES)
-    set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ds-sources.c PROPERTIES COMPILE_DEFINITIONS DS_FORCE_INCLUDE_SOURCE_FILES)
+    set(eventpipe_sources ${mono_eventpipe_shim_sources_base} ${MONO_EVENTPIPE_GEN_HEADERS} ${MONO_EVENTPIPE_GEN_SOURCES})
+    set(diagnostic_server_sources ${mono_diagnostic_server_shim_sources_base})
 
 endif(ENABLE_PERFTRACING)
diff --git a/src/mono/mono/mini/CMakeLists.txt b/src/mono/mono/mini/CMakeLists.txt
index b9bd9d426bc686..93ff6c431ef03b 100644
--- a/src/mono/mono/mini/CMakeLists.txt
+++ b/src/mono/mono/mini/CMakeLists.txt
@@ -49,14 +49,6 @@ endif()
 # MINI
 #
 
-set(imported_native_sources
-    ../../../native/containers/dn-simdhash.c
-    ../../../native/containers/dn-simdhash-ptr-ptr.c
-    ../../../native/containers/dn-simdhash-string-ptr.c
-    ../../../native/containers/dn-simdhash-u32-ptr.c
-    ../../../native/containers/dn-simdhash-ght-compatible.c
-    ../../../native/containers/dn-simdhash-ptrpair-ptr.c)
-
 set(mini_common_sources
     mini.c
     mini-runtime.c
@@ -310,7 +302,7 @@ else()
 set(profiler_sources "")
 endif()
 
-set(mini_sources "main-core.c;${imported_native_sources};${mini_common_sources};${arch_sources};${os_sources};${mini_interp_sources};${llvm_sources};${debugger_sources};${profiler_sources};${llvm_runtime_sources}")
+set(mini_sources "main-core.c;${mini_common_sources};${arch_sources};${os_sources};${mini_interp_sources};${llvm_sources};${debugger_sources};${profiler_sources};${llvm_runtime_sources}")
 
 if(LLVM_INCLUDEDIR)
   include_directories(BEFORE SYSTEM "${LLVM_INCLUDEDIR}")
@@ -341,6 +333,7 @@ endif()
 
 add_library(monosgen-static STATIC $<TARGET_OBJECTS:eglib_objects> $<TARGET_OBJECTS:utils_objects> $<TARGET_OBJECTS:sgen_objects> $<TARGET_OBJECTS:metadata_objects> $<TARGET_OBJECTS:monosgen-objects>)
 set_target_properties(monosgen-static PROPERTIES OUTPUT_NAME ${MONO_LIB_NAME})
+target_link_libraries(monosgen-static PRIVATE dn-containers)
 
 if(DISABLE_COMPONENTS OR AOT_COMPONENTS)
   # add component fallback stubs into static mono library when components have been disabled.
@@ -366,9 +359,9 @@ if(NOT DISABLE_SHARED_LIBS)
     set_target_properties(monosgen-shared PROPERTIES INSTALL_RPATH "$ORIGIN")
   endif()
   if(HOST_WIN32)
-    target_link_libraries(monosgen-shared PRIVATE monoapi eglib_objects utils_objects_shared sgen_objects_shared metadata_objects_shared)
+    target_link_libraries(monosgen-shared PRIVATE monoapi eglib_objects utils_objects_shared sgen_objects_shared metadata_objects_shared dn-containers)
   else()
-    target_link_libraries(monosgen-shared PRIVATE monoapi eglib_objects utils_objects sgen_objects metadata_objects)
+    target_link_libraries(monosgen-shared PRIVATE monoapi eglib_objects utils_objects sgen_objects metadata_objects dn-containers)
   endif()
   target_include_directories (monosgen-shared PRIVATE monoapi)
   if(TARGET_WIN32)
@@ -424,7 +417,7 @@ if(NOT DISABLE_SHARED_LIBS)
         endif()
         add_library(${frameworkconfig} SHARED $<TARGET_OBJECTS:monosgen-objects>)
         target_compile_definitions(${frameworkconfig} PRIVATE -DMONO_DLL_EXPORT)
-        target_link_libraries(${frameworkconfig} PRIVATE monoapi eglib_objects utils_objects sgen_objects metadata_objects)
+        target_link_libraries(${frameworkconfig} PRIVATE monoapi eglib_objects utils_objects sgen_objects metadata_objects dn-containers)
         target_link_libraries(${frameworkconfig} PRIVATE ${OS_LIBS} ${LLVM_LIBS} ${Z_LIBS})
 
         set_property(TARGET ${frameworkconfig} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-compatibility_version -Wl,2.0 -Wl,-current_version -Wl,2.0")
@@ -541,7 +534,7 @@ if(NOT DISABLE_EXECUTABLES)
       set_target_properties(mono-sgen PROPERTIES INSTALL_RPATH "$ORIGIN")
     endif()
   endif()
-  target_link_libraries(mono-sgen PRIVATE monoapi eglib_api monosgen-static)
+  target_link_libraries(mono-sgen PRIVATE monoapi eglib_api monosgen-static dn-containers)
   if (HOST_WASM)
     target_link_libraries(mono-sgen PRIVATE mono-wasm-nosimd)
   endif()
diff --git a/src/native/containers/CMakeLists.txt b/src/native/containers/CMakeLists.txt
new file mode 100644
index 00000000000000..a277e82e57afbb
--- /dev/null
+++ b/src/native/containers/CMakeLists.txt
@@ -0,0 +1,33 @@
+set(SOURCES
+    dn-allocator.c
+    dn-fwd-list.c
+    dn-list.c
+    dn-queue.c
+    dn-umap.c
+    dn-vector.c
+    dn-simdhash.c
+    dn-simdhash-string-ptr.c
+    dn-simdhash-u32-ptr.c
+    dn-simdhash-ptr-ptr.c
+    dn-simdhash-ght-compatible.c
+    dn-simdhash-ptrpair-ptr.c
+    dn-simdhash-utils.c
+)
+
+# Build two variants of the container library as some of our scenarios
+# are not compatible with LTO, (i.e. NativeAOT).
+add_library(dn-containers OBJECT ${SOURCES})
+add_library(dn-containers-no-lto OBJECT ${SOURCES})
+
+configure_file(dn-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/dn-config.h)
+
+target_include_directories(dn-containers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(dn-containers PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+set_target_properties(dn-containers PROPERTIES CLR_CONTROL_FLOW_GUARD ON)
+
+target_include_directories(dn-containers-no-lto PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(dn-containers-no-lto PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+set_target_properties(dn-containers-no-lto
+    PROPERTIES
+    CLR_CONTROL_FLOW_GUARD ON
+    INTERPROCEDURAL_OPTIMIZATION OFF)
diff --git a/src/native/containers/containers.cmake b/src/native/containers/containers.cmake
deleted file mode 100644
index 4749dceea2dd9a..00000000000000
--- a/src/native/containers/containers.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-set (SHARED_CONTAINER_SOURCES "")
-set (SHARED_CONTAINER_HEADERS "")
-
-list(APPEND SHARED_CONTAINER_SOURCES
-    dn-allocator.c
-    dn-fwd-list.c
-    dn-list.c
-    dn-queue.c
-    dn-umap.c
-    dn-vector.c
-    # FIXME: Including these here causes a linker collision with sgen metadata
-    # dn-simdhash.c
-    # dn-simdhash-string-ptr.c
-    # dn-simdhash-u32-ptr.c
-    # dn-simdhash-ptr-ptr.c
-    # dn-simdhash-ght-compatible.c
-    # dn-simdhash-ptrpair-ptr.c
-)
-
-list(APPEND SHARED_CONTAINER_HEADERS
-    dn-allocator.h
-    dn-fwd-list.h
-    dn-list.h
-    dn-queue.h
-    dn-sort-frag.inc
-    dn-umap.h
-    dn-umap-t.h
-    dn-utils.h
-    dn-vector.h
-    dn-vector-priv.h
-    dn-vector-ptr.h
-    dn-vector-t.h
-    dn-vector-types.h
-    dn-simdhash.h
-    dn-simdhash-specialization.h
-    dn-simdhash-specialization-declarations.h
-    dn-simdhash-specializations.h
-    dn-simdhash-arch.h
-    dn-simdhash-string-ptr.h
-    dn-simdhash-utils.h
-)
diff --git a/src/native/containers/dn-allocator.h b/src/native/containers/dn-allocator.h
index ef4e3d15f815b1..ee4f5093126a33 100644
--- a/src/native/containers/dn-allocator.h
+++ b/src/native/containers/dn-allocator.h
@@ -8,6 +8,10 @@
 #include <stdlib.h>
 #include <memory.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DN_ALLOCATOR_MEM_ALIGN8 8
 #define DN_ALLOCATOR_MEM_ALIGN16 16
 #define DN_ALLOCATOR_MAX_ALIGNMENT DN_ALLOCATOR_MEM_ALIGN16
@@ -104,4 +108,8 @@ dn_allocator_fixed_or_malloc_reset (dn_allocator_fixed_or_malloc_t *allocator);
 #define DN_DEFAULT_ALLOCATOR NULL
 #define DN_DEFAULT_LOCAL_ALLOCATOR(var_name, buffer_size) DN_ALLOCATOR_FIXED_OR_MALLOC (var_name, buffer_size)
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* __DN_ALLOCATOR_H__ */
diff --git a/src/native/containers/dn-config.h.in b/src/native/containers/dn-config.h.in
new file mode 100644
index 00000000000000..99192a359f87af
--- /dev/null
+++ b/src/native/containers/dn-config.h.in
@@ -0,0 +1,8 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+#ifndef DN_CONFIG_H
+#define DN_CONFIG_H
+
+#cmakedefine SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@
+
+#endif // DN_CONFIG_H
diff --git a/src/native/containers/dn-fwd-list.h b/src/native/containers/dn-fwd-list.h
index c5c809d070a606..6cc376222d272c 100644
--- a/src/native/containers/dn-fwd-list.h
+++ b/src/native/containers/dn-fwd-list.h
@@ -7,6 +7,10 @@
 #include "dn-utils.h"
 #include "dn-allocator.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef int32_t (DN_CALLBACK_CALLTYPE *dn_fwd_list_compare_func_t) (const void *a, const void *b);
 typedef bool (DN_CALLBACK_CALLTYPE *dn_fwd_list_equal_func_t) (const void *a, const void *b);
 typedef void (DN_CALLBACK_CALLTYPE *dn_fwd_list_for_each_func_t) (void *data, void *user_data);
@@ -321,4 +325,8 @@ dn_fwd_list_find (
 	return dn_fwd_list_custom_find (list, data, NULL);
 }
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* __DN_FWD_LIST_H__ */
diff --git a/src/native/containers/dn-list.h b/src/native/containers/dn-list.h
index 1b16c15b74c32f..e96588c2ee9152 100644
--- a/src/native/containers/dn-list.h
+++ b/src/native/containers/dn-list.h
@@ -7,6 +7,10 @@
 #include "dn-utils.h"
 #include "dn-allocator.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef int32_t (DN_CALLBACK_CALLTYPE *dn_list_compare_func_t) (const void *a, const void *b);
 typedef bool (DN_CALLBACK_CALLTYPE *dn_list_equal_func_t) (const void *a, const void *b);
 typedef void (DN_CALLBACK_CALLTYPE *dn_list_for_each_func_t) (void *data, void *user_data);
@@ -371,4 +375,8 @@ dn_list_find (
 	return dn_list_custom_find (list, data, NULL);
 }
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* __DN_LIST_H__ */
diff --git a/src/native/containers/dn-queue.h b/src/native/containers/dn-queue.h
index 93e886b9261c44..3003d4af87ae02 100644
--- a/src/native/containers/dn-queue.h
+++ b/src/native/containers/dn-queue.h
@@ -8,6 +8,10 @@
 #include "dn-allocator.h"
 #include "dn-list.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef void (DN_CALLBACK_CALLTYPE *dn_queue_dispose_func_t) (void *data);
 
 typedef struct _dn_queue_t dn_queue_t;
@@ -144,4 +148,8 @@ dn_queue_clear (dn_queue_t *queue)
 	dn_queue_custom_clear (queue, NULL);
 }
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* __DN_QUEUE_H__ */
diff --git a/src/native/containers/dn-simdhash-ght-compatible.c b/src/native/containers/dn-simdhash-ght-compatible.c
index eced9aac478c89..af0cf96365ecfc 100644
--- a/src/native/containers/dn-simdhash-ght-compatible.c
+++ b/src/native/containers/dn-simdhash-ght-compatible.c
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #ifndef NO_CONFIG_H
-#include <config.h>
+#include <dn-config.h>
 #endif
 #include "dn-simdhash.h"
 
diff --git a/src/native/containers/dn-simdhash-ptr-ptr.c b/src/native/containers/dn-simdhash-ptr-ptr.c
index 25e7530d39dc48..80501ffc3fa992 100644
--- a/src/native/containers/dn-simdhash-ptr-ptr.c
+++ b/src/native/containers/dn-simdhash-ptr-ptr.c
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #ifndef NO_CONFIG_H
-#include <config.h>
+#include <dn-config.h>
 #endif
 #include "dn-simdhash.h"
 
diff --git a/src/native/containers/dn-simdhash-ptrpair-ptr.c b/src/native/containers/dn-simdhash-ptrpair-ptr.c
index d377647b6636ac..a427c7e76ef9c1 100644
--- a/src/native/containers/dn-simdhash-ptrpair-ptr.c
+++ b/src/native/containers/dn-simdhash-ptrpair-ptr.c
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#include <config.h>
+#include <dn-config.h>
 #include "dn-simdhash.h"
 
 #include "dn-simdhash-utils.h"
diff --git a/src/native/containers/dn-simdhash-string-ptr.c b/src/native/containers/dn-simdhash-string-ptr.c
index 87c00f40f01822..4bd03896506657 100644
--- a/src/native/containers/dn-simdhash-string-ptr.c
+++ b/src/native/containers/dn-simdhash-string-ptr.c
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #ifndef NO_CONFIG_H
-#include <config.h>
+#include <dn-config.h>
 #endif
 #include "dn-simdhash.h"
 
diff --git a/src/native/containers/dn-simdhash-utils.c b/src/native/containers/dn-simdhash-utils.c
new file mode 100644
index 00000000000000..32d740c83219f4
--- /dev/null
+++ b/src/native/containers/dn-simdhash-utils.c
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#include "dn-utils.h"
+#include "dn-simdhash-utils.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+// Define a default implementation of the assert failure function.
+
+#ifdef _MSC_VER
+#define DEFINE_ALTERNATENAME_3(part) _Pragma(#part)
+#define DEFINE_ALTERNATENAME_2(part) DEFINE_ALTERNATENAME_3(comment(linker, part))
+#define DEFINE_ALTERNATENAME_1(part) DEFINE_ALTERNATENAME_2(#part)
+#define DEFINE_ALTERNATENAME(alias, func) DEFINE_ALTERNATENAME_1(/ALTERNATENAME:alias=func)
+#ifdef _M_IX86
+#define DEFAULT_IMPLEMENTATION(func, impl, retval) DEFINE_ALTERNATENAME(_ ## func, _ ## impl) retval __cdecl impl
+#else
+#define DEFAULT_IMPLEMENTATION(func, impl, retval) DEFINE_ALTERNATENAME(func, impl) retval impl
+#endif
+#else
+#define DEFAULT_IMPLEMENTATION(func, impl, retval) __attribute__((weak)) retval func
+#endif
+
+DEFAULT_IMPLEMENTATION(dn_simdhash_assert_fail, dn_simdhash_assert_fail_default, void) (const char *file, int line, const char *condition)
+{
+    fprintf(stderr, "Assertion failed:%s\n\tFile: %s\n\tLine:%d\n", condition, file, line);
+    abort();
+}
diff --git a/src/native/containers/dn-simdhash-utils.h b/src/native/containers/dn-simdhash-utils.h
index 889127d4088a8b..ce14b810974281 100644
--- a/src/native/containers/dn-simdhash-utils.h
+++ b/src/native/containers/dn-simdhash-utils.h
@@ -179,6 +179,9 @@ MurmurHash3_32_streaming (const uint8_t *key, uint32_t seed)
 // end of reformulated murmur3-32
 
 void
+#ifdef _MSC_VER
+__cdecl
+#endif
 dn_simdhash_assert_fail (const char *file, int line, const char *condition);
 
 #define dn_simdhash_assert(expr) \
diff --git a/src/native/containers/dn-umap.c b/src/native/containers/dn-umap.c
index 6935a30c57de13..40848b41e834f6 100644
--- a/src/native/containers/dn-umap.c
+++ b/src/native/containers/dn-umap.c
@@ -318,7 +318,7 @@ dn_umap_begin (dn_umap_t *map)
 		index ++;
 	}
 
-	dn_umap_it_t it = { map, map->_internal._buckets [index], index };
+	dn_umap_it_t it = { { map, map->_internal._buckets [index], index } };
 	return it;
 }
 
@@ -541,7 +541,7 @@ dn_umap_custom_find (
 
 	for (dn_umap_node_t *node = map->_internal._buckets [hashcode]; node; node = node->next) {
 		if (equal_func (node->key, key)) {
-			dn_umap_it_t found = { map, node, hashcode };
+			dn_umap_it_t found = { { map, node, hashcode } };
 			return found;
 		}
 	}
diff --git a/src/native/containers/dn-umap.h b/src/native/containers/dn-umap.h
index 140d9bf288ba29..b83eba38755bdd 100644
--- a/src/native/containers/dn-umap.h
+++ b/src/native/containers/dn-umap.h
@@ -7,6 +7,10 @@
 #include "dn-utils.h"
 #include "dn-allocator.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef uint32_t (DN_CALLBACK_CALLTYPE *dn_umap_hash_func_t) (const void *key);
 typedef bool (DN_CALLBACK_CALLTYPE *dn_umap_equal_func_t) (const void *a, const void *b);
 typedef void (DN_CALLBACK_CALLTYPE *dn_umap_key_dispose_func_t) (void *key);
@@ -274,4 +278,8 @@ uint32_t
 DN_CALLBACK_CALLTYPE
 dn_str_hash (const void *v1);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* __DN_UMAP_H__ */
diff --git a/src/native/containers/dn-vector-priv.h b/src/native/containers/dn-vector-priv.h
index 9b373aa08e5b98..6ebe242a568a5e 100644
--- a/src/native/containers/dn-vector-priv.h
+++ b/src/native/containers/dn-vector-priv.h
@@ -8,6 +8,10 @@
 #include "dn-allocator.h"
 #include "dn-vector-types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 bool
 _dn_vector_ensure_capacity (
 	dn_vector_t *vector,
@@ -92,4 +96,8 @@ _dn_vector_find_adapter (
 	*found = _dn_vector_custom_find (vector, data, equal_func);
 }
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* __DN_VECTOR_PRIV_H__ */
diff --git a/src/native/containers/dn-vector.h b/src/native/containers/dn-vector.h
index 462dc54867d69a..4a810e72d5bb73 100644
--- a/src/native/containers/dn-vector.h
+++ b/src/native/containers/dn-vector.h
@@ -9,6 +9,10 @@
 #include "dn-vector-types.h"
 #include "dn-vector-priv.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static inline dn_vector_it_t
 dn_vector_begin (dn_vector_t *vector)
 {
@@ -325,4 +329,8 @@ dn_vector_find (
 	return dn_vector_custom_find (vector, value, equal_func);
 }
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* __DN_VECTOR_H__ */
diff --git a/src/native/eventpipe/CMakeLists.txt b/src/native/eventpipe/CMakeLists.txt
new file mode 100644
index 00000000000000..311293ca5f45cc
--- /dev/null
+++ b/src/native/eventpipe/CMakeLists.txt
@@ -0,0 +1,86 @@
+include(CheckSymbolExists)
+include(CheckIncludeFile)
+
+check_include_file(
+    sys/socket.h
+    HAVE_SYS_SOCKET_H
+)
+
+check_symbol_exists(
+    accept4
+    sys/socket.h
+    HAVE_ACCEPT4)
+
+# Use TCP for EventPipe on mobile platforms
+if (CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_ANDROID)
+  set(FEATURE_PERFTRACING_PAL_TCP 1)
+  set(FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT 1)
+endif()
+
+configure_file(${CLR_SRC_NATIVE_DIR}/eventpipe/ep-shared-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/ep-shared-config.h)
+
+# Define the DiagnosticsServer and EventPipe as interface libraries.
+# We must define them as interface libraries as each runtime builds the same set of files slightly differently.
+# Defining it as an interface library allows us to specify common sources, include directories, dependencies, etc.
+# in one place, but also allow each runtime to add any settings that are specific to that runtime.
+# This includes, but is not limited to each runtime's implementation of the ds-rt.h and ep-rt.h contracts.
+
+add_library(dn-diagnosticserver INTERFACE)
+
+target_sources(dn-diagnosticserver INTERFACE
+    ds-dump-protocol.c
+    ds-eventpipe-protocol.c
+    ds-ipc.c
+    ds-portable-rid.c
+    ds-process-protocol.c
+    ds-profiler-protocol.c
+    ds-protocol.c
+    ds-server.c)
+
+target_include_directories(dn-diagnosticserver INTERFACE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(dn-diagnosticserver INTERFACE dn-containers)
+
+add_library(dn-diagnosticserver-pal INTERFACE)
+target_include_directories(dn-diagnosticserver-pal INTERFACE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(dn-diagnosticserver-pal INTERFACE dn-containers)
+
+if (FEATURE_PERFTRACING_PAL_TCP)
+    target_sources(dn-diagnosticserver-pal INTERFACE
+        ds-ipc-pal-socket.c
+    )
+elseif(HOST_WIN32 OR CLR_CMAKE_TARGET_WIN32)
+    target_sources(dn-diagnosticserver-pal INTERFACE
+        ds-ipc-pal-namedpipe.c
+    )
+else()
+    target_sources(dn-diagnosticserver-pal INTERFACE
+        ds-ipc-pal-socket.c
+    )
+endif (FEATURE_PERFTRACING_PAL_TCP)
+
+
+add_library(dn-eventpipe INTERFACE)
+target_sources(dn-eventpipe INTERFACE
+    ep.c
+    ep-block.c
+    ep-buffer.c
+    ep-buffer-manager.c
+    ep-config.c
+    ep-event.c
+    ep-event-instance.c
+    ep-event-payload.c
+    ep-event-source.c
+    ep-file.c
+    ep-json-file.c
+    ep-metadata-generator.c
+    ep-provider.c
+    ep-sample-profiler.c
+    ep-session.c
+    ep-session-provider.c
+    ep-stack-contents.c
+    ep-stream.c
+    ep-string.c
+    ep-thread.c)
+
+target_include_directories(dn-eventpipe INTERFACE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(dn-eventpipe INTERFACE dn-containers)
diff --git a/src/native/eventpipe/ds-ipc-pal-socket.h b/src/native/eventpipe/ds-ipc-pal-socket.h
index cd8280aee64769..04ba9f2273d8f7 100644
--- a/src/native/eventpipe/ds-ipc-pal-socket.h
+++ b/src/native/eventpipe/ds-ipc-pal-socket.h
@@ -12,18 +12,18 @@
 #endif
 #include "ds-getter-setter.h"
 
-#ifdef HOST_WIN32
-#include <winsock2.h>
-typedef SOCKET ds_ipc_socket_t;
-typedef SOCKADDR ds_ipc_socket_address_t;
-typedef ADDRESS_FAMILY ds_ipc_socket_family_t;
-typedef int ds_ipc_socket_len_t;
-#else
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 typedef int ds_ipc_socket_t;
 typedef struct sockaddr ds_ipc_socket_address_t;
 typedef int ds_ipc_socket_family_t;
 typedef socklen_t ds_ipc_socket_len_t;
+#else
+#include <winsock2.h>
+typedef SOCKET ds_ipc_socket_t;
+typedef SOCKADDR ds_ipc_socket_address_t;
+typedef ADDRESS_FAMILY ds_ipc_socket_family_t;
+typedef int ds_ipc_socket_len_t;
 #endif
 
 /*
diff --git a/src/native/eventpipe/ds-sources.c b/src/native/eventpipe/ds-portable-rid.c
similarity index 74%
rename from src/native/eventpipe/ds-sources.c
rename to src/native/eventpipe/ds-portable-rid.c
index 35e5568ca98b14..ff7950729f5a1f 100644
--- a/src/native/eventpipe/ds-sources.c
+++ b/src/native/eventpipe/ds-portable-rid.c
@@ -4,20 +4,6 @@
 
 #include "ds-types.h"
 
-// Option to include all internal source files into ds-sources.c.
-#ifdef DS_INCLUDE_SOURCE_FILES
-#ifndef DS_FORCE_INCLUDE_SOURCE_FILES
-#define DS_FORCE_INCLUDE_SOURCE_FILES
-#endif
-#include "ds-server.c"
-#include "ds-eventpipe-protocol.c"
-#include "ds-dump-protocol.c"
-#include "ds-ipc.c"
-#include "ds-process-protocol.c"
-#include "ds-profiler-protocol.c"
-#include "ds-protocol.c"
-#endif
-
 #undef PORTABLE_RID_OS
 
 #if defined(TARGET_BROWSER)
@@ -75,6 +61,3 @@
 const ep_char8_t* _ds_portable_rid_info = PORTABLE_RID_OS "-" PORTABLE_RID_ARCH;
 
 #endif /* ENABLE_PERFTRACING */
-
-extern const char quiet_linker_empty_file_warning_diagnostics_sources;
-const char quiet_linker_empty_file_warning_diagnostics_sources = 0;
diff --git a/src/native/eventpipe/ep-rt-config.h b/src/native/eventpipe/ep-rt-config.h
index ea4475227339a9..040b853b989d28 100644
--- a/src/native/eventpipe/ep-rt-config.h
+++ b/src/native/eventpipe/ep-rt-config.h
@@ -16,7 +16,7 @@
 #define DS_RT_H <mono/eventpipe/ds-rt-mono.h>
 #define DS_RT_TYPES_H <mono/eventpipe/ds-rt-types-mono.h>
 
-#elif defined(FEATURE_CORECLR) 
+#elif defined(FEATURE_CORECLR)
 
 #ifndef EP_NO_RT_DEPENDENCY
 #include "common.h"
@@ -76,8 +76,4 @@
 
 #define EP_INLINE_GETTER_SETTER
 
-#ifdef EP_INLINE_GETTER_SETTER
-#define EP_INCLUDE_SOURCE_FILES
-#endif
-
 #endif /* __EVENTPIPE_RT_CONFIG_H__ */
diff --git a/src/native/eventpipe/ep-shared-config.h.in b/src/native/eventpipe/ep-shared-config.h.in
index 9fd64d11c0dfc5..94cb0e27d3c4ff 100644
--- a/src/native/eventpipe/ep-shared-config.h.in
+++ b/src/native/eventpipe/ep-shared-config.h.in
@@ -1,7 +1,35 @@
 #ifndef EP_SHARED_CONFIG_H_INCLUDED
 #define EP_SHARED_CONFIG_H_INCLUDED
 
+#cmakedefine01 HAVE_SYS_SOCKET_H
 /* This platforms supports setting flags atomically when accepting connections. */
 #cmakedefine01 HAVE_ACCEPT4
 
-#endif //EP_SHARED_CONFIG_H_INCLUDED
\ No newline at end of file
+#cmakedefine FEATURE_PERFTRACING_PAL_TCP
+#ifdef FEATURE_PERFTRACING_PAL_TCP
+#define ENABLE_PERFTRACING_PAL_TCP
+#endif
+
+#cmakedefine FEATURE_PERFTRACING_DISABLE_PERFTRACING_LISTEN_PORTS
+#ifdef FEATURE_PERFTRACING_DISABLE_PERFTRACING_LISTEN_PORTS
+#define DISABLE_PERFTRACING_LISTEN_PORTS
+#endif
+
+#cmakedefine FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT
+#ifdef FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT
+#define DISABLE_PERFTRACING_DEFAULT_LISTEN_PORT
+#endif
+
+#cmakedefine FEATURE_PERFTRACING_DISABLE_CONNECT_PORTS
+#ifdef FEATURE_PERFTRACING_DISABLE_CONNECT_PORTS
+#define DISABLE_PERFTRACING_CONNECT_PORTS
+#endif
+
+#define CMAKE_C_BYTE_ORDER_LITTLE_ENDIAN 0
+#define CMAKE_C_BYTE_ORDER_BIG_ENDIAN 1
+#cmakedefine CMAKE_C_BYTE_ORDER CMAKE_C_BYTE_ORDER_@CMAKE_C_BYTE_ORDER@
+#if CMAKE_C_BYTE_ORDER == CMAKE_C_BYTE_ORDER_BIG_ENDIAN
+#define BIGENDIAN
+#endif
+
+#endif //EP_SHARED_CONFIG_H_INCLUDED
diff --git a/src/native/eventpipe/ep-sources.c b/src/native/eventpipe/ep-sources.c
deleted file mode 100644
index 6c1822e218438d..00000000000000
--- a/src/native/eventpipe/ep-sources.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "ep-rt-config.h"
-
-#ifdef ENABLE_PERFTRACING
-
-// Option to include all internal source files into ep-sources.c.
-#ifdef EP_INCLUDE_SOURCE_FILES
-#ifndef EP_FORCE_INCLUDE_SOURCE_FILES
-#define EP_FORCE_INCLUDE_SOURCE_FILES
-#endif
-#include "ep.c"
-#include "ep-block.c"
-#include "ep-buffer.c"
-#include "ep-buffer-manager.c"
-#include "ep-config.c"
-#include "ep-event.c"
-#include "ep-event-instance.c"
-#include "ep-event-payload.c"
-#include "ep-event-source.c"
-#include "ep-file.c"
-#include "ep-json-file.c"
-#include "ep-metadata-generator.c"
-#include "ep-provider.c"
-#include "ep-sample-profiler.c"
-#include "ep-session.c"
-#include "ep-session-provider.c"
-#include "ep-stack-contents.c"
-#include "ep-stream.c"
-#include "ep-string.c"
-#include "ep-thread.c"
-#endif
-
-#endif /* ENABLE_PERFTRACING */
-
-extern const char quiet_linker_empty_file_warning_eventpipe_sources;
-const char quiet_linker_empty_file_warning_eventpipe_sources = 0;
diff --git a/src/native/eventpipe/eventpipe.cmake b/src/native/eventpipe/eventpipe.cmake
deleted file mode 100644
index 6e093d39b5092b..00000000000000
--- a/src/native/eventpipe/eventpipe.cmake
+++ /dev/null
@@ -1,133 +0,0 @@
-if(ENABLE_PERFTRACING OR FEATURE_PERFTRACING)
-    set (SHARED_EVENTPIPE_SOURCES "")
-    set (SHARED_EVENTPIPE_HEADERS "")
-    set (SHARED_DIAGNOSTIC_SERVER_SOURCES "")
-    set (SHARED_DIAGNOSTIC_SERVER_HEADERS "")
-
-    if (FEATURE_PERFTRACING_PAL_TCP)
-        add_definitions(-DENABLE_PERFTRACING_PAL_TCP)
-    endif (FEATURE_PERFTRACING_PAL_TCP)
-
-    if (FEATURE_PERFTRACING_DISABLE_PERFTRACING_LISTEN_PORTS)
-        add_definitions(-DDISABLE_PERFTRACING_LISTEN_PORTS)
-    endif (FEATURE_PERFTRACING_DISABLE_PERFTRACING_LISTEN_PORTS)
-
-    if (FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT)
-        add_definitions(-DDISABLE_PERFTRACING_DEFAULT_LISTEN_PORT)
-    endif (FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT)
-
-    if (FEATURE_PERFTRACING_DISABLE_CONNECT_PORTS)
-        add_definitions(-DDISABLE_PERFTRACING_CONNECT_PORTS)
-    endif (FEATURE_PERFTRACING_DISABLE_CONNECT_PORTS)
-
-    list(APPEND SHARED_EVENTPIPE_SOURCES
-        ep-sources.c
-        ep.c
-        ep-block.c
-        ep-buffer.c
-        ep-buffer-manager.c
-        ep-config.c
-        ep-event.c
-        ep-event-instance.c
-        ep-event-payload.c
-        ep-event-source.c
-        ep-file.c
-        ep-json-file.c
-        ep-metadata-generator.c
-        ep-provider.c
-        ep-sample-profiler.c
-        ep-session.c
-        ep-session-provider.c
-        ep-stack-contents.c
-        ep-stream.c
-        ep-string.c
-        ep-thread.c
-    )
-
-    list(APPEND SHARED_EVENTPIPE_HEADERS
-        ep.h
-        ep-block.h
-        ep-buffer.h
-        ep-buffer-manager.h
-        ep-config.h
-        ep-config-internals.h
-        ep-event.h
-        ep-event-instance.h
-        ep-event-payload.h
-        ep-event-source.h
-        ep-file.h
-        ep-getter-setter.h
-        ep-ipc-pal-types.h
-        ep-ipc-pal-types-forward.h
-        ep-ipc-stream.h
-        ep-json-file.h
-        ep-metadata-generator.h
-        ep-provider.h
-        ep-provider-internals.h
-        ep-rt.h
-        ep-rt-config.h
-        ep-rt-types.h
-        ep-sample-profiler.h
-        ep-session.h
-        ep-session-provider.h
-        ep-stack-contents.h
-        ep-stream.h
-        ep-string.h
-        ep-thread.h
-        ep-types.h
-        ep-types-forward.h
-    )
-
-    list(APPEND SHARED_DIAGNOSTIC_SERVER_SOURCES
-        ds-sources.c
-        ds-dump-protocol.c
-        ds-eventpipe-protocol.c
-        ds-ipc.c
-        ds-process-protocol.c
-        ds-profiler-protocol.c
-        ds-protocol.c
-        ds-server.c
-    )
-
-    list(APPEND SHARED_DIAGNOSTIC_SERVER_HEADERS
-        ds-dump-protocol.h
-        ds-eventpipe-protocol.h
-        ds-getter-setter.h
-        ds-ipc.h
-        ds-ipc-pal.h
-        ds-ipc-pal-types.h
-        ds-process-protocol.h
-        ds-profiler-protocol.h
-        ds-protocol.h
-        ds-rt.h
-        ds-rt-config.h
-        ds-rt-types.h
-        ds-server.h
-        ds-types.h
-    )
-    if (FEATURE_PERFTRACING_PAL_TCP)
-            list(APPEND SHARED_DIAGNOSTIC_SERVER_PAL_SOURCES
-                ds-ipc-pal-socket.c
-            )
-            list(APPEND SHARED_DIAGNOSTIC_SERVER_PAL_HEADERS
-                ds-ipc-pal-socket.h
-            )
-    else (FEATURE_PERFTRACING_PAL_TCP)
-        if(HOST_WIN32 OR CLR_CMAKE_TARGET_WIN32)
-            list(APPEND SHARED_DIAGNOSTIC_SERVER_PAL_SOURCES
-                ds-ipc-pal-namedpipe.c
-            )
-            list(APPEND SHARED_DIAGNOSTIC_SERVER_PAL_HEADERS
-                ds-ipc-pal-namedpipe.h
-            )
-        else(HOST_WIN32 OR CLR_CMAKE_TARGET_WIN32)
-            list(APPEND SHARED_DIAGNOSTIC_SERVER_PAL_SOURCES
-                ds-ipc-pal-socket.c
-            )
-            list(APPEND SHARED_DIAGNOSTIC_SERVER_PAL_HEADERS
-                ds-ipc-pal-socket.h
-            )
-        endif(HOST_WIN32 OR CLR_CMAKE_TARGET_WIN32)
-    endif (FEATURE_PERFTRACING_PAL_TCP)
-
-endif(ENABLE_PERFTRACING OR FEATURE_PERFTRACING)