diff --git a/appletbrowser/customdragtreeview_p.h b/appletbrowser/customdragtreeview_p.h
index dc3d72fd7..67852eec6 100644
--- a/appletbrowser/customdragtreeview_p.h
+++ b/appletbrowser/customdragtreeview_p.h
@@ -17,6 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#ifndef CUSTOMDRAGTREEVIEW_P_H
+#define CUSTOMDRAGTREEVIEW_P_H
+
 #include <QTreeView>
 #include "kcategorizeditemsviewmodels_p.h"
 
@@ -35,3 +38,6 @@ private:
 
     friend class KCategorizedItemsView;
 };
+
+#endif
+
diff --git a/appletbrowser/plasmaappletitemmodel_p.h b/appletbrowser/plasmaappletitemmodel_p.h
index 241a61fb9..090c03829 100644
--- a/appletbrowser/plasmaappletitemmodel_p.h
+++ b/appletbrowser/plasmaappletitemmodel_p.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PLASMAAPPLETSMODEL_H_
-#define PLASMAAPPLETSMODEL_H_
+#ifndef PLASMAAPPLETITEMMODEL_P_H
+#define PLASMAAPPLETITEMMODEL_P_H
 
 #include <KPluginInfo>
 
diff --git a/applethandle.cpp b/applethandle.cpp
index 345c065c1..ba4daead1 100644
--- a/applethandle.cpp
+++ b/applethandle.cpp
@@ -32,12 +32,11 @@
 #include <cmath>
 #include <math.h>
 
-#include "plasma/view.h"
 #include "applet.h"
 #include "containment.h"
 #include "corona.h"
-#include "applet.h"
 #include "theme.h"
+#include "view.h"
 
 namespace Plasma
 {
diff --git a/applethandle_p.h b/applethandle_p.h
index 00aa5d8e2..30780cff5 100644
--- a/applethandle_p.h
+++ b/applethandle_p.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PLASMA_APPLETHANDLE
-#define PLASMA_APPLETHANDLE
+#ifndef PLASMA_APPLETHANDLE_P_H
+#define PLASMA_APPLETHANDLE_P_H
 
 #include <QtCore/QObject>
 #include <QtGui/QGraphicsItem>
diff --git a/datacontainer.cpp b/datacontainer.cpp
index 830397a38..a29bb1c36 100644
--- a/datacontainer.cpp
+++ b/datacontainer.cpp
@@ -17,14 +17,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "plasma.h"
 #include "datacontainer.h"
-#include "datacontainer_p.h"
 
 #include <QVariant>
 
 #include <KDebug>
 
+#include "plasma.h"
+#include "datacontainer_p.h"
+
 namespace Plasma
 {
 
diff --git a/desktoptoolbox_p.h b/desktoptoolbox_p.h
index 30409da51..90f6fd353 100644
--- a/desktoptoolbox_p.h
+++ b/desktoptoolbox_p.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PLASMA_DESKTOPTOOLBOX_H
-#define PLASMA_DESKTOPTOOLBOX_H
+#ifndef PLASMA_DESKTOPTOOLBOX_P_H
+#define PLASMA_DESKTOPTOOLBOX_P_H
 
 #include <QGraphicsItem>
 #include <QObject>
diff --git a/searchmatch.cpp b/searchmatch.cpp
index 846f82bd5..57973a5eb 100644
--- a/searchmatch.cpp
+++ b/searchmatch.cpp
@@ -17,6 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "searchmatch.h"
 
 #include <QVariant>
 #include <QStringList>
@@ -24,8 +25,6 @@
 
 #include <KDebug>
 
-#include "searchmatch.h"
-
 #include "abstractrunner.h"
 
 namespace Plasma
diff --git a/searchmatch.h b/searchmatch.h
index 0fb1df3ef..d34051863 100644
--- a/searchmatch.h
+++ b/searchmatch.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef SEARCHACTION_H
-#define SEARCHACTION_H
+#ifndef SEARCHMATCH_H
+#define SEARCHMATCH_H
 
 #include <plasma/plasma_export.h>
 
diff --git a/widgets/signalplotter.cpp b/widgets/signalplotter.cpp
index 8ee49702f..806519f41 100644
--- a/widgets/signalplotter.cpp
+++ b/widgets/signalplotter.cpp
@@ -20,6 +20,8 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "signalplotter.h"
+
 #include <math.h>
 #include <string.h>
 
@@ -38,8 +40,6 @@
 
 #include <plasma/svg.h>
 
-#include "signalplotter.h"
-
 namespace Plasma
 {
 
diff --git a/widgets/tooltip_p.h b/widgets/tooltip_p.h
index 90e76f498..c40e073a1 100644
--- a/widgets/tooltip_p.h
+++ b/widgets/tooltip_p.h
@@ -17,8 +17,9 @@
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#ifndef PLASMATOOLTIP_H
-#define PLASMATOOLTIP_H
+
+#ifndef PLASMA_TOOLTIP_P_H
+#define PLASMA_TOOLTIP_P_H
 
 #include <plasma/widgets/widget.h> //ToolTipData struct