diff --git a/include/basic/basicdllapi.h b/include/basic/basicdllapi.h
index ceee64bab211..3bdd9e519f36 100644
--- a/include/basic/basicdllapi.h
+++ b/include/basic/basicdllapi.h
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_BASIC_BASICDLLAPI_H
 #define INCLUDED_BASIC_BASICDLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined(BASIC_DLLIMPLEMENTATION)
 #define BASIC_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx
index 0895f8152df9..6d0c4cb44343 100644
--- a/include/basic/basicmanagerrepository.hxx
+++ b/include/basic/basicmanagerrepository.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class BasicManager;
 
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 409688cb5abc..1a2281a33ac9 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -23,7 +23,7 @@
 #include <basic/sbstar.hxx>
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 #include <vector>
 
 // Basic XML Import/Export
diff --git a/include/basic/basrdll.hxx b/include/basic/basrdll.hxx
index b5b8cd7ded2f..bf6ba731cb11 100644
--- a/include/basic/basrdll.hxx
+++ b/include/basic/basrdll.hxx
@@ -23,7 +23,7 @@
 class ResMgr;
 
 #include <vcl/accel.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class BASIC_DLLPUBLIC BasicDLL
 {
diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx
index 66eded12018a..9acf42feac66 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <cppuhelper/implbase1.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
 {
diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx
index 932d7e8fdad0..1444241ac93f 100644
--- a/include/basic/sbdef.hxx
+++ b/include/basic/sbdef.hxx
@@ -22,7 +22,7 @@
 
 #include <basic/sbxdef.hxx>
 #include <rtl/ustring.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 // Returns type name for Basic type, array flag is ignored
 // implementation: basic/source/runtime/methods.cxx
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index b8f0a17d23a3..9a3fd88c328b 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -23,7 +23,7 @@
 #include <tools/errcode.hxx>
 #include <basic/sbxmeth.hxx>
 #include <basic/sbdef.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class SbModule;
 
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index dc88fd788904..62e3ebe12f79 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -28,7 +28,7 @@
 #include <vector>
 #include <deque>
 #include <boost/utility.hpp>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 #include <basic/codecompletecache.hxx>
 
 class SbMethod;
diff --git a/include/basic/sbobjmod.hxx b/include/basic/sbobjmod.hxx
index ee0444d1528c..faa560a5676f 100644
--- a/include/basic/sbobjmod.hxx
+++ b/include/basic/sbobjmod.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/awt/XDialog.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 // Basic-Module for excel object.
 
diff --git a/include/basic/sbprop.hxx b/include/basic/sbprop.hxx
index 456cf759f889..a551f6cc50cf 100644
--- a/include/basic/sbprop.hxx
+++ b/include/basic/sbprop.hxx
@@ -22,7 +22,7 @@
 
 #include <basic/sbxprop.hxx>
 #include <basic/sbdef.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class SbModule;
 
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index acfe99626e9f..23816dcb5d5e 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -30,7 +30,7 @@
 #include <basic/sberrors.hxx>
 #include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class SbModule;                     // completed module
 class SbiInstance;                  // runtime instance
diff --git a/include/basic/sbstdobj.hxx b/include/basic/sbstdobj.hxx
index 75a5a6ecb452..44c9230cda75 100644
--- a/include/basic/sbstdobj.hxx
+++ b/include/basic/sbstdobj.hxx
@@ -23,7 +23,7 @@
 #include <basic/sbxobj.hxx>
 #include <vcl/graph.hxx>
 #include <basic/sbxfac.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 //--------------------
 // class SbStdFactory
diff --git a/include/basic/sbuno.hxx b/include/basic/sbuno.hxx
index 9feaf8ce30bb..03fb8cac81b6 100644
--- a/include/basic/sbuno.hxx
+++ b/include/basic/sbuno.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Type.hxx>
 #include <basic/sbxobj.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace uno { class Any; }}}}
 
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 7bfe55e783ef..ce3c4748f495 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -20,16 +20,16 @@
 #ifndef INCLUDED_BASIC_SBX_HXX
 #define INCLUDED_BASIC_SBX_HXX
 
-#include "tools/ref.hxx"
-#include "svl/smplhint.hxx"
-#include "svl/lstner.hxx"
+#include <tools/ref.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/lstner.hxx>
 
 #include <basic/sbxdef.hxx>
 #include <basic/sbxform.hxx>
 #include <basic/sbxobj.hxx>
 #include <basic/sbxprop.hxx>
 #include <basic/sbxmeth.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
diff --git a/include/basic/sbxbase.hxx b/include/basic/sbxbase.hxx
index d53d11a2dcec..88c7380310ac 100644
--- a/include/basic/sbxbase.hxx
+++ b/include/basic/sbxbase.hxx
@@ -22,7 +22,7 @@
 
 #include <i18nlangtag/lang.h>
 #include <basic/sbxdef.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 class SbxFactory;
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index de81e628381b..78208982c8f5 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -25,7 +25,7 @@
 #include <tools/debug.hxx>
 
 #include <basic/sbxdef.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class SvStream;
 
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 4c1630a1d2d6..333d7f2052a7 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -24,7 +24,7 @@
 
 #ifndef __RSC
 #include <tools/solar.h>
-#include "tools/errcode.hxx"
+#include <tools/errcode.hxx>
 
 enum SbxClassType {         // SBX-class-IDs (order is important!)
     SbxCLASS_DONTCARE = 1,  // don't care (search, not 0 due to StarBASIC)
diff --git a/include/basic/sbxfac.hxx b/include/basic/sbxfac.hxx
index b0bdda7da678..698e582e692e 100644
--- a/include/basic/sbxfac.hxx
+++ b/include/basic/sbxfac.hxx
@@ -22,7 +22,7 @@
 
 #include <basic/sbxdef.hxx>
 #include <rtl/ustring.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class SbxBase;
 class SbxObject;
diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx
index 7d1c60f0ea56..73528afd7d1d 100644
--- a/include/basic/sbxform.hxx
+++ b/include/basic/sbxform.hxx
@@ -77,7 +77,7 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class BASIC_DLLPUBLIC SbxBasicFormater {
   public:
diff --git a/include/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx
index d64d239a1081..6874867c71ee 100644
--- a/include/basic/sbxmeth.hxx
+++ b/include/basic/sbxmeth.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_BASIC_SBXMETH_HXX
 
 #include <basic/sbxvar.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class BASIC_DLLPUBLIC SbxMethod : public SbxVariable
 {
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index bf04c3ac54af..3a02556a2a65 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -22,7 +22,7 @@
 
 #include <svl/lstner.hxx>
 #include <basic/sbxvar.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 
 class SbxProperty;
diff --git a/include/basic/sbxprop.hxx b/include/basic/sbxprop.hxx
index 9ea51c0dbda2..19397c532bd5 100644
--- a/include/basic/sbxprop.hxx
+++ b/include/basic/sbxprop.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_BASIC_SBXPROP_HXX
 
 #include <basic/sbxvar.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 class BASIC_DLLPUBLIC SbxProperty : public SbxVariable
 {
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index dcdb43c721ff..8d8cde39aaae 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/bridge/oleautomation/Decimal.hpp>
 #include <basic/sbxcore.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 
 class SbxDecimal;
diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx
index 416e0a996e63..fe156f67e388 100644
--- a/include/basic/vbahelper.hxx
+++ b/include/basic/vbahelper.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <rtl/ustring.hxx>
-#include "basicdllapi.h"
+#include <basic/basicdllapi.h>
 
 namespace basic {
 namespace vba {