diff --git a/XSC/be/CXX/Generator.cpp b/XSC/be/CXX/Generator.cpp
index 70dbd2d..b3a818c 100644
--- a/XSC/be/CXX/Generator.cpp
+++ b/XSC/be/CXX/Generator.cpp
@@ -148,13 +148,12 @@ generate (po::variables_map const& vm, Schema& schema, fs::path const& file_path
   std::string ixx_expr (vm["cxx-inline-regex"].as<std::string> ());
   std::string cxx_expr (vm["cxx-source-regex"].as<std::string> ());
 
-
-  //Output file names are named <name>.<suffix>
+  // Output file names are named <name>.<suffix>
   std::string hxx_name (regex::perl_s (name, hxx_expr) + hxx_suffix);
   std::string ixx_name (regex::perl_s (name, ixx_expr) + ixx_suffix);
   std::string cxx_name (regex::perl_s (name, cxx_expr) + cxx_suffix);
 
-  //File handlers are created for each file name
+  // File handlers are created for each file name
   fs::path hxx_path (hxx_name);
   fs::path ixx_path (ixx_name);
   fs::path cxx_path (cxx_name);
diff --git a/XSC/be/CXX/Header.cpp b/XSC/be/CXX/Header.cpp
index c5ac1bc..61a5494 100644
--- a/XSC/be/CXX/Header.cpp
+++ b/XSC/be/CXX/Header.cpp
@@ -936,7 +936,7 @@ generate_header (Context& ctx,
 
   if (ctx.cpp11())
   {
-    ctx.os << "#include \"tao/x11/stddef.h\"" << endl;
+    ctx.os << "#include \"tao/x11/base/stddef.h\"" << endl;
   }
 
   Traversal::Schema traverser;
diff --git a/XSC/be/CXX/Source.cpp b/XSC/be/CXX/Source.cpp
index af7b7fc..e36ebef 100644
--- a/XSC/be/CXX/Source.cpp
+++ b/XSC/be/CXX/Source.cpp
@@ -1145,8 +1145,8 @@ namespace
          << endl;
 
       os << scope << "::" << endl
-         << name << " (" << xml_element_type << " const& e)" << endl
-         << ":" << "Base (e)"
+         << name << " (" << xml_element_type << " const& element)" << endl
+         << ":" << "Base (element)"
          << "{"
          << endl;
     }
@@ -1161,7 +1161,7 @@ namespace
 
       if (he || ha)
       {
-        os << parser_type << " p (e);"
+        os << parser_type << " p (element);"
            << endl;
 
         if (he)