fixincludeguards.sh: basic

Change-Id: Id797a8969e42876092da347d8e1bba6195b697dc

36 files changed, 76 insertions, 76 deletions

diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx
index 415d6395cfdc..203c28162748 100644
--- a/basic/inc/basrid.hxx
+++ b/basic/inc/basrid.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BASRID_HXX
-#define _BASRID_HXX
+#ifndef INCLUDED_BASIC_INC_BASRID_HXX
+#define INCLUDED_BASIC_INC_BASRID_HXX
 
 #include <tools/resid.hxx>
 
@@ -28,6 +28,6 @@ class BasResId : public ResId
     BasResId( sal_uInt32 nId );
 };
 
-#endif //_BASRID_HXX
+#endif // INCLUDED_BASIC_INC_BASRID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx
index b1645eac4429..52204b90ac77 100644
--- a/basic/inc/sb.hxx
+++ b/basic/inc/sb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_HXX
-#define _SB_HXX
+#ifndef INCLUDED_BASIC_INC_SB_HXX
+#define INCLUDED_BASIC_INC_SB_HXX
 
 #include <basic/sberrors.hxx>
 #include <basic/sbdef.hxx>
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 5dbd69143083..342c72079157 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _BASICTEST_HXX
-#define _BASICTEST_HXX
+#ifndef INCLUDED_BASIC_QA_CPPUNIT_BASICTEST_HXX
+#define INCLUDED_BASIC_QA_CPPUNIT_BASICTEST_HXX
 
 #include <sal/types.h>
 #include "cppunit/TestFixture.h"
diff --git a/basic/source/inc/basiccharclass.hxx b/basic/source/inc/basiccharclass.hxx
index 6923d2290adf..335bff650764 100644
--- a/basic/source/inc/basiccharclass.hxx
+++ b/basic/source/inc/basiccharclass.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BASIC_BASICCHARCLASS_HXX
-#define _BASIC_BASICCHARCLASS_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_BASICCHARCLASS_HXX
+#define INCLUDED_BASIC_SOURCE_INC_BASICCHARCLASS_HXX
 
 #include <unotools/charclass.hxx>
 #include <rtl/instance.hxx>
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index 5ac631a71e12..d210361d2a4d 100644
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BUFFER_HXX
-#define _BUFFER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX
+#define INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
 
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index c2478d7e91a8..06baef243e8b 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CODEGEN_HXX
-#define _CODEGEN_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_CODEGEN_HXX
+#define INCLUDED_BASIC_SOURCE_INC_CODEGEN_HXX
 
 class SbiParser;
 class SbModule;
diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx
index cb7070284164..864aab85396b 100644
--- a/basic/source/inc/date.hxx
+++ b/basic/source/inc/date.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBDATE_HXX
-#define _SBDATE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_DATE_HXX
+#define INCLUDED_BASIC_SOURCE_INC_DATE_HXX
 
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 9c5256b8e56d..f89afdfd4747 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_DIALOGCONTAINER_HXX
-#define BASIC_DIALOGCONTAINER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX
 
 #include "namecont.hxx"
 
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 2c59e478cd7e..5e96e694b829 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ERROBJECT_HXX
-#define ERROBJECT_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_ERROBJECT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_ERROBJECT_HXX
 #include "sbunoobj.hxx"
 #include <ooo/vba/XErrObject.hpp>
 
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 0b9eb229a795..9f4b5adc1fff 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXPR_HXX
-#define _EXPR_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_EXPR_HXX
+#define INCLUDED_BASIC_SOURCE_INC_EXPR_HXX
 
 #include "opcodes.hxx"
 #include "token.hxx"
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index fa441d7d92ac..2c3b2874ffe5 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_FILEFMT_HXX
-#define _SB_FILEFMT_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_FILEFMT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_FILEFMT_HXX
 
 #include <tools/solar.h>
 
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 42d19f97b675..81e369ddc908 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBIMAGE_HXX
-#define _SBIMAGE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX
+#define INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX
 
 #include "sbintern.hxx"
 #include <rtl/ustring.hxx>
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 9304dba32c75..80ba1ee95086 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBIOSYS_HXX
-#define _SBIOSYS_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_IOSYS_HXX
+#define INCLUDED_BASIC_SOURCE_INC_IOSYS_HXX
 
 #include <tools/stream.hxx>
 #include <basic/sberrors.hxx>
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 4ac8d09433af..0568a9814631 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_NAMECONTAINER_HXX
-#define BASIC_NAMECONTAINER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX
 
 #include <boost/unordered_map.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index c862da8583c1..38948d7ca2f0 100644
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OPCODES_HXX
-#define _OPCODES_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX
+#define INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX
 
 #include "sbintern.hxx"
 
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 27bb4fb0104f..caf65c56b560 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PARSER_HXX
-#define _PARSER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_PARSER_HXX
+#define INCLUDED_BASIC_SOURCE_INC_PARSER_HXX
 
 #include "expr.hxx"
 #include "codegen.hxx"
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 934d4ef30183..c6ba98ec9ebf 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFX_PROPBAG_HXX
-#define _SFX_PROPBAG_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_PROPACC_HXX
+#define INCLUDED_BASIC_SOURCE_INC_PROPACC_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 0012debbc578..46fc0f8d76d5 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBRUNTIME_HXX
-#define _SBRUNTIME_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_RUNTIME_HXX
+#define INCLUDED_BASIC_SOURCE_INC_RUNTIME_HXX
 
 #include <basic/sbx.hxx>
 
diff --git a/basic/source/inc/sbcomp.hxx b/basic/source/inc/sbcomp.hxx
index 1ca84179457c..0ca6d4a93f96 100644
--- a/basic/source/inc/sbcomp.hxx
+++ b/basic/source/inc/sbcomp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBCOMP_HXX
-#define _SBCOMP_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBCOMP_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBCOMP_HXX
 
 // I've taken the following from the new file by MD! (MT)
 #include "sbintern.hxx"
diff --git a/basic/source/inc/sbdiagnose.hxx b/basic/source/inc/sbdiagnose.hxx
index 2c380e1294ae..d530e59bd955 100644
--- a/basic/source/inc/sbdiagnose.hxx
+++ b/basic/source/inc/sbdiagnose.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_SBDIAGNOSE_HXX
-#define BASIC_SBDIAGNOSE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
 
 #ifdef DBG_UTIL
 void    ResetCapturedAssertions();
 #endif
 
-#endif // BASIC_SBDIAGNOSE_HXX
+#endif // INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 401f7af45e7b..cddc6219f1b7 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_INTERN_HXX
-#define _SB_INTERN_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBINTERN_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBINTERN_HXX
 
 #include <basic/basicdllapi.h>
 #include <basic/sbxfac.hxx>
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index acfe8aa711f0..7031e6a1cd0d 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SB_SBJSMETH_HXX
-#define _SB_SBJSMETH_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBJSMETH_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBJSMETH_HXX
 
 #include <basic/sbmeth.hxx>
 
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index 02c100aa6070..9af385fa301b 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBJSMOD_HXX
-#define _SB_SBJSMOD_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBJSMOD_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBJSMOD_HXX
 
 #include <basic/sbmod.hxx>
 
diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx
index 605d32715c3e..e52a27ceaa60 100644
--- a/basic/source/inc/sbtrace.hxx
+++ b/basic/source/inc/sbtrace.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBTRACE_HXX
-#define _SBTRACE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBTRACE_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBTRACE_HXX
 
 //#define DBG_TRACE_BASIC
 
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 7ee288b95a2a..82ea17cc0331 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SCANNER_HXX
-#define _SCANNER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SCANNER_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SCANNER_HXX
 
 #include <basic/sberrors.hxx>
 
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 3e72904f2d6e..357c66336b6e 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_SCRIPTCONTAINER_HXX
-#define BASIC_SCRIPTCONTAINER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SCRIPTCONT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SCRIPTCONT_HXX
 
 #include "namecont.hxx"
 #include <basic/basmgr.hxx>
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index 12935f78d688..e51a9a059c25 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBSTDOBJ_HXX
-#define _SBSTDOBJ_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_STDOBJ_HXX
+#define INCLUDED_BASIC_SOURCE_INC_STDOBJ_HXX
 
 #include <basic/sbxobj.hxx>
 
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index fa7309e0467c..4a5956da1709 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SYMTBL_HXX
-#define _SYMTBL_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SYMTBL_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SYMTBL_HXX
 
 #include <vector>
 
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index cf127bc798f2..cb40559ea763 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOKEN_HXX
-#define _TOKEN_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX
+#define INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX
 
 #include "scanner.hxx"
 #include <basic/sbdef.hxx>
diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx
index 78a9f47c43fc..a3b5c0c27a92 100644
--- a/basic/source/runtime/comenumwrapper.hxx
+++ b/basic/source/runtime/comenumwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMENUMWRAPPER_HXX
-#define _COMENUMWRAPPER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX
+#define INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX
 
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
@@ -42,6 +42,6 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 };
 
-#endif // _COMENUMWRAPPER_HXX
+#endif // INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index 27be76fe0c10..1f0a9624cb24 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DDECTRL_HXX
-#define _DDECTRL_HXX
+#ifndef INCLUDED_BASIC_SOURCE_RUNTIME_DDECTRL_HXX
+#define INCLUDED_BASIC_SOURCE_RUNTIME_DDECTRL_HXX
 
 #include <tools/link.hxx>
 #include <basic/sberrors.hxx>
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index ffd0b478c16a..90e785135bda 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _INCLUDED_BASIC_RTLPROTO_HXX_
-#define _INCLUDED_BASIC_RTLPROTO_HXX_
+#ifndef INCLUDED_BASIC_SOURCE_RUNTIME_RTLPROTO_HXX
+#define INCLUDED_BASIC_SOURCE_RUNTIME_RTLPROTO_HXX
 
 #include <basic/sbstar.hxx>
 #include "sbtrace.hxx"
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index 433de01ca0e4..a69b7677e11c 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBXCONV_HXX
-#define _SBXCONV_HXX
+#ifndef INCLUDED_BASIC_SOURCE_SBX_SBXCONV_HXX
+#define INCLUDED_BASIC_SOURCE_SBX_SBXCONV_HXX
 
 #include "sbxdec.hxx"
 
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index 73ba5732e4e3..5cabb534a742 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef __SBX_SBX_DEC_HXX
-#define __SBX_SBX_DEC_HXX
+#ifndef INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX
+#define INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX
 
 #ifdef WIN32
 
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index e2e6eb41660e..dcb3fc715765 100644
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBXRES_HXX
-#define _SBXRES_HXX
+#ifndef INCLUDED_BASIC_SOURCE_SBX_SBXRES_HXX
+#define INCLUDED_BASIC_SOURCE_SBX_SBXRES_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/basic/source/uno/sbmodule.hxx b/basic/source/uno/sbmodule.hxx
index b1b91d044221..acab12210bcc 100644
--- a/basic/source/uno/sbmodule.hxx
+++ b/basic/source/uno/sbmodule.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SBMODULE_HXX
-#define SBMODULE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
+#define INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
 
 #include <comphelper/componentmodule.hxx>
 
@@ -81,6 +81,6 @@ namespace basic
 } // namespace basic
 //........................................................................
 
-#endif // SBMODULE_HXX
+#endif // INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */