5 files changed, 349 insertions, 349 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;