5 files changed, 15 insertions, 3 deletions
diff --git a/src/expr/expr.i b/src/expr/expr.i
index ff4d219a2..6ed7f2d25 100644
--- a/src/expr/expr.i
+++ b/src/expr/expr.i
@@ -22,4 +22,10 @@
 %rename(getChild) CVC4::Expr::operator[](unsigned i) const;
 %ignore CVC4::Expr::operator bool() const;// can just use isNull()
 
+namespace CVC4 {
+  namespace expr {
+    %ignore exportInternal;
+  }/* CVC4::expr namespace */
+}/* CVC4 namespace */
+
 %include "expr/expr.h"
diff --git a/src/expr/expr_manager_template.cpp b/src/expr/expr_manager_template.cpp
index 83a80ed13..46a7bb82c 100644
--- a/src/expr/expr_manager_template.cpp
+++ b/src/expr/expr_manager_template.cpp
@@ -11,7 +11,7 @@
  ** See the file COPYING in the top-level source directory for licensing
  ** information.\endverbatim
  **
- ** \brief Public-facing expression manager interface, implementation.
+ ** \brief Public-facing expression manager interface, implementation
  **
  ** Public-facing expression manager interface, implementation.
  **/
diff --git a/src/expr/expr_manager_template.h b/src/expr/expr_manager_template.h
index eecb40f3e..2abd05821 100644
--- a/src/expr/expr_manager_template.h
+++ b/src/expr/expr_manager_template.h
@@ -11,7 +11,7 @@
  ** See the file COPYING in the top-level source directory for licensing
  ** information.\endverbatim
  **
- ** \brief Public-facing expression manager interface.
+ ** \brief Public-facing expression manager interface
  **
  ** Public-facing expression manager interface.
  **/
diff --git a/src/expr/type.i b/src/expr/type.i
index acde96955..13ae9663e 100644
--- a/src/expr/type.i
+++ b/src/expr/type.i
@@ -31,4 +31,10 @@
 %rename(toSortConstructorType) CVC4::Type::operator SortConstructorType() const;
 %rename(toKindType) CVC4::Type::operator KindType() const;
 
+namespace CVC4 {
+  namespace expr {
+    %ignore exportTypeInternal;
+  }/* CVC4::expr namespace */
+}/* CVC4 namespace */
+
 %include "expr/type.h"
diff --git a/src/expr/variable_type_map.h b/src/expr/variable_type_map.h
index a34bec846..8f3f4a27b 100644
--- a/src/expr/variable_type_map.h
+++ b/src/expr/variable_type_map.h
@@ -57,7 +57,7 @@ struct CVC4_PUBLIC ExprManagerMapCollection {
   VariableTypeMap d_typeMap;
   VarMap d_to;
   VarMap d_from;
-};
+};/* struct ExprManagerMapCollection */
 
 }/* CVC4 namespace */