3 files changed, 10 insertions, 10 deletions
diff --git a/test/system/ouroborous.cpp b/test/system/ouroborous.cpp
index 4fbabf5f1..fd06517a9 100644
--- a/test/system/ouroborous.cpp
+++ b/test/system/ouroborous.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "expr/expr.h"
-#include "expr/command.h"
 #include "parser/parser.h"
 #include "parser/parser_builder.h"
+#include "smt_util/command.h"
 
 using namespace CVC4;
 using namespace CVC4::parser;
diff --git a/test/system/smt2_compliance.cpp b/test/system/smt2_compliance.cpp
index f754adc0e..108e30b5c 100644
--- a/test/system/smt2_compliance.cpp
+++ b/test/system/smt2_compliance.cpp
@@ -14,16 +14,16 @@
  ** A test of SMT-LIBv2 commands, checks for compliant output.
  **/
 
+#include <cassert>
 #include <iostream>
 #include <sstream>
-#include <cassert>
 
-#include "smt/options.h"
-#include "parser/parser.h"
 #include "expr/expr_manager.h"
-#include "expr/command.h"
-#include "smt/smt_engine.h"
+#include "options/smt_options.h"
+#include "parser/parser.h"
 #include "parser/parser_builder.h"
+#include "smt/smt_engine.h"
+#include "smt_util/command.h"
 
 using namespace CVC4;
 using namespace CVC4::parser;
diff --git a/test/system/statistics.cpp b/test/system/statistics.cpp
index f955bd150..baa901540 100644
--- a/test/system/statistics.cpp
+++ b/test/system/statistics.cpp
@@ -19,8 +19,9 @@
 #include <sstream>
 
 #include "expr/expr.h"
+#include "expr/sexpr.h"
+#include "expr/statistics.h"
 #include "smt/smt_engine.h"
-#include "util/statistics.h"
 
 using namespace CVC4;
 using namespace std;
@@ -53,7 +54,8 @@ int main() {
     cout << "stat1 " << (*i).first << " is " << stats.getStatistic((*i).first) << endl;
     cout << "stat2 " << (*i).first << " is " << (*i).second << endl;
     if(smt.getStatistic((*i).first) != (*i).second) {
-      cout << "SMT engine reports different value for statistic " << (*i).first << ": " << smt.getStatistic((*i).first) << endl;
+      cout << "SMT engine reports different value for statistic "
+           << (*i).first << ": " << smt.getStatistic((*i).first) << endl;
       exit(1);
     }
     different = different || stats.getStatistic((*i).first) != (*i).second;
@@ -68,5 +70,3 @@ int main() {
 
   return r == Result::VALID ? 0 : 1;
 }
-
-