diff --git a/tooltipmanager.cpp b/tooltipmanager.cpp
index 1e83ee81d..fcf8dd64c 100644
--- a/tooltipmanager.cpp
+++ b/tooltipmanager.cpp
@@ -18,6 +18,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
+
 #include "tooltipmanager.h"
 
 //Qt
@@ -30,15 +31,25 @@
 //KDE
 #include <KWindowSystem>
 
+//X11
+#ifdef Q_WS_X11
+#include <QtGui/QX11Info>
+#include <X11/Xlib.h>
+#include <fixx11h.h>
+#endif
+
+
 //Plasma
-#include <plasma/theme.h>
-#include <plasma/panelsvg.h>
-#include <plasma/tooltip_p.h>
 #include <plasma/applet.h>
-#include <plasma/view.h>
 #include <plasma/containment.h>
+#include <plasma/panelsvg.h>
+#include <plasma/theme.h>
+#include <plasma/tooltip_p.h>
+#include <plasma/view.h>
+
 namespace Plasma
 {
+
 class ToolTipManagerPrivate
 {
 public :
diff --git a/tooltipmanager.h b/tooltipmanager.h
index 5bdc9c493..5f00161fe 100644
--- a/tooltipmanager.h
+++ b/tooltipmanager.h
@@ -26,23 +26,11 @@
 #include <plasma/plasma.h>
 #include <plasma/plasma_export.h>
 
-//KDE
-#include <KDE/KWindowSystem>
-
-#ifdef Q_WS_X11
-#include <QtGui/QX11Info>
-#endif
-
-//X11
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#include <fixx11h.h>
-#endif
-
 namespace Plasma
 {
-  class ToolTipManagerPrivate;
-  class Applet;
+
+class ToolTipManagerPrivate;
+class Applet;
 
   /**
   * @short The class to manage tooltips on QGraphicsWidget in Plasma
@@ -60,8 +48,8 @@ namespace Plasma
   * will be invoked if it exists. This allows widgets to provide on-demand tooltip data.
   */
 
-  class PLASMA_EXPORT ToolTipManager  : public QObject
-  {
+class PLASMA_EXPORT ToolTipManager  : public QObject
+{
       Q_OBJECT
   public: