16 files changed, 16 insertions, 17 deletions
diff --git a/src/context/backtrackable.h b/src/context/backtrackable.h
index 0c1081266..28654dbdf 100644
--- a/src/context/backtrackable.h
+++ b/src/context/backtrackable.h
@@ -13,7 +13,7 @@
  * Contains a backtrackable list.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__UTIL__BACKTRACKABLE_H
 #define CVC5__UTIL__BACKTRACKABLE_H
diff --git a/src/context/cddense_set.h b/src/context/cddense_set.h
index 5b45e9f58..16e98eb95 100644
--- a/src/context/cddense_set.h
+++ b/src/context/cddense_set.h
@@ -16,7 +16,7 @@
  * than the maximum key.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #pragma once
 
diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h
index 32b0cc8cc..5ea1fc5a7 100644
--- a/src/context/cdhashmap.h
+++ b/src/context/cdhashmap.h
@@ -78,7 +78,7 @@
  *     possible.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__CONTEXT__CDHASHMAP_H
 #define CVC5__CONTEXT__CDHASHMAP_H
diff --git a/src/context/cdhashmap_forward.h b/src/context/cdhashmap_forward.h
index ef7b9a6a4..4b7a43123 100644
--- a/src/context/cdhashmap_forward.h
+++ b/src/context/cdhashmap_forward.h
@@ -19,7 +19,7 @@
  * yourself, because it has a default template argument.
  */
 
-#include "cvc4_public.h"
+#include "cvc5_public.h"
 
 #ifndef CVC5__CONTEXT__CDHASHMAP_FORWARD_H
 #define CVC5__CONTEXT__CDHASHMAP_FORWARD_H
diff --git a/src/context/cdhashset.h b/src/context/cdhashset.h
index 416806e09..79c28769c 100644
--- a/src/context/cdhashset.h
+++ b/src/context/cdhashset.h
@@ -13,7 +13,7 @@
  * Context-dependent set class.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__CONTEXT__CDHASHSET_H
 #define CVC5__CONTEXT__CDHASHSET_H
diff --git a/src/context/cdhashset_forward.h b/src/context/cdhashset_forward.h
index 978576de6..02475de96 100644
--- a/src/context/cdhashset_forward.h
+++ b/src/context/cdhashset_forward.h
@@ -20,7 +20,7 @@
  * yourself, because it has a default template argument.
  */
 
-#include "cvc4_public.h"
+#include "cvc5_public.h"
 
 #ifndef CVC5__CONTEXT__CDSET_FORWARD_H
 #define CVC5__CONTEXT__CDSET_FORWARD_H
diff --git a/src/context/cdinsert_hashmap.h b/src/context/cdinsert_hashmap.h
index 2b7712924..b383fe931 100644
--- a/src/context/cdinsert_hashmap.h
+++ b/src/context/cdinsert_hashmap.h
@@ -31,8 +31,6 @@
  * - Supports insertAtContextLevelZero() if the element is not in the map.
  */
 
-#include "cvc4_private.h"
-
 #include <deque>
 #include <functional>
 #include <unordered_map>
@@ -42,6 +40,7 @@
 #include "base/output.h"
 #include "context/cdinsert_hashmap_forward.h"
 #include "context/context.h"
+#include "cvc5_private.h"
 #include "expr/node.h"
 
 #pragma once
diff --git a/src/context/cdinsert_hashmap_forward.h b/src/context/cdinsert_hashmap_forward.h
index 1c1bcae76..9e00e6dc4 100644
--- a/src/context/cdinsert_hashmap_forward.h
+++ b/src/context/cdinsert_hashmap_forward.h
@@ -21,7 +21,7 @@
  * yourself, because it has a default template argument.
  */
 
-#include "cvc4_public.h"
+#include "cvc5_public.h"
 
 #ifndef CVC5__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
 #define CVC5__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
diff --git a/src/context/cdlist.h b/src/context/cdlist.h
index 14f99e03e..2bb66eaf2 100644
--- a/src/context/cdlist.h
+++ b/src/context/cdlist.h
@@ -15,7 +15,7 @@
  * simply shortened.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__CONTEXT__CDLIST_H
 #define CVC5__CONTEXT__CDLIST_H
diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h
index d8a583922..993a48084 100644
--- a/src/context/cdlist_forward.h
+++ b/src/context/cdlist_forward.h
@@ -26,7 +26,7 @@
  * different compilation units).
  */
 
-#include "cvc4_public.h"
+#include "cvc5_public.h"
 
 #ifndef CVC5__CONTEXT__CDLIST_FORWARD_H
 #define CVC5__CONTEXT__CDLIST_FORWARD_H
diff --git a/src/context/cdmaybe.h b/src/context/cdmaybe.h
index f89313af1..904e77ccc 100644
--- a/src/context/cdmaybe.h
+++ b/src/context/cdmaybe.h
@@ -17,7 +17,7 @@
  * assignment.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #pragma once
 
diff --git a/src/context/cdo.h b/src/context/cdo.h
index 5fdf3fd6d..f73a3ae1f 100644
--- a/src/context/cdo.h
+++ b/src/context/cdo.h
@@ -13,7 +13,7 @@
  * A context-dependent object.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__CONTEXT__CDO_H
 #define CVC5__CONTEXT__CDO_H
diff --git a/src/context/cdqueue.h b/src/context/cdqueue.h
index dc7994957..b95890a01 100644
--- a/src/context/cdqueue.h
+++ b/src/context/cdqueue.h
@@ -20,7 +20,7 @@
  * size_t for tracking the previous size of the list.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__CONTEXT__CDQUEUE_H
 #define CVC5__CONTEXT__CDQUEUE_H
diff --git a/src/context/cdtrail_queue.h b/src/context/cdtrail_queue.h
index 09aa9a29e..4240d34c4 100644
--- a/src/context/cdtrail_queue.h
+++ b/src/context/cdtrail_queue.h
@@ -17,7 +17,7 @@
  * The implementation is currently not full featured.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__CONTEXT__CDTRAIL_QUEUE_H
 #define CVC5__CONTEXT__CDTRAIL_QUEUE_H
diff --git a/src/context/context.h b/src/context/context.h
index 1ccddfa59..7dad00ded 100644
--- a/src/context/context.h
+++ b/src/context/context.h
@@ -13,7 +13,7 @@
  * Context class and context manager.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__CONTEXT__CONTEXT_H
 #define CVC5__CONTEXT__CONTEXT_H
diff --git a/src/context/context_mm.h b/src/context/context_mm.h
index 725f713ac..10cc7d1c9 100644
--- a/src/context/context_mm.h
+++ b/src/context/context_mm.h
@@ -15,7 +15,7 @@
  * Designed for use by ContextManager.
  */
 
-#include "cvc4_private.h"
+#include "cvc5_private.h"
 
 #ifndef CVC5__CONTEXT__CONTEXT_MM_H
 #define CVC5__CONTEXT__CONTEXT_MM_H