3 files changed, 11 insertions, 5 deletions
diff --git a/src/include/cvc4_private.h b/src/include/cvc4_private.h
index df5dd4a0b..298bb14fb 100644
--- a/src/include/cvc4_private.h
+++ b/src/include/cvc4_private.h
@@ -21,4 +21,7 @@
 #  warning 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"
+
 #endif /* __CVC4_PRIVATE_H */
diff --git a/src/include/cvc4_config.h b/src/include/cvc4_public.h
index 593e7a5e3..4de3faf4c 100644
--- a/src/include/cvc4_config.h
+++ b/src/include/cvc4_public.h
@@ -1,5 +1,5 @@
 /*********************                                                        */
-/** cvc4_config.h
+/** cvc4_public.h
  ** Original author: mdeters
  ** Major contributors: none
  ** Minor contributors (to current version): none
@@ -11,11 +11,11 @@
  ** information.
  **
  ** Macros that should be defined everywhere during the building of
- ** the libraries and driver binary.
+ ** the libraries and driver binary, and also exported to the user.
  **/
 
-#ifndef __CVC4_CONFIG_H
-#define __CVC4_CONFIG_H
+#ifndef __CVC4_PUBLIC_H
+#define __CVC4_PUBLIC_H
 
 #if defined _WIN32 || defined __CYGWIN__
 #  ifdef BUILDING_DLL
@@ -47,4 +47,4 @@
 #  define NULL ((void*) 0)
 #endif
 
-#endif /* __CVC4_CONFIG_H */
+#endif /* __CVC4_PUBLIC_H */
diff --git a/src/include/cvc4parser_private.h b/src/include/cvc4parser_private.h
index 72d942ef0..6704daca2 100644
--- a/src/include/cvc4parser_private.h
+++ b/src/include/cvc4parser_private.h
@@ -21,4 +21,7 @@
 #  warning 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) */
 
+#include "cvc4parser_public.h"
+#include "cvc4autoconfig.h"
+
 #endif /* __CVC4PARSER_PRIVATE_H */