1 files changed, 35 insertions, 1 deletions
diff --git a/libbuild2/cxx/target.hxx b/libbuild2/cxx/target.hxx
index b20bf00..06e8a67 100644
--- a/libbuild2/cxx/target.hxx
+++ b/libbuild2/cxx/target.hxx
@@ -7,7 +7,6 @@
 #include <libbuild2/types.hxx>
 #include <libbuild2/utility.hxx>
 
-#include <libbuild2/target.hxx>
 #include <libbuild2/cc/target.hxx>
 
 #include <libbuild2/cxx/export.hxx>
@@ -18,6 +17,7 @@ namespace build2
   {
     using cc::h;
     using cc::c;
+    using cc::m;
 
     class LIBBUILD2_CXX_SYMEXPORT hxx: public cc::cc
     {
@@ -88,6 +88,40 @@ namespace build2
     public:
       static const target_type static_type;
     };
+
+    // Objective-C++ source file.
+    //
+    class LIBBUILD2_CXX_SYMEXPORT mm: public cc::cc
+    {
+    public:
+      mm (context& c, dir_path d, dir_path o, string n)
+        : cc (c, move (d), move (o), move (n))
+      {
+        dynamic_type = &static_type;
+      }
+
+    public:
+      static const target_type static_type;
+    };
+
+    // This is an abstract base target for deriving additional targets (for
+    // example, Qt moc{}) that can be #include'd in C++ translation units. In
+    // particular, only such targets will be considered to reverse-lookup
+    // extensions to target types (see dyndep_rule::map_extension() for
+    // background).
+    //
+    class LIBBUILD2_CXX_SYMEXPORT cxx_inc: public cc::cc
+    {
+    public:
+      cxx_inc (context& c, dir_path d, dir_path o, string n)
+        : cc (c, move (d), move (o), move (n))
+      {
+        dynamic_type = &static_type;
+      }
+
+    public:
+      static const target_type static_type;
+    };
   }
 }