1 files changed, 1 insertions, 20 deletions
diff --git a/src/expr/expr_manager.h b/src/expr/expr_manager.h
index 3ea1b581a..67fa0664a 100644
--- a/src/expr/expr_manager.h
+++ b/src/expr/expr_manager.h
@@ -18,7 +18,6 @@
 
 #include "cvc4_config.h"
 #include "expr/kind.h"
-#include "expr/node_manager.h"
 #include <vector>
 
 namespace CVC4 {
@@ -29,6 +28,7 @@ class BooleanType;
 class FunctionType; 
 class KindType;
 class SmtEngine;
+class NodeManager;
 
 class CVC4_PUBLIC ExprManager {
 
@@ -126,24 +126,5 @@ private:
 
 }/* CVC4 namespace */
 
-#include "expr/expr.h"
-
-namespace CVC4 {
-
-/**
- * A wrapper (essentially) for NodeManagerScope.  Without this, we'd
- * need Expr to be a friend of ExprManager.
- */
-class ExprManagerScope {
-  NodeManagerScope d_nms;
-public:
-  inline ExprManagerScope(const Expr& e) :
-    d_nms(e.getExprManager() == NULL ?
-          NodeManager::currentNM() : e.getExprManager()->getNodeManager()) {
-  }
-};
-
-}/* CVC4 namespace */
-
 #endif /* __CVC4__EXPR_MANAGER_H */