remove/shuffle some #include dependencies; fix some documentation; apply coding standards

1 files changed, 3 insertions, 4 deletions

diff --git a/src/expr/expr_template.cpp b/src/expr/expr_template.cpp
index 48acd2588..54e20667f 100644
--- a/src/expr/expr_template.cpp
+++ b/src/expr/expr_template.cpp
@@ -17,12 +17,9 @@
  **/
 
 #include "expr/expr.h"
-#include "expr/expr_manager.h"
 #include "expr/node.h"
-#include "util/Assert.h"
-
-#include "util/output.h"
 #include "expr/expr_manager_scope.h"
+#include "util/Assert.h"
 
 ${includes}
 
@@ -36,6 +33,8 @@ using namespace CVC4::kind;
 
 namespace CVC4 {
 
+class ExprManager;
+
 namespace expr {
 
 const int ExprSetDepth::s_iosIndex = std::ios_base::xalloc();