5 files changed, 14 insertions, 13 deletions
diff --git a/test/unit/context/cdlist_black.h b/test/unit/context/cdlist_black.h
index 5f473478c..5980972be 100644
--- a/test/unit/context/cdlist_black.h
+++ b/test/unit/context/cdlist_black.h
@@ -16,16 +16,14 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include <vector>
 #include <iostream>
-
 #include <limits.h>
+#include <vector>
 
-#include "memory.h"
-
-#include "util/exception.h"
+#include "base/exception.h"
 #include "context/context.h"
 #include "context/cdlist.h"
+#include "memory.h"
 
 using namespace std;
 using namespace CVC4::context;
diff --git a/test/unit/context/cdmap_white.h b/test/unit/context/cdmap_white.h
index 84b8242b4..11642c3e9 100644
--- a/test/unit/context/cdmap_white.h
+++ b/test/unit/context/cdmap_white.h
@@ -16,8 +16,8 @@
 
 #include <cxxtest/TestSuite.h>
 
+#include "base/cvc4_assert.h"
 #include "context/cdhashmap.h"
-#include "util/cvc4_assert.h"
 
 using namespace std;
 using namespace CVC4;
diff --git a/test/unit/context/cdo_black.h b/test/unit/context/cdo_black.h
index fe04421b4..4ca01df85 100644
--- a/test/unit/context/cdo_black.h
+++ b/test/unit/context/cdo_black.h
@@ -16,12 +16,13 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include <vector>
 #include <iostream>
-#include "context/context.h"
+#include <vector>
+
+#include "base/cvc4_assert.h"
 #include "context/cdlist.h"
 #include "context/cdo.h"
-#include "util/cvc4_assert.h"
+#include "context/context.h"
 
 using namespace std;
 using namespace CVC4;
diff --git a/test/unit/context/context_black.h b/test/unit/context/context_black.h
index f72cc05f4..d7148c990 100644
--- a/test/unit/context/context_black.h
+++ b/test/unit/context/context_black.h
@@ -16,12 +16,14 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include <vector>
 #include <iostream>
-#include "context/context.h"
+#include <vector>
+
+#include "base/cvc4_assert.h"
 #include "context/cdlist.h"
 #include "context/cdo.h"
-#include "util/cvc4_assert.h"
+#include "context/context.h"
+
 
 using namespace std;
 using namespace CVC4;
diff --git a/test/unit/context/context_white.h b/test/unit/context/context_white.h
index 7ad70f061..10f603abd 100644
--- a/test/unit/context/context_white.h
+++ b/test/unit/context/context_white.h
@@ -16,9 +16,9 @@
 
 #include <cxxtest/TestSuite.h>
 
+#include "base/cvc4_assert.h"
 #include "context/context.h"
 #include "context/cdo.h"
-#include "util/cvc4_assert.h"
 
 using namespace std;
 using namespace CVC4;