5 files changed, 12 insertions, 9 deletions
diff --git a/src/include/cvc4_private.h b/src/include/cvc5_private.h
index 740665f04..1c328ef60 100644
--- a/src/include/cvc4_private.h
+++ b/src/include/cvc5_private.h
@@ -17,12 +17,11 @@
 #ifndef CVC5_PRIVATE_H
 #define CVC5_PRIVATE_H
 
-#if ! (defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST))
+#if !(defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST))
 #  error A private CVC4 header was included when not building the library or private unit test code.
 #endif /* ! (__BUILDING_CVC4LIB || __BUILDING_CVC4LIB_UNIT_TEST) */
 
-
-#include "cvc4_public.h"
 #include "cvc4autoconfig.h"
+#include "cvc5_public.h"
 
 #endif /* CVC5_PRIVATE_H */
diff --git a/src/include/cvc4_private_library.h b/src/include/cvc5_private_library.h
index 2062d4107..95c928fb5 100644
--- a/src/include/cvc4_private_library.h
+++ b/src/include/cvc5_private_library.h
@@ -22,9 +22,11 @@
       || defined(__BUILDING_CVC4PARSERLIB_UNIT_TEST)                       \
       || defined(__BUILDING_CVC4DRIVER))
 #  error A "private library" CVC4 header was included when not building the library, driver, or private unit test code.
-#endif /* ! (__BUILDING_CVC4LIB || __BUILDING_CVC4LIB_UNIT_TEST || __BUILDING_CVC4PARSERLIB || __BUILDING_CVC4PARSERLIB_UNIT_TEST || __BUILDING_CVC4DRIVER) */
+#endif /* ! (__BUILDING_CVC4LIB || __BUILDING_CVC4LIB_UNIT_TEST ||          \
+          __BUILDING_CVC4PARSERLIB || __BUILDING_CVC4PARSERLIB_UNIT_TEST || \
+          __BUILDING_CVC4DRIVER) */
 
-#include "cvc4_public.h"
 #include "cvc4autoconfig.h"
+#include "cvc5_public.h"
 
 #endif /* CVC5_PRIVATE_LIBRARY_H */
diff --git a/src/include/cvc4_public.h b/src/include/cvc5_public.h
index ede5f5223..ede5f5223 100644
--- a/src/include/cvc4_public.h
+++ b/src/include/cvc5_public.h
diff --git a/src/include/cvc4parser_private.h b/src/include/cvc5parser_private.h
index fd66ba394..aec3a09a5 100644
--- a/src/include/cvc4parser_private.h
+++ b/src/include/cvc5parser_private.h
@@ -17,11 +17,13 @@
 #ifndef __CVC4PARSER_PRIVATE_H
 #define __CVC4PARSER_PRIVATE_H
 
-#if ! (defined(__BUILDING_CVC4PARSERLIB) || defined(__BUILDING_CVC4PARSERLIB_UNIT_TEST))
+#if !(defined(__BUILDING_CVC4PARSERLIB) \
+      || defined(__BUILDING_CVC4PARSERLIB_UNIT_TEST))
 #  error A private CVC4 parser header was included when not building the parser library or private unit test code.
-#endif /* ! (__BUILDING_CVC4PARSERLIB || __BUILDING_CVC4PARSERLIB_UNIT_TEST) */
+#endif /* ! (__BUILDING_CVC4PARSERLIB || __BUILDING_CVC4PARSERLIB_UNIT_TEST) \
+        */
 
-#include "cvc4parser_public.h"
+#include "cvc5parser_public.h"
 // It would be nice to #include "cvc4autoconfig.h" here, but there are conflicts
 // with antlr3's autoheader stuff, which they export :(
 //
diff --git a/src/include/cvc4parser_public.h b/src/include/cvc5parser_public.h
index 408183a2d..099eb58c2 100644
--- a/src/include/cvc4parser_public.h
+++ b/src/include/cvc5parser_public.h
@@ -17,6 +17,6 @@
 #ifndef __CVC4PARSER_PUBLIC_H
 #define __CVC4PARSER_PUBLIC_H
 
-#include "cvc4_public.h"
+#include "cvc5_public.h"
 
 #endif /* __CVC4PARSER_PUBLIC_H */