diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9476c1d220..265f017175 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -714,6 +714,14 @@ void cmGeneratorTarget::GetObjectSources(
     this->Objects[it];
   }
 
+  if (this->Target->CxxModuleNeedsInterfaceObjects()) {
+    std::vector<cmSourceFile const*> bmiOnlySources;
+    this->GetCxxModuleSources(bmiOnlySources, config);
+    for (cmSourceFile const* sf : bmiOnlySources) {
+      this->Objects[sf];
+    }
+  }
+
   this->LocalGenerator->ComputeObjectFilenames(this->Objects, config, this);
   this->VisitedConfigsForObjects.insert(config);
 }
diff --git a/Source/cmGeneratorTarget_Sources.cxx b/Source/cmGeneratorTarget_Sources.cxx
index 5dc099eeb5..5ba2b2e313 100644
--- a/Source/cmGeneratorTarget_Sources.cxx
+++ b/Source/cmGeneratorTarget_Sources.cxx
@@ -429,9 +429,7 @@ void cmGeneratorTarget::ComputeKindedSources(KindedSources& files,
       kind = SourceKindCustomCommand;
     } else if (!this->Target->IsNormal() && !this->Target->IsImported() &&
                fs && (fs->GetType() == cm::FileSetMetadata::CXX_MODULES)) {
-      kind = this->Target->CxxModuleNeedsInterfaceObjects()
-        ? SourceKindObjectSource
-        : SourceKindCxxModuleSource;
+      kind = SourceKindCxxModuleSource;
     } else if (this->Target->GetType() == cm::TargetType::UTILITY ||
                this->Target->GetType() == cm::TargetType::INTERFACE_LIBRARY
                // XXX(clang-tidy): https://bugs.llvm.org/show_bug.cgi?id=44165
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 7e22dd241f..7e21358d90 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -766,7 +766,8 @@ std::string cmNinjaTargetGenerator::GetCompileTemplateVar(
   std::string const& lang) const
 {
   std::string cmdVar = cmStrCat("CMAKE_", lang, "_COMPILE_OBJECT");
-  if (!this->GetGeneratorTarget()->IsNormal()) {
+  if (!this->GetGeneratorTarget()->IsNormal() &&
+      !this->GeneratorTarget->Target->CxxModuleNeedsInterfaceObjects()) {
     std::string bmiCmdVar = cmStrCat("CMAKE_", lang, "_COMPILE_BMI");
     if (!this->GetMakefile()->GetDefinition(bmiCmdVar).IsEmpty()) {
       cmdVar = std::move(bmiCmdVar);
@@ -785,7 +786,9 @@ void cmNinjaTargetGenerator::WriteCompileRule(std::string const& lang,
     cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType()).c_str();
   vars.Language = lang.c_str();
   vars.Source = "$in";
-  vars.Object = "$out";
+  vars.Object = this->GeneratorTarget->Target->CxxModuleNeedsInterfaceObjects()
+    ? "$OBJ_FILE"
+    : "$out";
   vars.Defines = "$DEFINES";
   vars.Includes = "$INCLUDES";
   vars.TargetPDB = "$TARGET_PDB";
@@ -1938,6 +1941,10 @@ void cmNinjaTargetGenerator::WriteCxxModuleBmiBuildStatement(
   std::string const bmiFileName =
     this->ConvertToNinjaPath(this->GetBmiFilePath(source, config));
   std::string const bmiFileDir = cmSystemTools::GetFilenamePath(bmiFileName);
+  std::string const modIntfObj =
+    this->GeneratorTarget->Target->CxxModuleNeedsInterfaceObjects()
+    ? this->ConvertToNinjaPath(this->GetObjectFilePath(source, config))
+    : std::string{};
 
   int const commandLineLengthLimit = this->ForceResponseFile() ? -1 : 0;
 
@@ -1986,10 +1993,15 @@ void cmNinjaTargetGenerator::WriteCxxModuleBmiBuildStatement(
       language, sourceFilePath, bmiDir, targetSupportDir, bmiFileName,
       bmiFileDir, vars["FLAGS"], vars["DEFINES"], vars["INCLUDES"],
       vars["TARGET_COMPILE_PDB"], vars["TARGET_PDB"], config,
-      WithScanning::Yes);
+      WithScanning::Yes, modIntfObj);
   }
 
   bmiBuild.Outputs.push_back(bmiFileName);
+  if (!modIntfObj.empty()) {
+    bmiBuild.ImplicitOuts.push_back(modIntfObj);
+    vars["OBJ_FILE"] = this->ConvertToOutputFormatForShell(modIntfObj);
+    this->EnsureParentDirectoryExists(modIntfObj);
+  }
   bmiBuild.ExplicitDeps.push_back(sourceFilePath);
 
   std::vector<std::string> depList;
@@ -2584,11 +2596,11 @@ void cmNinjaTargetGenerator::EmitSwiftDependencyInfo(
 void cmNinjaTargetGenerator::ExportObjectCompileCommand(
   std::string const& language, std::string const& sourceFileName,
   std::string const& objectDir, std::string const& targetSupportDir,
-  std::string const& objectFileName, std::string const& objectFileDir,
+  std::string const& primaryOutput, std::string const& primaryOutputDir,
   std::string const& flags, std::string const& defines,
   std::string const& includes, std::string const& targetCompilePdb,
   std::string const& targetPdb, std::string const& outputConfig,
-  WithScanning withScanning)
+  WithScanning withScanning, std::string const& modIntfObj)
 {
   if (!this->GeneratorTarget->GetPropertyAsBool("EXPORT_COMPILE_COMMANDS")) {
     return;
@@ -2624,19 +2636,21 @@ void cmNinjaTargetGenerator::ExportObjectCompileCommand(
       // `cmNinjaTargetGenerator::WriteObjectBuildStatement` to expect the
       // corresponding file path.
       cmSystemTools::ReplaceString(modmapFlags, "<MODULE_MAP_FILE>",
-                                   cmStrCat(objectFileName, ".modmap"));
+                                   cmStrCat(primaryOutput, ".modmap"));
       fullFlags = cmStrCat(std::move(fullFlags), ' ', modmapFlags);
     }
   }
 
   compileObjectVars.Source = escapedSourceFileName.c_str();
-  std::string escapedObjectFileName =
-    this->LocalGenerator->ConvertToOutputFormat(objectFileName,
+  std::string const& compileOutput =
+    modIntfObj.empty() ? primaryOutput : modIntfObj;
+  std::string escapedCompileOutput =
+    this->LocalGenerator->ConvertToOutputFormat(compileOutput,
                                                 cmOutputConverter::SHELL);
-  compileObjectVars.Object = escapedObjectFileName.c_str();
+  compileObjectVars.Object = escapedCompileOutput.c_str();
   compileObjectVars.ObjectDir = objectDir.c_str();
   compileObjectVars.TargetSupportDir = targetSupportDir.c_str();
-  compileObjectVars.ObjectFileDir = objectFileDir.c_str();
+  compileObjectVars.ObjectFileDir = primaryOutputDir.c_str();
   compileObjectVars.Flags = fullFlags.c_str();
   compileObjectVars.Defines = defines.c_str();
   compileObjectVars.Includes = includes.c_str();
@@ -2694,7 +2708,7 @@ void cmNinjaTargetGenerator::ExportObjectCompileCommand(
     cmLocalNinjaGenerator::CommandLineContext::CompileCommands);
 
   this->GetGlobalGenerator()->AddCXXCompileCommand(cmdLine, sourceFileName,
-                                                   objectFileName);
+                                                   primaryOutput);
 }
 
 void cmNinjaTargetGenerator::ExportSwiftObjectCompileCommand(
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 13c96b1861..17d24e495c 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -202,11 +202,11 @@ protected:
   void ExportObjectCompileCommand(
     std::string const& language, std::string const& sourceFileName,
     std::string const& objectDir, std::string const& targetSupportDir,
-    std::string const& objectFileName, std::string const& objectFileDir,
+    std::string const& primaryOutput, std::string const& primaryOutputDir,
     std::string const& flags, std::string const& defines,
     std::string const& includes, std::string const& targetCompilePdb,
     std::string const& targetPdb, std::string const& outputConfig,
-    WithScanning withScanning);
+    WithScanning withScanning, std::string const& modIntfObj = {});
 
   void ExportSwiftObjectCompileCommand(
     std::vector<cmSourceFile const*> const& moduleSourceFiles,