diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index dfbb81021c30..a39acef6f126 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -109,11 +109,11 @@
 #include <basic/sbstar.hxx>
 #include <basic/sbuno.hxx>
 #include <basic/sbx.hxx>
-#include <basic/sbxfac.hxx>
-#include <basic/sbxform.hxx>
+#include <sbxfac.hxx>
+#include <sbxform.hxx>
 #include <basic/sbxmeth.hxx>
 #include <basic/sbxobj.hxx>
-#include <basic/sbxprop.hxx>
+#include <sbxprop.hxx>
 #include <basic/sbxvar.hxx>
 #include <date.hxx>
 #include <iosys.hxx>
diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx
index 383b4d914e2a..bd4a8b117c54 100644
--- a/basic/inc/sbprop.hxx
+++ b/basic/inc/sbprop.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_BASIC_INC_SBPROP_HXX
 #define INCLUDED_BASIC_INC_SBPROP_HXX
 
-#include <basic/sbxprop.hxx>
+#include "sbxprop.hxx"
 #include <basic/sbdef.hxx>
 
 class SbModule;
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 965940c8ddcd..ad242dfb1489 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -22,7 +22,7 @@
 
 #include <basic/sbxobj.hxx>
 #include <vcl/graph.hxx>
-#include <basic/sbxfac.hxx>
+#include "sbxfac.hxx"
 #include <basic/basicdllapi.h>
 
 class SbStdFactory final : public SbxFactory
diff --git a/include/basic/sbxfac.hxx b/basic/inc/sbxfac.hxx
similarity index 94%
rename from include/basic/sbxfac.hxx
rename to basic/inc/sbxfac.hxx
index a525aa55241a..e9b130eec192 100644
--- a/include/basic/sbxfac.hxx
+++ b/basic/inc/sbxfac.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASIC_SBXFAC_HXX
-#define INCLUDED_BASIC_SBXFAC_HXX
+#pragma once
 
 #include <rtl/ustring.hxx>
 #include <basic/basicdllapi.h>
@@ -35,6 +34,4 @@ public:
     virtual SbxObject* CreateObject( const OUString& );
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/sbxform.hxx b/basic/inc/sbxform.hxx
similarity index 98%
rename from include/basic/sbxform.hxx
rename to basic/inc/sbxform.hxx
index b07a1945c7c7..94dece69832c 100644
--- a/include/basic/sbxform.hxx
+++ b/basic/inc/sbxform.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASIC_SBXFORM_HXX
-#define INCLUDED_BASIC_SBXFORM_HXX
+#pragma once
 
 
 // Implementation class for Basic command: Format$( d,formatStr )
@@ -69,7 +68,6 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <basic/basicdllapi.h>
 
 class SbxBasicFormater {
   public:
@@ -153,6 +151,4 @@ class SbxBasicFormater {
     short   nExpExp;        // the number of digits in the exponent
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/sbxprop.hxx b/basic/inc/sbxprop.hxx
similarity index 92%
rename from include/basic/sbxprop.hxx
rename to basic/inc/sbxprop.hxx
index 34557ad599d8..0c57d0b72799 100644
--- a/include/basic/sbxprop.hxx
+++ b/basic/inc/sbxprop.hxx
@@ -17,11 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASIC_SBXPROP_HXX
-#define INCLUDED_BASIC_SBXPROP_HXX
+#pragma once
 
 #include <basic/sbxvar.hxx>
-#include <basic/basicdllapi.h>
 
 class SbxProperty : public SbxVariable
 {
@@ -36,6 +34,4 @@ public:
 };
 
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 959681636dcd..a7f6c75a4bdc 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -23,7 +23,7 @@
 #include <sal/log.hxx>
 #include <basic/sbx.hxx>
 #include <sb.hxx>
-#include <basic/sbxprop.hxx>
+#include <sbxprop.hxx>
 #include <string.h>
 #include <image.hxx>
 #include <codegen.hxx>
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 61b2953486ed..75e3ede9a6bb 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -22,7 +22,7 @@
 
 #include <basic/basicdllapi.h>
 #include <basic/sbstar.hxx>
-#include <basic/sbxfac.hxx>
+#include <sbxfac.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <vcl/errcode.hxx>
 
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 17440c70649d..1d6d9de1d5eb 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -21,8 +21,8 @@
 
 #include <basic/sbxobj.hxx>
 #include <basic/sbxmeth.hxx>
-#include <basic/sbxprop.hxx>
-#include <basic/sbxfac.hxx>
+#include <sbxprop.hxx>
+#include <sbxfac.hxx>
 #include <basic/sbx.hxx>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 #include <com/sun/star/beans/XExactName.hpp>
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 68fc41547714..e2010a600f39 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -23,10 +23,10 @@
 #include <vcl/svapp.hxx>
 
 #include <basic/sbx.hxx>
-#include <basic/sbxfac.hxx>
-#include <basic/sbxform.hxx>
+#include <sbxfac.hxx>
+#include <sbxform.hxx>
 #include <basic/sbxmeth.hxx>
-#include <basic/sbxprop.hxx>
+#include <sbxprop.hxx>
 #include <sbxbase.hxx>
 
 #include <rtl/ustring.hxx>
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index c291f3e23af3..85374facd545 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 
-#include <basic/sbxform.hxx>
+#include <sbxform.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <rtl/character.hxx>
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 143a1ea4156d..5c7185276ac7 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -27,7 +27,7 @@
 #include <basic/sbx.hxx>
 #include <basic/sberrors.hxx>
 #include <basic/sbxmeth.hxx>
-#include <basic/sbxprop.hxx>
+#include <sbxprop.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include "sbxres.hxx"
 
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index e15039243fea..e264f527c94b 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -33,7 +33,7 @@
 
 #include <sbxbase.hxx>
 #include <sbintern.hxx>
-#include <basic/sbxform.hxx>
+#include <sbxform.hxx>
 
 #include <date.hxx>
 #include <runtime.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 856c5b982c4e..5dcdab99ddd1 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -375,6 +375,9 @@ basic/inc/sbobjmod.hxx
 basic/inc/sbprop.hxx
 basic/inc/sbstdobj.hxx
 basic/inc/sbxbase.hxx
+basic/inc/sbxfac.hxx
+basic/inc/sbxform.hxx
+basic/inc/sbxprop.hxx
 basic/qa/cppunit/basic_coverage.cxx
 basic/qa/cppunit/basictest.cxx
 basic/qa/cppunit/basictest.hxx
@@ -5581,11 +5584,8 @@ include/basic/sbuno.hxx
 include/basic/sbx.hxx
 include/basic/sbxcore.hxx
 include/basic/sbxdef.hxx
-include/basic/sbxfac.hxx
-include/basic/sbxform.hxx
 include/basic/sbxmeth.hxx
 include/basic/sbxobj.hxx
-include/basic/sbxprop.hxx
 include/basic/sbxvar.hxx
 include/basic/vbahelper.hxx
 include/canvas/base/basemutexhelper.hxx