loplugin:includeform: cppu

Change-Id: I438346398fd8430cf4357b8a3d8e9f423966f2ca

29 files changed, 478 insertions, 478 deletions

diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index e214e6deb4ff..fd0d63935772 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -19,348 +19,348 @@
 
 #include <sal/types.h>
 
-#include "FILE.hpp"
-#include "lconv.hpp"
-#include "tm.hpp"
-#include "std.hpp"
-#include "test/codemaker/cppumaker/XTest.hpp"
-#include "test/codemaker/cppumaker/S1.hpp"
-#include "test/codemaker/cppumaker/services/asm.hpp"
-#include "test/codemaker/cppumaker/services/auto.hpp"
-#include "test/codemaker/cppumaker/services/bool.hpp"
-#include "test/codemaker/cppumaker/services/break.hpp"
+#include <FILE.hpp>
+#include <lconv.hpp>
+#include <tm.hpp>
+#include <std.hpp>
+#include <test/codemaker/cppumaker/XTest.hpp>
+#include <test/codemaker/cppumaker/S1.hpp>
+#include <test/codemaker/cppumaker/services/asm.hpp>
+#include <test/codemaker/cppumaker/services/auto.hpp>
+#include <test/codemaker/cppumaker/services/bool.hpp>
+#include <test/codemaker/cppumaker/services/break.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/case.hpp"
-#include "test/codemaker/cppumaker/services/catch.hpp"
+#include <test/codemaker/cppumaker/services/catch.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/char.hpp"
-#include "test/codemaker/cppumaker/services/class.hpp"
+#include <test/codemaker/cppumaker/services/class.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/const.hpp"
-#include "test/codemaker/cppumaker/services/continue.hpp"
+#include <test/codemaker/cppumaker/services/continue.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/default.hpp"
-#include "test/codemaker/cppumaker/services/delete.hpp"
-#include "test/codemaker/cppumaker/services/do.hpp"
+#include <test/codemaker/cppumaker/services/delete.hpp>
+#include <test/codemaker/cppumaker/services/do.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/double.hpp"
-#include "test/codemaker/cppumaker/services/else.hpp"
+#include <test/codemaker/cppumaker/services/else.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/enum.hpp"
-#include "test/codemaker/cppumaker/services/explicit.hpp"
-#include "test/codemaker/cppumaker/services/export.hpp"
-#include "test/codemaker/cppumaker/services/extern.hpp"
-#include "test/codemaker/cppumaker/services/false.hpp"
+#include <test/codemaker/cppumaker/services/explicit.hpp>
+#include <test/codemaker/cppumaker/services/export.hpp>
+#include <test/codemaker/cppumaker/services/extern.hpp>
+#include <test/codemaker/cppumaker/services/false.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/float.hpp"
-#include "test/codemaker/cppumaker/services/for.hpp"
-#include "test/codemaker/cppumaker/services/friend.hpp"
-#include "test/codemaker/cppumaker/services/goto.hpp"
-#include "test/codemaker/cppumaker/services/if.hpp"
-#include "test/codemaker/cppumaker/services/inline.hpp"
-#include "test/codemaker/cppumaker/services/int.hpp"
+#include <test/codemaker/cppumaker/services/for.hpp>
+#include <test/codemaker/cppumaker/services/friend.hpp>
+#include <test/codemaker/cppumaker/services/goto.hpp>
+#include <test/codemaker/cppumaker/services/if.hpp>
+#include <test/codemaker/cppumaker/services/inline.hpp>
+#include <test/codemaker/cppumaker/services/int.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/long.hpp"
-#include "test/codemaker/cppumaker/services/mutable.hpp"
-#include "test/codemaker/cppumaker/services/namespace.hpp"
-#include "test/codemaker/cppumaker/services/new.hpp"
-#include "test/codemaker/cppumaker/services/operator.hpp"
-#include "test/codemaker/cppumaker/services/private.hpp"
-#include "test/codemaker/cppumaker/services/protected.hpp"
-#include "test/codemaker/cppumaker/services/public.hpp"
-#include "test/codemaker/cppumaker/services/register.hpp"
-#include "test/codemaker/cppumaker/services/return.hpp"
+#include <test/codemaker/cppumaker/services/mutable.hpp>
+#include <test/codemaker/cppumaker/services/namespace.hpp>
+#include <test/codemaker/cppumaker/services/new.hpp>
+#include <test/codemaker/cppumaker/services/operator.hpp>
+#include <test/codemaker/cppumaker/services/private.hpp>
+#include <test/codemaker/cppumaker/services/protected.hpp>
+#include <test/codemaker/cppumaker/services/public.hpp>
+#include <test/codemaker/cppumaker/services/register.hpp>
+#include <test/codemaker/cppumaker/services/return.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/short.hpp"
-#include "test/codemaker/cppumaker/services/signed.hpp"
-#include "test/codemaker/cppumaker/services/sizeof.hpp"
-#include "test/codemaker/cppumaker/services/static.hpp"
+#include <test/codemaker/cppumaker/services/signed.hpp>
+#include <test/codemaker/cppumaker/services/sizeof.hpp>
+#include <test/codemaker/cppumaker/services/static.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/struct.hpp"
 //TODO: #include "test/codemaker/cppumaker/services/switch.hpp"
-#include "test/codemaker/cppumaker/services/template.hpp"
-#include "test/codemaker/cppumaker/services/this.hpp"
-#include "test/codemaker/cppumaker/services/throw.hpp"
-#include "test/codemaker/cppumaker/services/true.hpp"
-#include "test/codemaker/cppumaker/services/try.hpp"
+#include <test/codemaker/cppumaker/services/template.hpp>
+#include <test/codemaker/cppumaker/services/this.hpp>
+#include <test/codemaker/cppumaker/services/throw.hpp>
+#include <test/codemaker/cppumaker/services/true.hpp>
+#include <test/codemaker/cppumaker/services/try.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/typedef.hpp"
-#include "test/codemaker/cppumaker/services/typeid.hpp"
-#include "test/codemaker/cppumaker/services/typename.hpp"
+#include <test/codemaker/cppumaker/services/typeid.hpp>
+#include <test/codemaker/cppumaker/services/typename.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/union.hpp"
 //TODO: #include "test/codemaker/cppumaker/services/unsigned.hpp"
-#include "test/codemaker/cppumaker/services/using.hpp"
-#include "test/codemaker/cppumaker/services/virtual.hpp"
+#include <test/codemaker/cppumaker/services/using.hpp>
+#include <test/codemaker/cppumaker/services/virtual.hpp>
 //TODO: #include "test/codemaker/cppumaker/services/void.hpp"
-#include "test/codemaker/cppumaker/services/volatile.hpp"
-#include "test/codemaker/cppumaker/services/while.hpp"
-#include "test/codemaker/cppumaker/services/and.hpp"
-#include "test/codemaker/cppumaker/services/bitand.hpp"
-#include "test/codemaker/cppumaker/services/bitor.hpp"
-#include "test/codemaker/cppumaker/services/compl.hpp"
-#include "test/codemaker/cppumaker/services/not.hpp"
-#include "test/codemaker/cppumaker/services/or.hpp"
-#include "test/codemaker/cppumaker/services/xor.hpp"
-#include "test/codemaker/cppumaker/services/BUFSIZ.hpp"
-#include "test/codemaker/cppumaker/services/CLOCKS_PER_SEC.hpp"
-#include "test/codemaker/cppumaker/services/EDOM.hpp"
-#include "test/codemaker/cppumaker/services/EOF.hpp"
-#include "test/codemaker/cppumaker/services/ERANGE.hpp"
-#include "test/codemaker/cppumaker/services/EXIT_FAILURE.hpp"
-#include "test/codemaker/cppumaker/services/EXIT_SUCCESS.hpp"
-#include "test/codemaker/cppumaker/services/FILENAME_MAX.hpp"
-#include "test/codemaker/cppumaker/services/FOPEN_MAX.hpp"
-#include "test/codemaker/cppumaker/services/HUGE_VAL.hpp"
-#include "test/codemaker/cppumaker/services/LC_ALL.hpp"
-#include "test/codemaker/cppumaker/services/LC_COLLATE.hpp"
-#include "test/codemaker/cppumaker/services/LC_CTYPE.hpp"
-#include "test/codemaker/cppumaker/services/LC_MONETARY.hpp"
-#include "test/codemaker/cppumaker/services/LC_NUMERIC.hpp"
-#include "test/codemaker/cppumaker/services/LC_TIME.hpp"
-#include "test/codemaker/cppumaker/services/L_tmpnam.hpp"
-#include "test/codemaker/cppumaker/services/MB_CUR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/NULL.hpp"
-#include "test/codemaker/cppumaker/services/RAND_MAX.hpp"
-#include "test/codemaker/cppumaker/services/SEEK_CUR.hpp"
-#include "test/codemaker/cppumaker/services/SEEK_END.hpp"
-#include "test/codemaker/cppumaker/services/SEEK_SET.hpp"
-#include "test/codemaker/cppumaker/services/SIGABRT.hpp"
-#include "test/codemaker/cppumaker/services/SIGFPE.hpp"
-#include "test/codemaker/cppumaker/services/SIGILL.hpp"
-#include "test/codemaker/cppumaker/services/SIGINT.hpp"
-#include "test/codemaker/cppumaker/services/SIGSEGV.hpp"
-#include "test/codemaker/cppumaker/services/SIGTERM.hpp"
-#include "test/codemaker/cppumaker/services/SIG_DFL.hpp"
-#include "test/codemaker/cppumaker/services/SIG_ERR.hpp"
-#include "test/codemaker/cppumaker/services/SIG_IGN.hpp"
-#include "test/codemaker/cppumaker/services/TMP_MAX.hpp"
-#include "test/codemaker/cppumaker/services/WCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/WCHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/services/WEOF.hpp"
-#include "test/codemaker/cppumaker/services/assert.hpp"
-#include "test/codemaker/cppumaker/services/errno.hpp"
-#include "test/codemaker/cppumaker/services/offsetof.hpp"
-#include "test/codemaker/cppumaker/services/setjmp.hpp"
-#include "test/codemaker/cppumaker/services/stderr.hpp"
-#include "test/codemaker/cppumaker/services/stdin.hpp"
-#include "test/codemaker/cppumaker/services/stdout.hpp"
-#include "test/codemaker/cppumaker/services/CHAR_BIT.hpp"
-#include "test/codemaker/cppumaker/services/CHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/CHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/services/DBL_DIG.hpp"
-#include "test/codemaker/cppumaker/services/DBL_EPSILON.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MAX.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MIN.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_DIG.hpp"
-#include "test/codemaker/cppumaker/services/FLT_EPSILON.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MIN.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_RADIX.hpp"
-#include "test/codemaker/cppumaker/services/FLT_ROUNDS.hpp"
-#include "test/codemaker/cppumaker/services/INT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/INT_MIN.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_DIG.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_EPSILON.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MAX.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MIN.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/services/LONG_MAX.hpp"
-#include "test/codemaker/cppumaker/services/LONG_MIN.hpp"
-#include "test/codemaker/cppumaker/services/MB_LEN_MAX.hpp"
-#include "test/codemaker/cppumaker/services/SCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/SCHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/services/SHRT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/SHRT_MIN.hpp"
-#include "test/codemaker/cppumaker/services/UCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/UINT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/ULONG_MAX.hpp"
-#include "test/codemaker/cppumaker/services/USHRT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/FILE.hpp"
-#include "test/codemaker/cppumaker/services/lconv.hpp"
-#include "test/codemaker/cppumaker/services/tm.hpp"
-#include "test/codemaker/cppumaker/services/std.hpp"
-#include "test/codemaker/cppumaker/services/NDEBUG.hpp"
-#include "test/codemaker/cppumaker/services/create.hpp"
-#include "test/codemaker/cppumaker/singletons/asm.hpp"
-#include "test/codemaker/cppumaker/singletons/auto.hpp"
-#include "test/codemaker/cppumaker/singletons/bool.hpp"
-#include "test/codemaker/cppumaker/singletons/break.hpp"
+#include <test/codemaker/cppumaker/services/volatile.hpp>
+#include <test/codemaker/cppumaker/services/while.hpp>
+#include <test/codemaker/cppumaker/services/and.hpp>
+#include <test/codemaker/cppumaker/services/bitand.hpp>
+#include <test/codemaker/cppumaker/services/bitor.hpp>
+#include <test/codemaker/cppumaker/services/compl.hpp>
+#include <test/codemaker/cppumaker/services/not.hpp>
+#include <test/codemaker/cppumaker/services/or.hpp>
+#include <test/codemaker/cppumaker/services/xor.hpp>
+#include <test/codemaker/cppumaker/services/BUFSIZ.hpp>
+#include <test/codemaker/cppumaker/services/CLOCKS_PER_SEC.hpp>
+#include <test/codemaker/cppumaker/services/EDOM.hpp>
+#include <test/codemaker/cppumaker/services/EOF.hpp>
+#include <test/codemaker/cppumaker/services/ERANGE.hpp>
+#include <test/codemaker/cppumaker/services/EXIT_FAILURE.hpp>
+#include <test/codemaker/cppumaker/services/EXIT_SUCCESS.hpp>
+#include <test/codemaker/cppumaker/services/FILENAME_MAX.hpp>
+#include <test/codemaker/cppumaker/services/FOPEN_MAX.hpp>
+#include <test/codemaker/cppumaker/services/HUGE_VAL.hpp>
+#include <test/codemaker/cppumaker/services/LC_ALL.hpp>
+#include <test/codemaker/cppumaker/services/LC_COLLATE.hpp>
+#include <test/codemaker/cppumaker/services/LC_CTYPE.hpp>
+#include <test/codemaker/cppumaker/services/LC_MONETARY.hpp>
+#include <test/codemaker/cppumaker/services/LC_NUMERIC.hpp>
+#include <test/codemaker/cppumaker/services/LC_TIME.hpp>
+#include <test/codemaker/cppumaker/services/L_tmpnam.hpp>
+#include <test/codemaker/cppumaker/services/MB_CUR_MAX.hpp>
+#include <test/codemaker/cppumaker/services/NULL.hpp>
+#include <test/codemaker/cppumaker/services/RAND_MAX.hpp>
+#include <test/codemaker/cppumaker/services/SEEK_CUR.hpp>
+#include <test/codemaker/cppumaker/services/SEEK_END.hpp>
+#include <test/codemaker/cppumaker/services/SEEK_SET.hpp>
+#include <test/codemaker/cppumaker/services/SIGABRT.hpp>
+#include <test/codemaker/cppumaker/services/SIGFPE.hpp>
+#include <test/codemaker/cppumaker/services/SIGILL.hpp>
+#include <test/codemaker/cppumaker/services/SIGINT.hpp>
+#include <test/codemaker/cppumaker/services/SIGSEGV.hpp>
+#include <test/codemaker/cppumaker/services/SIGTERM.hpp>
+#include <test/codemaker/cppumaker/services/SIG_DFL.hpp>
+#include <test/codemaker/cppumaker/services/SIG_ERR.hpp>
+#include <test/codemaker/cppumaker/services/SIG_IGN.hpp>
+#include <test/codemaker/cppumaker/services/TMP_MAX.hpp>
+#include <test/codemaker/cppumaker/services/WCHAR_MAX.hpp>
+#include <test/codemaker/cppumaker/services/WCHAR_MIN.hpp>
+#include <test/codemaker/cppumaker/services/WEOF.hpp>
+#include <test/codemaker/cppumaker/services/assert.hpp>
+#include <test/codemaker/cppumaker/services/errno.hpp>
+#include <test/codemaker/cppumaker/services/offsetof.hpp>
+#include <test/codemaker/cppumaker/services/setjmp.hpp>
+#include <test/codemaker/cppumaker/services/stderr.hpp>
+#include <test/codemaker/cppumaker/services/stdin.hpp>
+#include <test/codemaker/cppumaker/services/stdout.hpp>
+#include <test/codemaker/cppumaker/services/CHAR_BIT.hpp>
+#include <test/codemaker/cppumaker/services/CHAR_MAX.hpp>
+#include <test/codemaker/cppumaker/services/CHAR_MIN.hpp>
+#include <test/codemaker/cppumaker/services/DBL_DIG.hpp>
+#include <test/codemaker/cppumaker/services/DBL_EPSILON.hpp>
+#include <test/codemaker/cppumaker/services/DBL_MANT_DIG.hpp>
+#include <test/codemaker/cppumaker/services/DBL_MAX.hpp>
+#include <test/codemaker/cppumaker/services/DBL_MAX_10_EXP.hpp>
+#include <test/codemaker/cppumaker/services/DBL_MAX_EXP.hpp>
+#include <test/codemaker/cppumaker/services/DBL_MIN.hpp>
+#include <test/codemaker/cppumaker/services/DBL_MIN_10_EXP.hpp>
+#include <test/codemaker/cppumaker/services/DBL_MIN_EXP.hpp>
+#include <test/codemaker/cppumaker/services/FLT_DIG.hpp>
+#include <test/codemaker/cppumaker/services/FLT_EPSILON.hpp>
+#include <test/codemaker/cppumaker/services/FLT_MANT_DIG.hpp>
+#include <test/codemaker/cppumaker/services/FLT_MAX.hpp>
+#include <test/codemaker/cppumaker/services/FLT_MAX_10_EXP.hpp>
+#include <test/codemaker/cppumaker/services/FLT_MAX_EXP.hpp>
+#include <test/codemaker/cppumaker/services/FLT_MIN.hpp>
+#include <test/codemaker/cppumaker/services/FLT_MIN_10_EXP.hpp>
+#include <test/codemaker/cppumaker/services/FLT_MIN_EXP.hpp>
+#include <test/codemaker/cppumaker/services/FLT_RADIX.hpp>
+#include <test/codemaker/cppumaker/services/FLT_ROUNDS.hpp>
+#include <test/codemaker/cppumaker/services/INT_MAX.hpp>
+#include <test/codemaker/cppumaker/services/INT_MIN.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_DIG.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_EPSILON.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_MANT_DIG.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_MAX.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_MAX_10_EXP.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_MAX_EXP.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_MIN.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_MIN_10_EXP.hpp>
+#include <test/codemaker/cppumaker/services/LDBL_MIN_EXP.hpp>
+#include <test/codemaker/cppumaker/services/LONG_MAX.hpp>
+#include <test/codemaker/cppumaker/services/LONG_MIN.hpp>
+#include <test/codemaker/cppumaker/services/MB_LEN_MAX.hpp>
+#include <test/codemaker/cppumaker/services/SCHAR_MAX.hpp>
+#include <test/codemaker/cppumaker/services/SCHAR_MIN.hpp>
+#include <test/codemaker/cppumaker/services/SHRT_MAX.hpp>
+#include <test/codemaker/cppumaker/services/SHRT_MIN.hpp>
+#include <test/codemaker/cppumaker/services/UCHAR_MAX.hpp>
+#include <test/codemaker/cppumaker/services/UINT_MAX.hpp>
+#include <test/codemaker/cppumaker/services/ULONG_MAX.hpp>
+#include <test/codemaker/cppumaker/services/USHRT_MAX.hpp>
+#include <test/codemaker/cppumaker/services/FILE.hpp>
+#include <test/codemaker/cppumaker/services/lconv.hpp>
+#include <test/codemaker/cppumaker/services/tm.hpp>
+#include <test/codemaker/cppumaker/services/std.hpp>
+#include <test/codemaker/cppumaker/services/NDEBUG.hpp>
+#include <test/codemaker/cppumaker/services/create.hpp>
+#include <test/codemaker/cppumaker/singletons/asm.hpp>
+#include <test/codemaker/cppumaker/singletons/auto.hpp>
+#include <test/codemaker/cppumaker/singletons/bool.hpp>
+#include <test/codemaker/cppumaker/singletons/break.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/case.hpp"
-#include "test/codemaker/cppumaker/singletons/catch.hpp"
+#include <test/codemaker/cppumaker/singletons/catch.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/char.hpp"
-#include "test/codemaker/cppumaker/singletons/class.hpp"
+#include <test/codemaker/cppumaker/singletons/class.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/const.hpp"
-#include "test/codemaker/cppumaker/singletons/continue.hpp"
+#include <test/codemaker/cppumaker/singletons/continue.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/default.hpp"
-#include "test/codemaker/cppumaker/singletons/delete.hpp"
-#include "test/codemaker/cppumaker/singletons/do.hpp"
+#include <test/codemaker/cppumaker/singletons/delete.hpp>
+#include <test/codemaker/cppumaker/singletons/do.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/double.hpp"
-#include "test/codemaker/cppumaker/singletons/else.hpp"
+#include <test/codemaker/cppumaker/singletons/else.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/enum.hpp"
-#include "test/codemaker/cppumaker/singletons/explicit.hpp"
-#include "test/codemaker/cppumaker/singletons/export.hpp"
-#include "test/codemaker/cppumaker/singletons/extern.hpp"
-#include "test/codemaker/cppumaker/singletons/false.hpp"
+#include <test/codemaker/cppumaker/singletons/explicit.hpp>
+#include <test/codemaker/cppumaker/singletons/export.hpp>
+#include <test/codemaker/cppumaker/singletons/extern.hpp>
+#include <test/codemaker/cppumaker/singletons/false.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/float.hpp"
-#include "test/codemaker/cppumaker/singletons/for.hpp"
-#include "test/codemaker/cppumaker/singletons/friend.hpp"
-#include "test/codemaker/cppumaker/singletons/goto.hpp"
-#include "test/codemaker/cppumaker/singletons/if.hpp"
-#include "test/codemaker/cppumaker/singletons/inline.hpp"
-#include "test/codemaker/cppumaker/singletons/int.hpp"
+#include <test/codemaker/cppumaker/singletons/for.hpp>
+#include <test/codemaker/cppumaker/singletons/friend.hpp>
+#include <test/codemaker/cppumaker/singletons/goto.hpp>
+#include <test/codemaker/cppumaker/singletons/if.hpp>
+#include <test/codemaker/cppumaker/singletons/inline.hpp>
+#include <test/codemaker/cppumaker/singletons/int.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/long.hpp"
-#include "test/codemaker/cppumaker/singletons/mutable.hpp"
-#include "test/codemaker/cppumaker/singletons/namespace.hpp"
-#include "test/codemaker/cppumaker/singletons/new.hpp"
-#include "test/codemaker/cppumaker/singletons/operator.hpp"
-#include "test/codemaker/cppumaker/singletons/private.hpp"
-#include "test/codemaker/cppumaker/singletons/protected.hpp"
-#include "test/codemaker/cppumaker/singletons/public.hpp"
-#include "test/codemaker/cppumaker/singletons/register.hpp"
-#include "test/codemaker/cppumaker/singletons/return.hpp"
+#include <test/codemaker/cppumaker/singletons/mutable.hpp>
+#include <test/codemaker/cppumaker/singletons/namespace.hpp>
+#include <test/codemaker/cppumaker/singletons/new.hpp>
+#include <test/codemaker/cppumaker/singletons/operator.hpp>
+#include <test/codemaker/cppumaker/singletons/private.hpp>
+#include <test/codemaker/cppumaker/singletons/protected.hpp>
+#include <test/codemaker/cppumaker/singletons/public.hpp>
+#include <test/codemaker/cppumaker/singletons/register.hpp>
+#include <test/codemaker/cppumaker/singletons/return.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/short.hpp"
-#include "test/codemaker/cppumaker/singletons/signed.hpp"
-#include "test/codemaker/cppumaker/singletons/sizeof.hpp"
-#include "test/codemaker/cppumaker/singletons/static.hpp"
+#include <test/codemaker/cppumaker/singletons/signed.hpp>
+#include <test/codemaker/cppumaker/singletons/sizeof.hpp>
+#include <test/codemaker/cppumaker/singletons/static.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/struct.hpp"
 //TODO: #include "test/codemaker/cppumaker/singletons/switch.hpp"
-#include "test/codemaker/cppumaker/singletons/template.hpp"
-#include "test/codemaker/cppumaker/singletons/this.hpp"
-#include "test/codemaker/cppumaker/singletons/throw.hpp"
-#include "test/codemaker/cppumaker/singletons/true.hpp"
-#include "test/codemaker/cppumaker/singletons/try.hpp"
+#include <test/codemaker/cppumaker/singletons/template.hpp>
+#include <test/codemaker/cppumaker/singletons/this.hpp>
+#include <test/codemaker/cppumaker/singletons/throw.hpp>
+#include <test/codemaker/cppumaker/singletons/true.hpp>
+#include <test/codemaker/cppumaker/singletons/try.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/typedef.hpp"
-#include "test/codemaker/cppumaker/singletons/typeid.hpp"
-#include "test/codemaker/cppumaker/singletons/typename.hpp"
+#include <test/codemaker/cppumaker/singletons/typeid.hpp>
+#include <test/codemaker/cppumaker/singletons/typename.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/union.hpp"
 //TODO: #include "test/codemaker/cppumaker/singletons/unsigned.hpp"
-#include "test/codemaker/cppumaker/singletons/using.hpp"
-#include "test/codemaker/cppumaker/singletons/virtual.hpp"
+#include <test/codemaker/cppumaker/singletons/using.hpp>
+#include <test/codemaker/cppumaker/singletons/virtual.hpp>
 //TODO: #include "test/codemaker/cppumaker/singletons/void.hpp"
-#include "test/codemaker/cppumaker/singletons/volatile.hpp"
-#include "test/codemaker/cppumaker/singletons/while.hpp"
-#include "test/codemaker/cppumaker/singletons/and.hpp"
-#include "test/codemaker/cppumaker/singletons/bitand.hpp"
-#include "test/codemaker/cppumaker/singletons/bitor.hpp"
-#include "test/codemaker/cppumaker/singletons/compl.hpp"
-#include "test/codemaker/cppumaker/singletons/not.hpp"
-#include "test/codemaker/cppumaker/singletons/or.hpp"
-#include "test/codemaker/cppumaker/singletons/xor.hpp"
-#include "test/codemaker/cppumaker/singletons/BUFSIZ.hpp"
-#include "test/codemaker/cppumaker/singletons/CLOCKS_PER_SEC.hpp"
-#include "test/codemaker/cppumaker/singletons/EDOM.hpp"
-#include "test/codemaker/cppumaker/singletons/EOF.hpp"
-#include "test/codemaker/cppumaker/singletons/ERANGE.hpp"
-#include "test/codemaker/cppumaker/singletons/EXIT_FAILURE.hpp"
-#include "test/codemaker/cppumaker/singletons/EXIT_SUCCESS.hpp"
-#include "test/codemaker/cppumaker/singletons/FILENAME_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/FOPEN_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/HUGE_VAL.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_ALL.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_COLLATE.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_CTYPE.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_MONETARY.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_NUMERIC.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_TIME.hpp"
-#include "test/codemaker/cppumaker/singletons/L_tmpnam.hpp"
-#include "test/codemaker/cppumaker/singletons/MB_CUR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/NULL.hpp"
-#include "test/codemaker/cppumaker/singletons/RAND_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/SEEK_CUR.hpp"
-#include "test/codemaker/cppumaker/singletons/SEEK_END.hpp"
-#include "test/codemaker/cppumaker/singletons/SEEK_SET.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGABRT.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGFPE.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGILL.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGINT.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGSEGV.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGTERM.hpp"
-#include "test/codemaker/cppumaker/singletons/SIG_DFL.hpp"
-#include "test/codemaker/cppumaker/singletons/SIG_ERR.hpp"
-#include "test/codemaker/cppumaker/singletons/SIG_IGN.hpp"
-#include "test/codemaker/cppumaker/singletons/TMP_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/WCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/WCHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/WEOF.hpp"
-#include "test/codemaker/cppumaker/singletons/assert.hpp"
-#include "test/codemaker/cppumaker/singletons/errno.hpp"
-#include "test/codemaker/cppumaker/singletons/offsetof.hpp"
-#include "test/codemaker/cppumaker/singletons/setjmp.hpp"
-#include "test/codemaker/cppumaker/singletons/stderr.hpp"
-#include "test/codemaker/cppumaker/singletons/stdin.hpp"
-#include "test/codemaker/cppumaker/singletons/stdout.hpp"
-#include "test/codemaker/cppumaker/singletons/CHAR_BIT.hpp"
-#include "test/codemaker/cppumaker/singletons/CHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/CHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_EPSILON.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_EPSILON.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_RADIX.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_ROUNDS.hpp"
-#include "test/codemaker/cppumaker/singletons/INT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/INT_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_EPSILON.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/LONG_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/LONG_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/MB_LEN_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/SCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/SCHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/SHRT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/SHRT_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/UCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/UINT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/ULONG_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/USHRT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/FILE.hpp"
-#include "test/codemaker/cppumaker/singletons/lconv.hpp"
-#include "test/codemaker/cppumaker/singletons/tm.hpp"
-#include "test/codemaker/cppumaker/singletons/std.hpp"
-#include "test/codemaker/cppumaker/singletons/NDEBUG.hpp"
-#include "test/codemaker/cppumaker/singletons/get.hpp"
-#include "test/codemaker/cppumaker/HelperEnum.hpp"
-#include "test/codemaker/cppumaker/HelperStruct.hpp"
-#include "test/codemaker/cppumaker/BigStruct.hpp"
-#include "test/codemaker/cppumaker/Struct.hpp"
-#include "test/codemaker/cppumaker/StructUsage.hpp"
-#include "test/codemaker/cppumaker/AlignmentDerivedStruct.hpp"
-#include "test/codemaker/cppumaker/TestException1.hpp"
-#include "test/codemaker/cppumaker/TestException2.hpp"
-#include "test/codemaker/cppumaker/Constants.hpp"
+#include <test/codemaker/cppumaker/singletons/volatile.hpp>
+#include <test/codemaker/cppumaker/singletons/while.hpp>
+#include <test/codemaker/cppumaker/singletons/and.hpp>
+#include <test/codemaker/cppumaker/singletons/bitand.hpp>
+#include <test/codemaker/cppumaker/singletons/bitor.hpp>
+#include <test/codemaker/cppumaker/singletons/compl.hpp>
+#include <test/codemaker/cppumaker/singletons/not.hpp>
+#include <test/codemaker/cppumaker/singletons/or.hpp>
+#include <test/codemaker/cppumaker/singletons/xor.hpp>
+#include <test/codemaker/cppumaker/singletons/BUFSIZ.hpp>
+#include <test/codemaker/cppumaker/singletons/CLOCKS_PER_SEC.hpp>
+#include <test/codemaker/cppumaker/singletons/EDOM.hpp>
+#include <test/codemaker/cppumaker/singletons/EOF.hpp>
+#include <test/codemaker/cppumaker/singletons/ERANGE.hpp>
+#include <test/codemaker/cppumaker/singletons/EXIT_FAILURE.hpp>
+#include <test/codemaker/cppumaker/singletons/EXIT_SUCCESS.hpp>
+#include <test/codemaker/cppumaker/singletons/FILENAME_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/FOPEN_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/HUGE_VAL.hpp>
+#include <test/codemaker/cppumaker/singletons/LC_ALL.hpp>
+#include <test/codemaker/cppumaker/singletons/LC_COLLATE.hpp>
+#include <test/codemaker/cppumaker/singletons/LC_CTYPE.hpp>
+#include <test/codemaker/cppumaker/singletons/LC_MONETARY.hpp>
+#include <test/codemaker/cppumaker/singletons/LC_NUMERIC.hpp>
+#include <test/codemaker/cppumaker/singletons/LC_TIME.hpp>
+#include <test/codemaker/cppumaker/singletons/L_tmpnam.hpp>
+#include <test/codemaker/cppumaker/singletons/MB_CUR_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/NULL.hpp>
+#include <test/codemaker/cppumaker/singletons/RAND_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/SEEK_CUR.hpp>
+#include <test/codemaker/cppumaker/singletons/SEEK_END.hpp>
+#include <test/codemaker/cppumaker/singletons/SEEK_SET.hpp>
+#include <test/codemaker/cppumaker/singletons/SIGABRT.hpp>
+#include <test/codemaker/cppumaker/singletons/SIGFPE.hpp>
+#include <test/codemaker/cppumaker/singletons/SIGILL.hpp>
+#include <test/codemaker/cppumaker/singletons/SIGINT.hpp>
+#include <test/codemaker/cppumaker/singletons/SIGSEGV.hpp>
+#include <test/codemaker/cppumaker/singletons/SIGTERM.hpp>
+#include <test/codemaker/cppumaker/singletons/SIG_DFL.hpp>
+#include <test/codemaker/cppumaker/singletons/SIG_ERR.hpp>
+#include <test/codemaker/cppumaker/singletons/SIG_IGN.hpp>
+#include <test/codemaker/cppumaker/singletons/TMP_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/WCHAR_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/WCHAR_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/WEOF.hpp>
+#include <test/codemaker/cppumaker/singletons/assert.hpp>
+#include <test/codemaker/cppumaker/singletons/errno.hpp>
+#include <test/codemaker/cppumaker/singletons/offsetof.hpp>
+#include <test/codemaker/cppumaker/singletons/setjmp.hpp>
+#include <test/codemaker/cppumaker/singletons/stderr.hpp>
+#include <test/codemaker/cppumaker/singletons/stdin.hpp>
+#include <test/codemaker/cppumaker/singletons/stdout.hpp>
+#include <test/codemaker/cppumaker/singletons/CHAR_BIT.hpp>
+#include <test/codemaker/cppumaker/singletons/CHAR_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/CHAR_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_DIG.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_EPSILON.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_MANT_DIG.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_MAX_10_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_MAX_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_MIN_10_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/DBL_MIN_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_DIG.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_EPSILON.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_MANT_DIG.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_MAX_10_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_MAX_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_MIN_10_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_MIN_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_RADIX.hpp>
+#include <test/codemaker/cppumaker/singletons/FLT_ROUNDS.hpp>
+#include <test/codemaker/cppumaker/singletons/INT_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/INT_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_DIG.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_EPSILON.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_MANT_DIG.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_MAX_10_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_MAX_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_MIN_10_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/LDBL_MIN_EXP.hpp>
+#include <test/codemaker/cppumaker/singletons/LONG_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/LONG_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/MB_LEN_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/SCHAR_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/SCHAR_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/SHRT_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/SHRT_MIN.hpp>
+#include <test/codemaker/cppumaker/singletons/UCHAR_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/UINT_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/ULONG_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/USHRT_MAX.hpp>
+#include <test/codemaker/cppumaker/singletons/FILE.hpp>
+#include <test/codemaker/cppumaker/singletons/lconv.hpp>
+#include <test/codemaker/cppumaker/singletons/tm.hpp>
+#include <test/codemaker/cppumaker/singletons/std.hpp>
+#include <test/codemaker/cppumaker/singletons/NDEBUG.hpp>
+#include <test/codemaker/cppumaker/singletons/get.hpp>
+#include <test/codemaker/cppumaker/HelperEnum.hpp>
+#include <test/codemaker/cppumaker/HelperStruct.hpp>
+#include <test/codemaker/cppumaker/BigStruct.hpp>
+#include <test/codemaker/cppumaker/Struct.hpp>
+#include <test/codemaker/cppumaker/StructUsage.hpp>
+#include <test/codemaker/cppumaker/AlignmentDerivedStruct.hpp>
+#include <test/codemaker/cppumaker/TestException1.hpp>
+#include <test/codemaker/cppumaker/TestException2.hpp>
+#include <test/codemaker/cppumaker/Constants.hpp>
 
 #include <memory>
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Type.hxx"
-#include "com/sun/star/uno/TypeClass.hpp"
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Type.hxx>
+#include <com/sun/star/uno/TypeClass.hpp>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 #include <cstddef>
 #include <iostream>
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 33485fbcaa00..1ee826387191 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -28,32 +28,32 @@
 #include <cppunit/plugin/TestPlugIn.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "Enum1.hpp"
-#include "Enum2.hpp"
-#include "Exception1.hpp"
-#include "Exception2.hpp"
-#include "Exception2a.hpp"
-#include "Exception2b.hpp"
-#include "Interface1.hpp"
-#include "Interface2.hpp"
-#include "Interface2a.hpp"
-#include "Interface2b.hpp"
-#include "Interface3.hpp"
-#include "Poly.hpp"
-#include "Struct1.hpp"
-#include "Struct2.hpp"
-#include "Struct2a.hpp"
-#include "Struct2b.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/Type.hxx"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "osl/interlck.h"
-#include "rtl/string.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
+#include <Enum1.hpp>
+#include <Enum2.hpp>
+#include <Exception1.hpp>
+#include <Exception2.hpp>
+#include <Exception2a.hpp>
+#include <Exception2b.hpp>
+#include <Interface1.hpp>
+#include <Interface2.hpp>
+#include <Interface2a.hpp>
+#include <Interface2b.hpp>
+#include <Interface3.hpp>
+#include <Poly.hpp>
+#include <Struct1.hpp>
+#include <Struct2.hpp>
+#include <Struct2a.hpp>
+#include <Struct2b.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Type.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <osl/interlck.h>
+#include <rtl/string.h>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
 
 namespace {
 
diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx
index e23a7e57b524..40aee4c30e6f 100644
--- a/cppu/qa/test_recursion.cxx
+++ b/cppu/qa/test_recursion.cxx
@@ -25,7 +25,7 @@
 #include <cppunit/plugin/TestPlugIn.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "Rec.hpp"
+#include <Rec.hpp>
 
 namespace
 {
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index e02db2dce445..b0902525f209 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -25,9 +25,9 @@
 #include <cppunit/plugin/TestPlugIn.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "Interface1.hpp"
+#include <Interface1.hpp>
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 namespace
 {
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 32f6db263c6e..08fa36d05ee6 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -27,19 +27,19 @@
 
 #include <typeinfo>
 
-#include "com/sun/star/beans/Optional.hpp"
-#include "com/sun/star/beans/PropertyChangeEvent.hpp"
-#include "com/sun/star/lang/EventObject.hpp"
-#include "com/sun/star/uno/Exception.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/Type.hxx"
-#include "com/sun/star/uno/TypeClass.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "cppu/unotype.hxx"
-#include "rtl/ustring.hxx"
+#include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/beans/PropertyChangeEvent.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Type.hxx>
+#include <com/sun/star/uno/TypeClass.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <cppu/unotype.hxx>
+#include <rtl/ustring.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class Any;
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index db5fa824b9f5..bf0455f689a1 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -18,14 +18,14 @@
  */
 
 
-#include "osl/thread.hxx"
-#include "osl/conditn.hxx"
-#include "osl/mutex.hxx"
+#include <osl/thread.hxx>
+#include <osl/conditn.hxx>
+#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 
 #include <cppu/Enterable.hxx>
-#include "cppu/helper/purpenv/Environment.hxx"
-#include "cppu/helper/purpenv/Mapping.hxx"
+#include <cppu/helper/purpenv/Environment.hxx>
+#include <cppu/helper/purpenv/Mapping.hxx>
 
 
 class InnerThread;
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index ac99c395e8f9..2e891603c152 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -18,17 +18,17 @@
  */
 
 
-#include "osl/mutex.hxx"
-#include "osl/thread.h"
-#include "osl/thread.hxx"
+#include <osl/mutex.hxx>
+#include <osl/thread.h>
+#include <osl/thread.hxx>
 #include <osl/diagnose.h>
-#include "uno/dispatcher.h"
-#include "typelib/typedescription.hxx"
+#include <uno/dispatcher.h>
+#include <typelib/typedescription.hxx>
 #include <cppu/Enterable.hxx>
-#include "cppu/helper/purpenv/Environment.hxx"
-#include "cppu/helper/purpenv/Mapping.hxx"
-#include "cppu/EnvDcp.hxx"
-#include "uno/environment.hxx"
+#include <cppu/helper/purpenv/Environment.hxx>
+#include <cppu/helper/purpenv/Mapping.hxx>
+#include <cppu/EnvDcp.hxx>
+#include <uno/environment.hxx>
 #include <com/sun/star/uno/Type.hxx>
 #include <sal/log.hxx>
 
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 17a375a319dd..772f2a7bd703 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "osl/mutex.hxx"
-#include "osl/thread.h"
-#include "osl/thread.hxx"
-#include "sal/log.hxx"
+#include <osl/mutex.hxx>
+#include <osl/thread.h>
+#include <osl/thread.hxx>
+#include <sal/log.hxx>
 
 #include <cppu/Enterable.hxx>
-#include "cppu/helper/purpenv/Environment.hxx"
-#include "cppu/helper/purpenv/Mapping.hxx"
+#include <cppu/helper/purpenv/Environment.hxx>
+#include <cppu/helper/purpenv/Mapping.hxx>
 
 class UnsafeBridge : public cppu::Enterable
 {
diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx
index ac37da66f7bf..ad4c5142a08f 100644
--- a/cppu/source/cppu/cppu_opt.cxx
+++ b/cppu/source/cppu/cppu_opt.cxx
@@ -21,9 +21,9 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include "typelib/typedescription.h"
-#include "uno/any2.h"
-#include "rtl/ustrbuf.hxx"
+#include <typelib/typedescription.h>
+#include <uno/any2.h>
+#include <rtl/ustrbuf.hxx>
 
 
 using namespace ::rtl;
diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx
index 037c68e8dc05..3c270fa6421a 100644
--- a/cppu/source/helper/purpenv/Proxy.hxx
+++ b/cppu/source/helper/purpenv/Proxy.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_CPPU_SOURCE_HELPER_PURPENV_PROXY_HXX
 #define INCLUDED_CPPU_SOURCE_HELPER_PURPENV_PROXY_HXX
 
-#include "osl/interlck.h"
+#include <osl/interlck.h>
 
-#include "uno/environment.hxx"
-#include "uno/mapping.hxx"
-#include "uno/dispatcher.h"
+#include <uno/environment.hxx>
+#include <uno/mapping.hxx>
+#include <uno/dispatcher.h>
 
-#include "cppu/helper/purpenv/Mapping.hxx"
+#include <cppu/helper/purpenv/Mapping.hxx>
 
 
 class Proxy : public uno_Interface
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 9e4925335306..4143e4838515 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -18,14 +18,14 @@
  */
 
 
-#include "cppu/helper/purpenv/Environment.hxx"
+#include <cppu/helper/purpenv/Environment.hxx>
 
-#include "osl/diagnose.h"
-#include "uno/lbnames.h"
+#include <osl/diagnose.h>
+#include <uno/lbnames.h>
 #include <cppu/Enterable.hxx>
 
-#include "typelib/typedescription.h"
-#include "osl/interlck.h"
+#include <typelib/typedescription.h>
+#include <osl/interlck.h>
 
 extern "C" {
 typedef void SAL_CALL EnvFun_P   (uno_Environment *);
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 23c3510a4c9f..f065d3c7ecca 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -18,14 +18,14 @@
  */
 
 
-#include "cppu/helper/purpenv/Mapping.hxx"
+#include <cppu/helper/purpenv/Mapping.hxx>
 
 #include "Proxy.hxx"
 
-#include "osl/interlck.h"
-#include "uno/environment.hxx"
-#include "uno/dispatcher.h"
-#include "typelib/typedescription.h"
+#include <osl/interlck.h>
+#include <uno/environment.hxx>
+#include <uno/dispatcher.h>
+#include <typelib/typedescription.h>
 
 using namespace com::sun::star;
 
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index ae46da96dcad..048f393d6466 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -20,10 +20,10 @@
 
 #include "Proxy.hxx"
 
-#include "sal/alloca.h"
-#include "uno/dispatcher.h"
-#include "typelib/typedescription.hxx"
-#include "cppu/EnvDcp.hxx"
+#include <sal/alloca.h>
+#include <uno/dispatcher.h>
+#include <typelib/typedescription.hxx>
+#include <cppu/EnvDcp.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index 1b82a02d30cc..f0bb7e750a94 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -20,14 +20,14 @@
 #include <sal/config.h>
 
 #include <rtl/byteseq.h>
-#include "rtl/uuid.h"
-#include "osl/thread.h"
-#include "osl/mutex.hxx"
-
-#include "uno/current_context.h"
-#include "uno/environment.hxx"
-#include "uno/mapping.hxx"
-#include "typelib/typedescription.h"
+#include <rtl/uuid.h>
+#include <osl/thread.h>
+#include <osl/mutex.hxx>
+
+#include <uno/current_context.h>
+#include <uno/environment.hxx>
+#include <uno/mapping.hxx>
+#include <typelib/typedescription.h>
 
 #include "current.hxx"
 
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index 39774c9eec69..b54036d2cfd2 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cassert>
 #include <chrono>
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 45653b079c45..3fb0bf6ab62a 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/cppu/source/uno/EnvDcp.cxx b/cppu/source/uno/EnvDcp.cxx
index 5e2ac2e2f97c..c5597dec47a5 100644
--- a/cppu/source/uno/EnvDcp.cxx
+++ b/cppu/source/uno/EnvDcp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "uno/EnvDcp.h"
+#include <uno/EnvDcp.h>
 
 
 void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName)
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 1efdbfb81622..4a2fd8146328 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "uno/environment.hxx"
+#include <uno/environment.hxx>
 #include <uno/lbnames.h>
 
-#include "cppu/EnvDcp.hxx"
-#include "cppu/Enterable.hxx"
+#include <cppu/EnvDcp.hxx>
+#include <cppu/Enterable.hxx>
 
-#include "rtl/instance.hxx"
+#include <rtl/instance.hxx>
 
-#include "osl/thread.h"
-#include "osl/thread.hxx"
-#include "osl/mutex.hxx"
+#include <osl/thread.h>
+#include <osl/thread.hxx>
+#include <osl/mutex.hxx>
 
 #include <unordered_map>
 
diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 4f8266cb3aa0..659c9cdc7385 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -19,11 +19,11 @@
 
 #include "IdentityMapping.hxx"
 
-#include "typelib/typedescription.h"
-#include "uno/mapping.h"
-#include "uno/environment.hxx"
+#include <typelib/typedescription.h>
+#include <uno/mapping.h>
+#include <uno/environment.hxx>
 
-#include "osl/interlck.h"
+#include <osl/interlck.h>
 
 
 using namespace ::com::sun::star;
diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx
index 74d900200740..ee1fe3b9648d 100644
--- a/cppu/source/uno/IdentityMapping.hxx
+++ b/cppu/source/uno/IdentityMapping.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CPPU_SOURCE_UNO_IDENTITYMAPPING_HXX
 #define INCLUDED_CPPU_SOURCE_UNO_IDENTITYMAPPING_HXX
 
-#include "uno/mapping.h"
+#include <uno/mapping.h>
 
 namespace com { namespace sun { namespace star { namespace uno {
 class Environment;
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index e5dc561badd3..81ef313cfcf3 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "osl/interlck.h"
-#include "rtl/ustring.hxx"
-#include "uno/environment.hxx"
+#include <osl/interlck.h>
+#include <rtl/ustring.hxx>
+#include <uno/environment.hxx>
 #include <uno/lbnames.h>
-#include "uno/mapping.hxx"
-#include "uno/dispatcher.h"
+#include <uno/mapping.hxx>
+#include <uno/dispatcher.h>
 
-#include "cppu/EnvDcp.hxx"
+#include <cppu/EnvDcp.hxx>
 
 #include "cascade_mapping.hxx"
 
diff --git a/cppu/source/uno/cascade_mapping.hxx b/cppu/source/uno/cascade_mapping.hxx
index 2344f6e0a01d..37f0f1d5b643 100644
--- a/cppu/source/uno/cascade_mapping.hxx
+++ b/cppu/source/uno/cascade_mapping.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CPPU_SOURCE_UNO_CASCADE_MAPPING_HXX
 #define INCLUDED_CPPU_SOURCE_UNO_CASCADE_MAPPING_HXX
 
-#include "uno/environment.h"
-#include "uno/mapping.h"
-#include "rtl/ustring.h"
+#include <uno/environment.h>
+#include <uno/mapping.h>
+#include <rtl/ustring.h>
 
 
 void getCascadeMapping(uno_Mapping     ** ppMapping,
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index d351dcf6ae6f..68d114dc940f 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -20,9 +20,9 @@
 
 #include <cstddef>
 
-#include "osl/mutex.hxx"
-#include "sal/log.hxx"
-#include "uno/data.h"
+#include <osl/mutex.hxx>
+#include <sal/log.hxx>
+#include <uno/data.h>
 
 #include "constr.hxx"
 #include "destr.hxx"
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index fe02245527cf..01a300ed94d1 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -19,23 +19,23 @@
 
 #include <config_features.h>
 
-#include "cppu/EnvDcp.hxx"
-
-#include "sal/log.hxx"
-#include "osl/diagnose.h"
-#include "osl/interlck.h"
-#include "osl/mutex.hxx"
-#include "osl/module.h"
-#include "osl/process.h"
-#include "rtl/process.h"
-#include "rtl/string.hxx"
-#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/instance.hxx"
-#include "typelib/typedescription.h"
-#include "uno/dispatcher.h"
-#include "uno/environment.h"
-#include "uno/lbnames.h"
+#include <cppu/EnvDcp.hxx>
+
+#include <sal/log.hxx>
+#include <osl/diagnose.h>
+#include <osl/interlck.h>
+#include <osl/mutex.hxx>
+#include <osl/module.h>
+#include <osl/process.h>
+#include <rtl/process.h>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/instance.hxx>
+#include <typelib/typedescription.h>
+#include <uno/dispatcher.h>
+#include <uno/environment.h>
+#include <uno/lbnames.h>
 #include "prim.hxx"
 #include "destr.hxx"
 #include "loadmodule.hxx"
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index ecd89ecdc328..4bdf0a6d6d8e 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -26,22 +26,22 @@
 #include <set>
 #include <unordered_map>
 
-#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "osl/module.h"
-#include "osl/diagnose.h"
-#include "osl/mutex.hxx"
-#include "osl/interlck.h"
-#include "sal/log.hxx"
-
-#include "uno/dispatcher.h"
-#include "uno/mapping.h"
-#include "uno/lbnames.h"
-#include "uno/environment.hxx"
-
-#include "typelib/typedescription.h"
-
-#include "cppu/EnvDcp.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <osl/module.h>
+#include <osl/diagnose.h>
+#include <osl/mutex.hxx>
+#include <osl/interlck.h>
+#include <sal/log.hxx>
+
+#include <uno/dispatcher.h>
+#include <uno/mapping.h>
+#include <uno/lbnames.h>
+#include <uno/environment.hxx>
+
+#include <typelib/typedescription.h>
+
+#include <cppu/EnvDcp.hxx>
 #include "cascade_mapping.hxx"
 #include "loadmodule.hxx"
 
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index 1d8ab7576a67..ef8e65a7ffb9 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -18,12 +18,12 @@
  */
 
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "osl/module.h"
-#include "rtl/string.h"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/ustring.hxx"
+#include <osl/module.h>
+#include <rtl/string.h>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
 
 #include "loadmodule.hxx"
 
diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx
index a87c7b1ac3a1..9021118477d6 100644
--- a/cppu/source/uno/loadmodule.hxx
+++ b/cppu/source/uno/loadmodule.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CPPU_SOURCE_UNO_LOADMODULE_HXX
 #define INCLUDED_CPPU_SOURCE_UNO_LOADMODULE_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 #include <osl/module.hxx>
 
 namespace rtl { class OUString; }
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index f497f6f6cf5d..e8245248be6f 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -19,18 +19,18 @@
 #ifndef INCLUDED_CPPU_SOURCE_UNO_PRIM_HXX
 #define INCLUDED_CPPU_SOURCE_UNO_PRIM_HXX
 
-#include "typelib/typedescription.h"
-#include "typelib/typeclass.h"
-#include "uno/sequence2.h"
-#include "uno/any2.h"
-#include "uno/data.h"
-#include "uno/mapping.h"
-#include "uno/dispatcher.h"
-
-#include "osl/interlck.h"
-#include "osl/diagnose.h"
-#include "rtl/ustring.hxx"
-#include "rtl/alloc.h"
+#include <typelib/typedescription.h>
+#include <typelib/typeclass.h>
+#include <uno/sequence2.h>
+#include <uno/any2.h>
+#include <uno/data.h>
+#include <uno/mapping.h>
+#include <uno/dispatcher.h>
+
+#include <osl/interlck.h>
+#include <osl/diagnose.h>
+#include <rtl/ustring.hxx>
+#include <rtl/alloc.h>
 
 namespace cppu
 {
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 3fbe338cfc00..7d54c4244bdb 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cassert>
 #include <string.h>