diff --git a/config.h.cmake b/config.h.cmake
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,5 +1,5 @@
-#ifndef KATE_CONFIG_H
-#define KATE_CONFIG_H
+#ifndef KATE_BUILD_CONFIG_H
+#define KATE_BUILD_CONFIG_H
 
 /* config.h. Generated by cmake from config.h.cmake */
 
diff --git a/src/dialogs/kateconfigpage.h b/src/dialogs/kateconfigpage.h
--- a/src/dialogs/kateconfigpage.h
+++ b/src/dialogs/kateconfigpage.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_CONFIG_PAGE_H__
-#define __KATE_CONFIG_PAGE_H__
+#ifndef KATE_CONFIG_PAGE_H
+#define KATE_CONFIG_PAGE_H
 
 #include <ktexteditor/configpage.h>
 
diff --git a/src/dialogs/katedialogs.h b/src/dialogs/katedialogs.h
--- a/src/dialogs/katedialogs.h
+++ b/src/dialogs/katedialogs.h
@@ -23,8 +23,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_DIALOGS_H__
-#define __KATE_DIALOGS_H__
+#ifndef KATE_DIALOGS_H
+#define KATE_DIALOGS_H
 
 #include "katehighlight.h"
 #include "kateviewhelpers.h"
diff --git a/src/document/katebuffer.h b/src/document/katebuffer.h
--- a/src/document/katebuffer.h
+++ b/src/document/katebuffer.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KATE_BUFFER_H__
-#define __KATE_BUFFER_H__
+#ifndef KATE_BUFFER_H
+#define KATE_BUFFER_H
 
 #include "katetextbuffer.h"
 
diff --git a/src/inputmode/kateabstractinputmode.h b/src/inputmode/kateabstractinputmode.h
--- a/src/inputmode/kateabstractinputmode.h
+++ b/src/inputmode/kateabstractinputmode.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_ABSTRACT_INPUT_MODE_H__
-#define __KATE_ABSTRACT_INPUT_MODE_H__
+#ifndef KATE_ABSTRACT_INPUT_MODE_H
+#define KATE_ABSTRACT_INPUT_MODE_H
 
 class KateLayoutCache;
 class KateViewInternal;
diff --git a/src/inputmode/kateabstractinputmodefactory.h b/src/inputmode/kateabstractinputmodefactory.h
--- a/src/inputmode/kateabstractinputmodefactory.h
+++ b/src/inputmode/kateabstractinputmodefactory.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_ABSTRACT_INPUT_MODE_FACTORY_H__
-#define __KATE_ABSTRACT_INPUT_MODE_FACTORY_H__
+#ifndef KATE_ABSTRACT_INPUT_MODE_FACTORY_H
+#define KATE_ABSTRACT_INPUT_MODE_FACTORY_H
 
 class KateAbstractInputMode;
 class KateViewInternal;
diff --git a/src/inputmode/katenormalinputmode.h b/src/inputmode/katenormalinputmode.h
--- a/src/inputmode/katenormalinputmode.h
+++ b/src/inputmode/katenormalinputmode.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_NORMAL_INPUT_MODE_H__
-#define __KATE_NORMAL_INPUT_MODE_H__
+#ifndef KATE_NORMAL_INPUT_MODE_H
+#define KATE_NORMAL_INPUT_MODE_H
 
 #include "kateabstractinputmode.h"
 
diff --git a/src/inputmode/katenormalinputmodefactory.h b/src/inputmode/katenormalinputmodefactory.h
--- a/src/inputmode/katenormalinputmodefactory.h
+++ b/src/inputmode/katenormalinputmodefactory.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_NORMAL_INPUT_MODE_FACTORY_H__
-#define __KATE_NORMAL_INPUT_MODE_FACTORY_H__
+#ifndef KATE_NORMAL_INPUT_MODE_FACTORY_H
+#define KATE_NORMAL_INPUT_MODE_FACTORY_H
 
 #include "kateabstractinputmodefactory.h"
 
diff --git a/src/inputmode/kateviinputmode.h b/src/inputmode/kateviinputmode.h
--- a/src/inputmode/kateviinputmode.h
+++ b/src/inputmode/kateviinputmode.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_VI_INPUT_MODE_H__
-#define __KATE_VI_INPUT_MODE_H__
+#ifndef KATE_VI_INPUT_MODE_H
+#define KATE_VI_INPUT_MODE_H
 
 #include "kateabstractinputmode.h"
 
diff --git a/src/inputmode/kateviinputmodefactory.h b/src/inputmode/kateviinputmodefactory.h
--- a/src/inputmode/kateviinputmodefactory.h
+++ b/src/inputmode/kateviinputmodefactory.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_VI_INPUT_MODE_FACTORY_H__
-#define __KATE_VI_INPUT_MODE_FACTORY_H__
+#ifndef KATE_VI_INPUT_MODE_FACTORY_H
+#define KATE_VI_INPUT_MODE_FACTORY_H
 
 #include "kateabstractinputmodefactory.h"
 
diff --git a/src/mode/katemodeconfigpage.h b/src/mode/katemodeconfigpage.h
--- a/src/mode/katemodeconfigpage.h
+++ b/src/mode/katemodeconfigpage.h
@@ -18,8 +18,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef KATE_MODECONFIGPAGE_H__
-#define KATE_MODECONFIGPAGE_H__
+#ifndef KATE_MODECONFIGPAGE_H
+#define KATE_MODECONFIGPAGE_H
 
 #include <QPointer>
 #include <QHash>
diff --git a/src/mode/katemodemanager.h b/src/mode/katemodemanager.h
--- a/src/mode/katemodemanager.h
+++ b/src/mode/katemodemanager.h
@@ -18,8 +18,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef KATE_MODEMANAGER_H__
-#define KATE_MODEMANAGER_H__
+#ifndef KATE_MODEMANAGER_H
+#define KATE_MODEMANAGER_H
 
 #include <QStringList>
 #include <QPointer>
diff --git a/src/mode/katemodemenu.h b/src/mode/katemodemenu.h
--- a/src/mode/katemodemenu.h
+++ b/src/mode/katemodemenu.h
@@ -18,8 +18,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef KATE_MODEMENU_H__
-#define KATE_MODEMENU_H__
+#ifndef KATE_MODEMENU_H
+#define KATE_MODEMENU_H
 
 #include <QStringList>
 #include <QPointer>
diff --git a/src/printing/kateprinter.h b/src/printing/kateprinter.h
--- a/src/printing/kateprinter.h
+++ b/src/printing/kateprinter.h
@@ -20,8 +20,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_PRINTER_H__
-#define __KATE_PRINTER_H__
+#ifndef KATE_PRINTER_H
+#define KATE_PRINTER_H
 
 namespace KTextEditor
 {
diff --git a/src/printing/printconfigwidgets.h b/src/printing/printconfigwidgets.h
--- a/src/printing/printconfigwidgets.h
+++ b/src/printing/printconfigwidgets.h
@@ -20,8 +20,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_PRINTER_CONFIG_WIDGETS_H__
-#define __KATE_PRINTER_CONFIG_WIDGETS_H__
+#ifndef KATE_PRINTER_CONFIG_WIDGETS_H
+#define KATE_PRINTER_CONFIG_WIDGETS_H
 
 #include <QWidget>
 
diff --git a/src/printing/printpainter.h b/src/printing/printpainter.h
--- a/src/printing/printpainter.h
+++ b/src/printing/printpainter.h
@@ -20,8 +20,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_PRINTER_PAINTER_H__
-#define __KATE_PRINTER_PAINTER_H__
+#ifndef KATE_PRINTER_PAINTER_H
+#define KATE_PRINTER_PAINTER_H
 
 #include <QString>
 #include <QColor>
diff --git a/src/render/katerenderer.h b/src/render/katerenderer.h
--- a/src/render/katerenderer.h
+++ b/src/render/katerenderer.h
@@ -20,8 +20,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KATE_RENDERER_H__
-#define __KATE_RENDERER_H__
+#ifndef KATE_RENDERER_H
+#define KATE_RENDERER_H
 
 #include <ktexteditor/attribute.h>
 #include "katetextline.h"
diff --git a/src/schema/kateschema.h b/src/schema/kateschema.h
--- a/src/schema/kateschema.h
+++ b/src/schema/kateschema.h
@@ -18,8 +18,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_SCHEMA_H__
-#define __KATE_SCHEMA_H__
+#ifndef KATE_SCHEMA_H
+#define KATE_SCHEMA_H
 
 #include <KActionMenu>
 #include <KConfig>
diff --git a/src/schema/kateschemaconfig.h b/src/schema/kateschemaconfig.h
--- a/src/schema/kateschemaconfig.h
+++ b/src/schema/kateschemaconfig.h
@@ -19,8 +19,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_SCHEMA_CONFIG_H__
-#define __KATE_SCHEMA_CONFIG_H__
+#ifndef KATE_SCHEMA_CONFIG_H
+#define KATE_SCHEMA_CONFIG_H
 
 #include "katedialogs.h"
 #include "katecolortreewidget.h"
diff --git a/src/spellcheck/spellcheckdialog.h b/src/spellcheck/spellcheckdialog.h
--- a/src/spellcheck/spellcheckdialog.h
+++ b/src/spellcheck/spellcheckdialog.h
@@ -24,8 +24,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_SPELLCHECKDIALOG_H__
-#define __KATE_SPELLCHECKDIALOG_H__
+#ifndef KATE_SPELLCHECKDIALOG_H
+#define KATE_SPELLCHECKDIALOG_H
 
 #include <QObject>
 
diff --git a/src/syntax/katehighlight.h b/src/syntax/katehighlight.h
--- a/src/syntax/katehighlight.h
+++ b/src/syntax/katehighlight.h
@@ -19,8 +19,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_HIGHLIGHT_H__
-#define __KATE_HIGHLIGHT_H__
+#ifndef KATE_HIGHLIGHT_H
+#define KATE_HIGHLIGHT_H
 
 #include <KSyntaxHighlighting/AbstractHighlighter>
 #include <KSyntaxHighlighting/Definition>
diff --git a/src/syntax/katehighlightmenu.h b/src/syntax/katehighlightmenu.h
--- a/src/syntax/katehighlightmenu.h
+++ b/src/syntax/katehighlightmenu.h
@@ -17,8 +17,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef KATE_HIGHLIGHTMENU_H__
-#define KATE_HIGHLIGHTMENU_H__
+#ifndef KATE_HIGHLIGHTMENU_H
+#define KATE_HIGHLIGHTMENU_H
 
 #include <QStringList>
 #include <QPointer>
diff --git a/src/utils/kateautoindent.h b/src/utils/kateautoindent.h
--- a/src/utils/kateautoindent.h
+++ b/src/utils/kateautoindent.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KATE_AUTO_INDENT_H__
-#define __KATE_AUTO_INDENT_H__
+#ifndef KATE_AUTO_INDENT_H
+#define KATE_AUTO_INDENT_H
 
 #include "kateconfig.h"
 
diff --git a/src/utils/katebookmarks.h b/src/utils/katebookmarks.h
--- a/src/utils/katebookmarks.h
+++ b/src/utils/katebookmarks.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KATE_BOOKMARKS_H__
-#define __KATE_BOOKMARKS_H__
+#ifndef KATE_BOOKMARKS_H
+#define KATE_BOOKMARKS_H
 
 #include <QObject>
 
diff --git a/src/utils/katecmds.h b/src/utils/katecmds.h
--- a/src/utils/katecmds.h
+++ b/src/utils/katecmds.h
@@ -20,8 +20,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_CMDS_H__
-#define __KATE_CMDS_H__
+#ifndef KATE_CMDS_H
+#define KATE_CMDS_H
 
 #include <KTextEditor/Command>
 
diff --git a/src/utils/kateconfig.h b/src/utils/kateconfig.h
--- a/src/utils/kateconfig.h
+++ b/src/utils/kateconfig.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KATE_CONFIG_H__
-#define __KATE_CONFIG_H__
+#ifndef KATE_CONFIG_H
+#define KATE_CONFIG_H
 
 #include <ktexteditor_export.h>
 
diff --git a/src/utils/katedefaultcolors.h b/src/utils/katedefaultcolors.h
--- a/src/utils/katedefaultcolors.h
+++ b/src/utils/katedefaultcolors.h
@@ -18,8 +18,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_DEFAULTCOLORS_H__
-#define __KATE_DEFAULTCOLORS_H__
+#ifndef KATE_DEFAULTCOLORS_H
+#define KATE_DEFAULTCOLORS_H
 
 #include <KColorScheme>
 
@@ -114,4 +114,4 @@
     const qreal m_foregroundLuma;
 };
 
-#endif // __KATE_DEFAULTCOLORS_H__
+#endif // KATE_DEFAULTCOLORS_H
diff --git a/src/utils/kateglobal.h b/src/utils/kateglobal.h
--- a/src/utils/kateglobal.h
+++ b/src/utils/kateglobal.h
@@ -19,8 +19,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_GLOBAL_H__
-#define __KATE_GLOBAL_H__
+#ifndef KATE_GLOBAL_H
+#define KATE_GLOBAL_H
 
 #include <ktexteditor_export.h>
 #include "katescript.h"
diff --git a/src/utils/katesedcmd.h b/src/utils/katesedcmd.h
--- a/src/utils/katesedcmd.h
+++ b/src/utils/katesedcmd.h
@@ -20,8 +20,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KATE_SED_CMD_H__
-#define __KATE_SED_CMD_H__
+#ifndef KATE_SED_CMD_H
+#define KATE_SED_CMD_H
 
 #include <KTextEditor/Command>
 #include "kateregexpsearch.h"
diff --git a/src/view/kateviewhelpers.h b/src/view/kateviewhelpers.h
--- a/src/view/kateviewhelpers.h
+++ b/src/view/kateviewhelpers.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KATE_VIEW_HELPERS_H__
-#define __KATE_VIEW_HELPERS_H__
+#ifndef KATE_VIEW_HELPERS_H
+#define KATE_VIEW_HELPERS_H
 
 #include <KSelectAction>
 #include <KLineEdit>