diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 90ea2c6b..eff05c51 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -220,7 +220,7 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
 
 
 const char* OPJ_CALLCONV opj_version(void) {
-    return PACKAGE_VERSION;
+    return OPJ_PACKAGE_VERSION;
 }
 
 
diff --git a/opj_config.h.cmake.in b/opj_config.h.cmake.in
index b05f3055..372a74f7 100644
--- a/opj_config.h.cmake.in
+++ b/opj_config.h.cmake.in
@@ -1,29 +1,24 @@
 /* create config.h for CMake */
 #define PACKAGE_VERSION "@PACKAGE_VERSION@"
 
-#cmakedefine HAVE_INTTYPES_H
-#cmakedefine HAVE_MEMORY_H
-#cmakedefine HAVE_STDINT_H
-#cmakedefine HAVE_STDLIB_H
-#cmakedefine HAVE_STRINGS_H
-#cmakedefine HAVE_STRING_H
-#cmakedefine HAVE_SYS_STAT_H
-#cmakedefine HAVE_SYS_TYPES_H
-#ifndef HAVE_UNISTD_H
-#cmakedefine HAVE_UNISTD_H
-#endif /* HAVE_UNISTD_H */
-#cmakedefine HAVE_LIBPNG
-#cmakedefine HAVE_PNG_H
-#cmakedefine HAVE_LIBTIFF
-#cmakedefine HAVE_TIFF_H
+#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
+#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@
+#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@
+#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@
+#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@
+#cmakedefine HAVE_STRING_H @HAVE_STRING_H@
+#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@
+#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
+#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
+#cmakedefine HAVE_LIBPNG @HAVE_LIBPNG@
+#cmakedefine HAVE_PNG_H @HAVE_PNG_H@
+#cmakedefine HAVE_LIBTIFF @HAVE_LIBTIFF@
+#cmakedefine HAVE_TIFF_H @HAVE_TIFF_H@
 
 #cmakedefine _LARGEFILE_SOURCE
 #cmakedefine _LARGE_FILES
 #cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
-#ifndef HAVE_FSEEKO
-#cmakedefine HAVE_FSEEKO
-#endif /* HAVE_FSEEKO */
-
+#cmakedefine HAVE_FSEEKO @HAVE_FSEEKO@
 
 #cmakedefine HAVE_LIBLCMS1
 #cmakedefine HAVE_LIBLCMS2
diff --git a/thirdparty/libtiff/tif_config.h.cmake.in b/thirdparty/libtiff/tif_config.h.cmake.in
index c1dc4e38..455e7b32 100644
--- a/thirdparty/libtiff/tif_config.h.cmake.in
+++ b/thirdparty/libtiff/tif_config.h.cmake.in
@@ -238,7 +238,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION
+#cmakedefine PACKAGE_VERSION @PACKAGE_VERSION@
 
 /* Support Macintosh PackBits algorithm */
 #define PACKBITS_SUPPORT 1