diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index f10760f62517..46df27962cf9 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_PACKAGE_INC_HASHMAPS_HXX
 #define INCLUDED_PACKAGE_INC_HASHMAPS_HXX
 
-#include <ZipEntry.hxx>
+#include "ZipEntry.hxx"
 #include <rtl/ref.hxx>
 #include <unordered_map>
 
diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx
index f9f517a4a45e..0b6402a50c21 100644
--- a/package/inc/ZipEnumeration.hxx
+++ b/package/inc/ZipEnumeration.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_PACKAGE_INC_ZIPENUMERATION_HXX
 #define INCLUDED_PACKAGE_INC_ZIPENUMERATION_HXX
 
-#include <HashMaps.hxx>
+#include "HashMaps.hxx"
 
 class ZipEnumeration
 {
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 6065a8f3af35..f57a0fb30015 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -28,9 +28,9 @@
 
 #include <comphelper/refcountedmutex.hxx>
 #include <package/Inflater.hxx>
-#include <ByteGrabber.hxx>
-#include <HashMaps.hxx>
-#include <EncryptionData.hxx>
+#include "ByteGrabber.hxx"
+#include "HashMaps.hxx"
+#include "EncryptionData.hxx"
 
 #include <memory>
 
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
index 14882bef9cdc..016e220fa06e 100644
--- a/package/inc/ZipOutputEntry.hxx
+++ b/package/inc/ZipOutputEntry.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
 
 #include <package/Deflater.hxx>
-#include <CRC32.hxx>
+#include "CRC32.hxx"
 #include <atomic>
 
 struct ZipEntry;
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 34fdc6b7426f..a0a8f3ad24ac 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XOutputStream.hpp>
 
-#include <ByteChucker.hxx>
+#include "ByteChucker.hxx"
 #include <comphelper/threadpool.hxx>
 
 #include <vector>
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index cd5a8caba757..f89dd57d7be4 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <comphelper/refcountedmutex.hxx>
 
-#include <HashMaps.hxx>
+#include "HashMaps.hxx"
 #include <osl/file.h>
 #include <vector>
 #include <memory>
diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx
index 8860b832f479..300b5f25ea67 100644
--- a/package/inc/ZipPackageEntry.hxx
+++ b/package/inc/ZipPackageEntry.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <ZipEntry.hxx>
+#include "ZipEntry.hxx"
 #include <cppuhelper/implbase.hxx>
 
 #include <vector>
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index e638cc6a1112..0fad51f72ba2 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -23,8 +23,8 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <HashMaps.hxx>
-#include <ZipPackageEntry.hxx>
+#include "HashMaps.hxx"
+#include "ZipPackageEntry.hxx"
 #include <cppuhelper/implbase.hxx>
 #include <vector>
 
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index c84d39ca565d..d8f6903e35ac 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -24,12 +24,12 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/packages/XDataSinkEncrSupport.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <ZipPackageEntry.hxx>
+#include "ZipPackageEntry.hxx"
 #include <rtl/ref.hxx>
 #include <comphelper/refcountedmutex.hxx>
 #include <cppuhelper/implbase.hxx>
 
-#include <EncryptionData.hxx>
+#include "EncryptionData.hxx"
 
 #define PACKAGE_STREAM_NOTSET           0
 #define PACKAGE_STREAM_PACKAGEMEMBER    1
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 112e882c42de..34e58b95a619 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -32,8 +32,8 @@
 #include <comphelper/refcountedmutex.hxx>
 #include <cppuhelper/implbase.hxx>
 
-#include <ZipFile.hxx>
-#include <HashMaps.hxx>
+#include "ZipFile.hxx"
+#include "HashMaps.hxx"
 
 #include <memory>
 
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index f3ee450594ba..60a5128e945d 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -25,8 +25,8 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 
-#include <ManifestDefines.hxx>
-#include <ManifestExport.hxx>
+#include "ManifestDefines.hxx"
+#include "ManifestExport.hxx"
 #include <sax/tools/converter.hxx>
 
 #include <osl/diagnose.h>
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 3868be460c41..5ecd8c1cffcd 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ManifestImport.hxx>
-#include <ManifestDefines.hxx>
+#include "ManifestImport.hxx"
+#include "ManifestDefines.hxx"
 #include <sax/tools/converter.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index 2ee8c1187de5..224766cdea7b 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ManifestReader.hxx>
-#include <ManifestImport.hxx>
+#include "ManifestReader.hxx"
+#include "ManifestImport.hxx"
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/factory.hxx>
diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx
index aa73e2c9e092..f475f05379f4 100644
--- a/package/source/manifest/ManifestWriter.cxx
+++ b/package/source/manifest/ManifestWriter.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ManifestWriter.hxx>
-#include <ManifestExport.hxx>
+#include "ManifestWriter.hxx"
+#include "ManifestExport.hxx"
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index 40feb66e191b..74149aa4038b 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ManifestReader.hxx>
-#include <ManifestWriter.hxx>
+#include "ManifestReader.hxx"
+#include "ManifestWriter.hxx"
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <ZipPackage.hxx>
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index 017d3a4cb635..a7d970e8b885 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/io/TempFile.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <switchpersistencestream.hxx>
+#include "switchpersistencestream.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/package/source/zipapi/XBufferedThreadedStream.cxx b/package/source/zipapi/XBufferedThreadedStream.cxx
index 57f88e7ccc83..82bb992f0128 100644
--- a/package/source/zipapi/XBufferedThreadedStream.cxx
+++ b/package/source/zipapi/XBufferedThreadedStream.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <XBufferedThreadedStream.hxx>
+#include "XBufferedThreadedStream.hxx"
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 
 using namespace css::uno;
diff --git a/package/source/zipapi/XBufferedThreadedStream.hxx b/package/source/zipapi/XBufferedThreadedStream.hxx
index c28bb049de16..8bf3c5eb1283 100644
--- a/package/source/zipapi/XBufferedThreadedStream.hxx
+++ b/package/source/zipapi/XBufferedThreadedStream.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_PACKAGE_SOURCE_ZIPAPI_XBUFFEREDTHREADEDSTREAM_HXX
 
 #include <salhelper/thread.hxx>
-#include <XUnbufferedStream.hxx>
+#include "XUnbufferedStream.hxx"
 #include <queue>
 #include <vector>
 #include <mutex>
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 75bc769d69ec..b1e31f5ee2c9 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/xml/crypto/CipherID.hpp>
 
-#include <XUnbufferedStream.hxx>
+#include "XUnbufferedStream.hxx"
 #include <EncryptionData.hxx>
 #include <PackageConstants.hxx>
 #include <ZipFile.hxx>
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index bc978e9dcad1..0b1fa46a3907 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -43,12 +43,12 @@
 #include "sha1context.hxx"
 #include <ZipFile.hxx>
 #include <ZipEnumeration.hxx>
-#include <XUnbufferedStream.hxx>
-#include <XBufferedThreadedStream.hxx>
+#include "XUnbufferedStream.hxx"
+#include "XBufferedThreadedStream.hxx"
 #include <PackageConstants.hxx>
 #include <EncryptedDataHeader.hxx>
 #include <EncryptionData.hxx>
-#include <MemoryByteGrabber.hxx>
+#include "MemoryByteGrabber.hxx"
 
 #include <CRC32.hxx>
 
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index cfdfde131120..9bdd03d7cfd1 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <ZipPackage.hxx>
-#include <ZipPackageSink.hxx>
+#include "ZipPackageSink.hxx"
 #include <ZipEnumeration.hxx>
 #include <ZipPackageStream.hxx>
 #include <ZipPackageFolder.hxx>
@@ -59,13 +59,13 @@
 #include <com/sun/star/xml/crypto/DigestID.hpp>
 #include <com/sun/star/xml/crypto/CipherID.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <ContentInfo.hxx>
+#include "ContentInfo.hxx"
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/random.h>
 #include <osl/time.h>
 #include <osl/diagnose.h>
-#include "com/sun/star/io/XAsyncOutputMonitor.hpp"
+#include <com/sun/star/io/XAsyncOutputMonitor.hpp>
 
 #include <cstring>
 #include <memory>
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index c327dfe98c07..38ffc8d071ef 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -24,7 +24,7 @@
 
 #include <ZipPackageFolder.hxx>
 #include <ZipPackageStream.hxx>
-#include <ContentInfo.hxx>
+#include "ContentInfo.hxx"
 
 #include <comphelper/storagehelper.hxx>
 
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index abee6bbdc562..f70a048b393a 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -24,7 +24,7 @@
 #include <ZipOutputStream.hxx>
 #include <ZipPackageStream.hxx>
 #include <PackageConstants.hxx>
-#include <ZipPackageFolderEnumeration.hxx>
+#include "ZipPackageFolderEnumeration.hxx"
 #include <com/sun/star/packages/zip/ZipConstants.hpp>
 #include <com/sun/star/embed/StorageFormats.hpp>
 #include <cppuhelper/supportsservice.hxx>
@@ -32,7 +32,7 @@
 #include <osl/diagnose.h>
 #include <osl/time.h>
 #include <rtl/digest.h>
-#include <ContentInfo.hxx>
+#include "ContentInfo.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <EncryptedDataHeader.hxx>
 #include <rtl/instance.hxx>
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
index adcbb9296dd5..91de21dd1afb 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ZipPackageFolderEnumeration.hxx>
-#include <ContentInfo.hxx>
+#include "ZipPackageFolderEnumeration.hxx"
+#include "ContentInfo.hxx"
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace com::sun::star;
diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx
index 6725c8aa2802..b6e087e3b4de 100644
--- a/package/source/zippackage/ZipPackageSink.cxx
+++ b/package/source/zippackage/ZipPackageSink.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ZipPackageSink.hxx>
+#include "ZipPackageSink.hxx"
 
 ZipPackageSink::ZipPackageSink()
 : xStream ( css::uno::Reference < css::io::XInputStream > (nullptr))
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index cf23a75203ba..8fe79b85e051 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -28,7 +28,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <zipfileaccess.hxx>
 #include <ZipEnumeration.hxx>
-#include <ZipPackageSink.hxx>
+#include "ZipPackageSink.hxx"
 #include <EncryptionData.hxx>
 
 #include <ucbhelper/content.hxx>