loplugin:includeform: sdext

Change-Id: Ieb9641b9846ecfed8d1a022a48defe7644405690

32 files changed, 130 insertions, 130 deletions

diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 9a444ba87d4c..7a28481ba6d0 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -25,8 +25,8 @@
 #include "informationdialog.hxx"
 
 #include <vector>
-#include "com/sun/star/util/URL.hpp"
-#include "com/sun/star/util/XURLTransformer.hpp"
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 3710e3dfccca..8c01b74a186e 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/io/TempFile.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include "com/sun/star/util/URL.hpp"
-#include "com/sun/star/util/URLTransformer.hpp"
-#include "com/sun/star/util/XURLTransformer.hpp"
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <sal/macros.h>
 
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 671e0620d6e5..50f4ab8acd27 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -29,7 +29,7 @@
 #include <sal/macros.h>
 #include <osl/time.h>
 #include <tools/urlobj.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::ui;
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 874010a8001b..42e77bdf27c8 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -20,7 +20,7 @@
 
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
-#include <pppoptimizerdialog.hxx>
+#include "pppoptimizerdialog.hxx"
 
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index e77b0569d1d2..bcc42dd384b7 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -28,8 +28,8 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <com/sun/star/rendering/XColorSpace.hpp>
-#include "com/sun/star/rendering/PathCapType.hpp"
-#include "com/sun/star/rendering/PathJoinType.hpp"
+#include <com/sun/star/rendering/PathCapType.hpp>
+#include <com/sun/star/rendering/PathJoinType.hpp>
 
 #include <unordered_map>
 #include <vector>
diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx
index 65b4a859042c..2936a62965d8 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "pdfihelper.hxx"
+#include <pdfihelper.hxx>
 
 #include <rtl/ustrbuf.hxx>
 #include <basegfx/numeric/ftools.hxx>
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 00bd5deb0c69..e3db5f93eefa 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cassert>
 
-#include "pdfihelper.hxx"
+#include <pdfihelper.hxx>
 
 #include <com/sun/star/task/ErrorCodeRequest.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index f28667b914b8..f83c7323193c 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "odfemitter.hxx"
+#include <odfemitter.hxx>
 
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index badcb5a3f67b..cd8c67b24ab1 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -20,15 +20,15 @@
 
 #include "pdfiadaptor.hxx"
 #include "filterdet.hxx"
-#include "saxemitter.hxx"
-#include "odfemitter.hxx"
+#include <saxemitter.hxx>
+#include <odfemitter.hxx>
 #include "inc/wrapper.hxx"
 #include "inc/contentsink.hxx"
-#include "pdfiprocessor.hxx"
+#include <pdfiprocessor.hxx>
 
 #include <osl/file.h>
 #include <osl/thread.h>
-#include "sal/log.hxx"
+#include <sal/log.hxx>
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index 7843505f0f64..0a184f3cf8e0 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_PDFIADAPTOR_HXX
 #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_PDFIADAPTOR_HXX
 
-#include "xmlemitter.hxx"
-#include "treevisitorfactory.hxx"
+#include <xmlemitter.hxx>
+#include <treevisitorfactory.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/XImportFilter.hpp>
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 9fa0545bbb10..5db85cc18e87 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -22,7 +22,7 @@
 #pragma warning(push, 1)
 #endif
 
-#include "pdfparse.hxx"
+#include <pdfparse.hxx>
 
 // workaround windows compiler: do not include multi_pass.hpp
 #include <boost/spirit/include/classic_core.hpp>
diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index 91a89a8246d2..7559d1e0ce2a 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "saxemitter.hxx"
+#include <saxemitter.hxx>
 #include "emitcontext.hxx"
 #include "saxattrlist.hxx"
 
diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx
index d5a113734131..8f278fc25969 100644
--- a/sdext/source/pdfimport/sax/emitcontext.hxx
+++ b/sdext/source/pdfimport/sax/emitcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_SAX_EMITCONTEXT_HXX
 #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_SAX_EMITCONTEXT_HXX
 
-#include "xmlemitter.hxx"
+#include <xmlemitter.hxx>
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index 8a2998684b31..1f597a65701f 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -20,7 +20,7 @@
 
 #include "pdfiadaptor.hxx"
 #include "filterdet.hxx"
-#include "treevisitorfactory.hxx"
+#include <treevisitorfactory.hxx>
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx
index 6891c0f3db41..4ea8a1fc8026 100644
--- a/sdext/source/pdfimport/test/pdf2xml.cxx
+++ b/sdext/source/pdfimport/test/pdf2xml.cxx
@@ -19,10 +19,10 @@
 
 
 #include "outputwrap.hxx"
-#include "contentsink.hxx"
-#include "pdfihelper.hxx"
-#include "wrapper.hxx"
-#include "pdfparse.hxx"
+#include <contentsink.hxx>
+#include <pdfihelper.hxx>
+#include <wrapper.hxx>
+#include <pdfparse.hxx>
 #include "../pdfiadaptor.hxx"
 
 #include <sal/main.h>
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index d33c2070f8f5..faf54efcb601 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 
-#include "pdfparse.hxx"
+#include <pdfparse.hxx>
 
 using namespace pdfparse;
 
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index e35ce444385f..bbc0a008c7b8 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -20,20 +20,20 @@
 #include <zlib.h>
 
 #include "outputwrap.hxx"
-#include "contentsink.hxx"
-#include "pdfihelper.hxx"
-#include "wrapper.hxx"
-#include "pdfparse.hxx"
+#include <contentsink.hxx>
+#include <pdfihelper.hxx>
+#include <wrapper.hxx>
+#include <pdfparse.hxx>
 #include "../pdfiadaptor.hxx"
 
 #include <rtl/math.hxx>
 #include <osl/file.hxx>
 #include <comphelper/sequence.hxx>
 
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <test/bootstrapfixture.hxx>
 
 #include <com/sun/star/rendering/XCanvas.hpp>
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index aa69b74ef44f..43caf18f6447 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -18,24 +18,24 @@
  */
 
 
-#include "pdfiprocessor.hxx"
-#include "xmlemitter.hxx"
-#include "pdfihelper.hxx"
-#include "imagecontainer.hxx"
+#include <pdfiprocessor.hxx>
+#include <xmlemitter.hxx>
+#include <pdfihelper.hxx>
+#include <imagecontainer.hxx>
 #include "style.hxx"
 #include "drawtreevisiting.hxx"
-#include "genericelements.hxx"
+#include <genericelements.hxx>
 
-#include "basegfx/polygon/b2dpolypolygontools.hxx"
-#include "basegfx/range/b2drange.hxx"
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/range/b2drange.hxx>
 #include <config_global.h>
 #include <osl/diagnose.h>
-#include "com/sun/star/i18n/BreakIterator.hpp"
-#include "com/sun/star/i18n/CharacterClassification.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "comphelper/processfactory.hxx"
-#include "com/sun/star/i18n/ScriptType.hpp"
-#include "com/sun/star/i18n/DirectionProperty.hpp"
+#include <com/sun/star/i18n/BreakIterator.hpp>
+#include <com/sun/star/i18n/CharacterClassification.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/DirectionProperty.hpp>
 
 #include <string.h>
 
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
index 744c8286cf3f..7cdfb04885bb 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_TREE_DRAWTREEVISITING_HXX
 #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_TREE_DRAWTREEVISITING_HXX
 
-#include "treevisiting.hxx"
+#include <treevisiting.hxx>
 
-#include "com/sun/star/i18n/XBreakIterator.hpp"
-#include "com/sun/star/i18n/XCharacterClassification.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/XCharacterClassification.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace pdfi
 {
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx
index 31451cd3a00d..6c84d8bd5dd4 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include "xmlemitter.hxx"
-#include "genericelements.hxx"
-#include "pdfiprocessor.hxx"
-#include "pdfihelper.hxx"
+#include <xmlemitter.hxx>
+#include <genericelements.hxx>
+#include <pdfiprocessor.hxx>
+#include <pdfihelper.hxx>
 #include "style.hxx"
 
 
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index b44ef77db127..6ff84263b502 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "imagecontainer.hxx"
-#include "genericelements.hxx"
-#include "xmlemitter.hxx"
+#include <imagecontainer.hxx>
+#include <genericelements.hxx>
+#include <xmlemitter.hxx>
 
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index d7d5ab756722..79982ded1c4a 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -18,13 +18,13 @@
  */
 
 
-#include "pdfiprocessor.hxx"
-#include "xmlemitter.hxx"
-#include "pdfihelper.hxx"
-#include "imagecontainer.hxx"
-#include "genericelements.hxx"
+#include <pdfiprocessor.hxx>
+#include <xmlemitter.hxx>
+#include <pdfihelper.hxx>
+#include <imagecontainer.hxx>
+#include <genericelements.hxx>
 #include "style.hxx"
-#include "treevisiting.hxx"
+#include <treevisiting.hxx>
 
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx
index 03473756ff2e..87f6178ec238 100644
--- a/sdext/source/pdfimport/tree/style.cxx
+++ b/sdext/source/pdfimport/tree/style.cxx
@@ -19,9 +19,9 @@
 
 
 #include "style.hxx"
-#include "genericelements.hxx"
-#include "xmlemitter.hxx"
-#include "pdfiprocessor.hxx"
+#include <genericelements.hxx>
+#include <xmlemitter.hxx>
+#include <pdfiprocessor.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <algorithm>
diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx
index 9d3edd0a90f0..043529988276 100644
--- a/sdext/source/pdfimport/tree/style.hxx
+++ b/sdext/source/pdfimport/tree/style.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_TREE_STYLE_HXX
 #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_TREE_STYLE_HXX
 
-#include "pdfihelper.hxx"
+#include <pdfihelper.hxx>
 #include <unordered_map>
 #include <vector>
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
-#include "treevisiting.hxx"
+#include <treevisiting.hxx>
 
 namespace pdfi
 {
diff --git a/sdext/source/pdfimport/tree/treevisitorfactory.cxx b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
index 7becdf5dd613..094fe0935c22 100644
--- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx
+++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "treevisitorfactory.hxx"
+#include <treevisitorfactory.hxx>
 #include "writertreevisiting.hxx"
 #include "drawtreevisiting.hxx"
 
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index d2d028723ec7..981882945350 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -18,16 +18,16 @@
  */
 
 
-#include "pdfiprocessor.hxx"
-#include "xmlemitter.hxx"
-#include "pdfihelper.hxx"
-#include "imagecontainer.hxx"
+#include <pdfiprocessor.hxx>
+#include <xmlemitter.hxx>
+#include <pdfihelper.hxx>
+#include <imagecontainer.hxx>
 #include "style.hxx"
 #include "writertreevisiting.hxx"
-#include "genericelements.hxx"
+#include <genericelements.hxx>
 
-#include "basegfx/polygon/b2dpolypolygontools.hxx"
-#include "basegfx/range/b2drange.hxx"
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/range/b2drange.hxx>
 #include <config_global.h>
 #include <osl/diagnose.h>
 
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx
index 10b6f64ff980..0fe5c51a09da 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_TREE_WRITERTREEVISITING_HXX
 #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_TREE_WRITERTREEVISITING_HXX
 
-#include "treevisiting.hxx"
+#include <treevisiting.hxx>
 
 namespace pdfi
 {
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 43cae17bc7df..f303ab09084b 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -19,43 +19,43 @@
 
 #include <config_folders.h>
 
-#include "contentsink.hxx"
-#include "pdfparse.hxx"
-#include "pdfihelper.hxx"
-#include "wrapper.hxx"
-
-#include "osl/file.h"
-#include "osl/file.hxx"
-#include "osl/thread.h"
-#include "osl/process.h"
-#include "osl/diagnose.h"
-#include "rtl/bootstrap.hxx"
-#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/strbuf.hxx"
-#include "rtl/byteseq.hxx"
+#include <contentsink.hxx>
+#include <pdfparse.hxx>
+#include <pdfihelper.hxx>
+#include <wrapper.hxx>
+
+#include <osl/file.h>
+#include <osl/file.hxx>
+#include <osl/thread.h>
+#include <osl/process.h>
+#include <osl/diagnose.h>
+#include <rtl/bootstrap.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/strbuf.hxx>
+#include <rtl/byteseq.hxx>
 
 #include <comphelper/propertysequence.hxx>
-#include "cppuhelper/exc_hlp.hxx"
-#include "com/sun/star/io/XInputStream.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/awt/FontDescriptor.hpp"
-#include "com/sun/star/beans/XMaterialHolder.hpp"
-#include "com/sun/star/rendering/PathCapType.hpp"
-#include "com/sun/star/rendering/PathJoinType.hpp"
-#include "com/sun/star/rendering/XColorSpace.hpp"
-#include "com/sun/star/rendering/XPolyPolygon2D.hpp"
-#include "com/sun/star/rendering/XBitmap.hpp"
-#include "com/sun/star/geometry/Matrix2D.hpp"
-#include "com/sun/star/geometry/AffineMatrix2D.hpp"
-#include "com/sun/star/geometry/RealRectangle2D.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-
-#include "basegfx/point/b2dpoint.hxx"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-#include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/utils/canvastools.hxx"
-#include "basegfx/utils/unopolypolygon.hxx"
+#include <cppuhelper/exc_hlp.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/FontDescriptor.hpp>
+#include <com/sun/star/beans/XMaterialHolder.hpp>
+#include <com/sun/star/rendering/PathCapType.hpp>
+#include <com/sun/star/rendering/PathJoinType.hpp>
+#include <com/sun/star/rendering/XColorSpace.hpp>
+#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
+#include <com/sun/star/rendering/XBitmap.hpp>
+#include <com/sun/star/geometry/Matrix2D.hpp>
+#include <com/sun/star/geometry/AffineMatrix2D.hpp>
+#include <com/sun/star/geometry/RealRectangle2D.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/unopolypolygon.hxx>
 
 #include <vcl/metric.hxx>
 #include <vcl/font.hxx>
@@ -67,7 +67,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "rtl/bootstrap.h"
+#include <rtl/bootstrap.h>
 
 #include <rtl/character.hxx>
 
@@ -136,7 +136,7 @@ enum parseKey {
 #pragma clang diagnostic ignored "-Wdeprecated-register"
 #pragma clang diagnostic ignored "-Wextra-tokens"
 #endif
-#include "hash.cxx"
+#include <hash.cxx>
 #if defined _MSC_VER && defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 5d4a797f7c96..fb8728bca212 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -36,7 +36,7 @@
 // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
 //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
 #if POPPLER_CHECK_VERSION(0, 21, 1)
-#include "UTF8.h"
+#include <UTF8.h>
 #elif POPPLER_CHECK_VERSION(0, 21, 0)
 #include "UTF.h"
 #else
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index f6d6fa41ddcb..922c513ff86b 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -31,14 +31,14 @@
 #pragma warning(push, 1)
 #endif
 
-#include "GfxState.h"
-#include "GfxFont.h"
-#include "UnicodeMap.h"
-#include "Link.h"
-#include "Object.h"
-#include "OutputDev.h"
-#include "GlobalParams.h"
-#include "PDFDoc.h"
+#include <GfxState.h>
+#include <GfxFont.h>
+#include <UnicodeMap.h>
+#include <Link.h>
+#include <Object.h>
+#include <OutputDev.h>
+#include <GlobalParams.h>
+#include <PDFDoc.h>
 
 #if defined __GNUC__ || defined __clang__
 # pragma GCC diagnostic pop
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
index 7a24da729c89..e26de3774bff 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PNGHELPER_HXX
 #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PNGHELPER_HXX
 
-#include "sal/types.h"
+#include <sal/types.h>
 #include "pdfioutdev_gpl.hxx"
 
 
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index 8cf565a9903f..8b35e454cb9a 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implementationentry.hxx"
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
 
 #include "PresenterProtocolHandler.hxx"
 #include "PresenterScreen.hxx"