  
          out << "#include <hidl/ServiceManagement.h>\n";
      } else {
-@@ -818,6 +822,8 @@ void AST::generateCppSource(Formatter& out) const {
+@@ -807,8 +817,10 @@ void AST::generateCppSource(Formatter& out) const {
+     enterLeaveNamespace(out, true /* enter */);
+     out << "\n";
+ 
++#if 0 // M3E:
+     generateTypeSource(out, iface ? iface->localName() : "");
+-
++#endif
++    
+     if (iface) {
+         const Interface* iface = mRootScope.getInterface();
+ 
+@@ -818,6 +830,8 @@ void AST::generateCppSource(Formatter& out) const {
              << "::descriptor(\""
              << iface->fqName().string()
              << "\");\n\n";

         generateCppPackageInclude(out, mPackage, iface->getProxyName());
         generateCppPackageInclude(out, mPackage, iface->getStubName());
         generateCppPackageInclude(out, mPackage, iface->getPassthroughName());
@@ -795,6 +796,9 @@ void AST::generateCppSource(Formatter& out) const {
                                       superType->fqName(),
                                       superType->fqName().getInterfaceProxyName());
         }

     out << "\n";
 
     enterLeaveNamespace(out, false /* enter */);
@@ -1734,6 +1753,7 @@ void AST::generateInterfaceSource(Formatter& out) const {
         if (iface == superType) {
             out << "return parent;\n";
         } else {
