diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index ab157e216fc7..a8e143b1f1c4 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.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 _NBDTMG_HXX
-#define _NBDTMG_HXX
+#ifndef INCLUDED_SVX_NBDTMG_HXX
+#define INCLUDED_SVX_NBDTMG_HXX
 #include "svx/svxdllapi.h"
 #include <boost/shared_ptr.hpp>
 #include <vector>
diff --git a/include/svx/nbdtmgfact.hxx b/include/svx/nbdtmgfact.hxx
index b4c35a90eb8e..72cf96a2a26b 100644
--- a/include/svx/nbdtmgfact.hxx
+++ b/include/svx/nbdtmgfact.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 _NBDTMGFACT_HXX
-#define _NBDTMGFACT_HXX
+#ifndef INCLUDED_SVX_NBDTMGFACT_HXX
+#define INCLUDED_SVX_NBDTMGFACT_HXX
 #include "nbdtmg.hxx"
 namespace svx { namespace sidebar { namespace NBOutlineTypeMgrFact {
     SVX_DLLPUBLIC NBOTypeMgrBase* CreateInstance(const NBOType aType);
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 2f6b73e14c17..c1927daf9eee 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -18,9 +18,7 @@
  */
 
 #include <anchoredobjectposition.hxx>
-#ifndef _ENVIRONMENTOFANCHOREDOBJECT
 #include <environmentofanchoredobject.hxx>
-#endif
 #include <flyfrm.hxx>
 #include <flyfrms.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
index 2a5642d4f3e2..779d82988f33 100644
--- a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
+++ b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENVIRONMENTOFANCHOREDOBJECT
 #include <environmentofanchoredobject.hxx>
-#endif
 #include <frame.hxx>
 #include <pagefrm.hxx>
 #include <flyfrm.hxx>
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 75c263fd8b8d..8a4d454bbcf1 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
 
@@ -116,18 +115,10 @@
 #include <uiitems.hxx>
 #include <wordcountdialog.hxx>
 #include <tools/diagnose_ex.h>
-
-#ifndef _NBDTMGFACT_HXX
 #include <svx/nbdtmgfact.hxx>
-#endif
-#ifndef _NBDTMG_HXX
 #include <svx/nbdtmg.hxx>
-#endif
-
-
 #include <numrule.hxx>
 
-
 using namespace ::com::sun::star;
 using namespace svx::sidebar;
 
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index d5a9c6957eee..e739453010c7 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <WriterFilter.hxx>
 #include <WriterFilterDetection.hxx>
 #include <RtfFilter.hxx>