Merge InternalABI module in COM_ABI target

Package.swift

@@ -21,18 +21,13 @@ let package = Package(
             dependencies: ["COM_ABI"],
             path: "Support/Sources/WindowsRuntime_ABI",
             exclude: ["CMakeLists.txt"]),
-        .target(
-            name: "COM_InternalABI",
-            dependencies: ["COM_ABI", "WindowsRuntime_ABI"],
-            path: "Support/Sources/COM_InternalABI",
-            exclude: ["CMakeLists.txt"]),
         .target(
             name: "ABIBindings",
             path: "Support/Sources/ABIBindings",
             exclude: ["CMakeLists.txt"]),
         .target(
             name: "COM",
-            dependencies: ["ABIBindings", "COM_ABI", "COM_InternalABI"],
+            dependencies: ["ABIBindings", "COM_ABI"],
             path: "Support/Sources/COM",
             exclude: ["CMakeLists.txt"]),
         .target(

Support/Sources/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_subdirectory(COM_ABI)
-add_subdirectory(COM_InternalABI)
 add_subdirectory(WindowsRuntime_ABI)
 
 add_subdirectory(ABIBindings)

Support/Sources/COM/CMakeLists.txt

@@ -1,6 +1,5 @@
 file(GLOB_RECURSE SOURCES *.swift)
 add_library(COM STATIC ${SOURCES})
 target_link_libraries(COM PUBLIC ABIBindings COM_ABI)
-target_link_libraries(COM PRIVATE COM_InternalABI)
 # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/26346
 target_include_directories(COM INTERFACE "${CMAKE_CURRENT_BINARY_DIR}")

Support/Sources/COM/COMEmbedding.swift

@@ -1,5 +1,5 @@
 import COM_ABI
-import SWRT_SwiftCOMObject
+import COM_PrivateABI
 
 /// Protocol for Swift objects which embed COM interfaces.
 public protocol COMEmbedderWithDelegatedImplementation: IUnknownProtocol {

Support/Sources/COM_ABI/include/module.modulemap

@@ -10,3 +10,8 @@ module COM_ABI {
     header "SWRT/windows/wtypes.h"
     export *
 }
+
+module COM_PrivateABI {
+    header "SwiftCOMObject.h"
+    export *
+}