diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index 80ccf9906..3bf2c4bd6 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -110,6 +110,10 @@ unset(CMAKE_REQUIRED_FLAGS)
 set(LIBMINIZIP_SRCS ioapi.c mztools.c unzip.c zip.c)
 
 set(LIBMINIZIP_HDRS crypt.h ints.h ioapi.h mztools.h unzip.h zip.h)
+list(TRANSFORM LIBMINIZIP_HDRS PREPEND compat/ OUTPUT_VARIABLE LIBMINIZIP_HDRS_COMPAT)
+
+set(LIBMINIZIP_PC ${minizip_BINARY_DIR}/minizip.pc)
+configure_file(${minizip_SOURCE_DIR}/minizip.pc.txt ${LIBMINIZIP_PC} @ONLY)
 
 set(MINIZIP_SRCS ioapi.c $<$<BOOL:${WIN32}>:iowin32.c> minizip.c zip.c)
 
@@ -273,7 +277,15 @@ if(MINIZIP_INSTALL)
     install(
         FILES ${LIBMINIZIP_HDRS}
         COMPONENT Development
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/minizip")
+    install(
+        FILES ${LIBMINIZIP_HDRS_COMPAT}
+        COMPONENT Development
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/minizip/compat")
+    install(
+        FILES ${LIBMINIZIP_PC}
+        COMPONENT Development
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 endif(MINIZIP_INSTALL)
 
 if(MINIZIP_BUILD_TESTING)
diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am
index b7dea4f7e..dece85918 100644
--- a/contrib/minizip/Makefile.am
+++ b/contrib/minizip/Makefile.am
@@ -25,13 +25,13 @@ libminizip_la_SOURCES = \
 libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
 
 minizip_includedir = $(includedir)/minizip
-minizip_include_HEADERS = \
-	crypt.h \
-	ints.h \
-	ioapi.h \
-	mztools.h \
-	unzip.h \
-	zip.h \
+nobase_minizip_include_HEADERS = \
+	crypt.h compat/crypt.h \
+	ints.h compat/ints.h \
+	ioapi.h compat/ioapi.h \
+	mztools.h compat/mztools.h \
+	unzip.h compat/unzip.h \
+	zip.h compat/zip.h \
 	${iowin32_h}
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/contrib/minizip/compat/crypt.h b/contrib/minizip/compat/crypt.h
new file mode 100644
index 000000000..bfa9fdcf9
--- /dev/null
+++ b/contrib/minizip/compat/crypt.h
@@ -0,0 +1,2 @@
+#warning "please include <minizip/crypt.h> instead; in future releases #include <crypt.h> will stop working"
+#include <minizip/crypt.h>
diff --git a/contrib/minizip/compat/ints.h b/contrib/minizip/compat/ints.h
new file mode 100644
index 000000000..bce31460c
--- /dev/null
+++ b/contrib/minizip/compat/ints.h
@@ -0,0 +1,2 @@
+#warning "please include <minizip/ints.h> instead; in future releases #include <ints.h> will stop working"
+#include <minizip/ints.h>
diff --git a/contrib/minizip/compat/ioapi.h b/contrib/minizip/compat/ioapi.h
new file mode 100644
index 000000000..74350ebf3
--- /dev/null
+++ b/contrib/minizip/compat/ioapi.h
@@ -0,0 +1,2 @@
+#warning "please include <minizip/ioapi.h> instead; in future releases #include <ioapi.h> will stop working"
+#include <minizip/ioapi.h>
diff --git a/contrib/minizip/compat/mztools.h b/contrib/minizip/compat/mztools.h
new file mode 100644
index 000000000..ee4d2032b
--- /dev/null
+++ b/contrib/minizip/compat/mztools.h
@@ -0,0 +1,2 @@
+#warning "please include <minizip/mztools.h> instead; in future releases #include <mztools.h> will stop working"
+#include <minizip/mztools.h>
diff --git a/contrib/minizip/compat/unzip.h b/contrib/minizip/compat/unzip.h
new file mode 100644
index 000000000..15a340232
--- /dev/null
+++ b/contrib/minizip/compat/unzip.h
@@ -0,0 +1,2 @@
+#warning "please include <minizip/unzip.h> instead; in future releases #include <unzip.h> will stop working"
+#include <minizip/unzip.h>
diff --git a/contrib/minizip/compat/zip.h b/contrib/minizip/compat/zip.h
new file mode 100644
index 000000000..97a07f85a
--- /dev/null
+++ b/contrib/minizip/compat/zip.h
@@ -0,0 +1,2 @@
+#warning "please include <minizip/zip.h> instead; in future releases #include <zip.h> will stop working"
+#include <minizip/zip.h>
diff --git a/contrib/minizip/minizip.pc.in b/contrib/minizip/minizip.pc.in
index 17eb6a972..88a56701c 100644
--- a/contrib/minizip/minizip.pc.in
+++ b/contrib/minizip/minizip.pc.in
@@ -10,4 +10,4 @@ Version: @PACKAGE_VERSION@
 License: Zlib
 Libs: -L${libdir} -lminizip
 Libs.private: -lz
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${includedir}/minizip/compat
diff --git a/contrib/minizip/minizip.pc.txt b/contrib/minizip/minizip.pc.txt
index 060ab091c..758140417 100644
--- a/contrib/minizip/minizip.pc.txt
+++ b/contrib/minizip/minizip.pc.txt
@@ -10,4 +10,4 @@ Version: @minizip_VERSION@
 
 Requires:
 Libs: -L${libdir} -L${sharedlibdir} -lz -lminizip
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${includedir}/minizip/compat