diff --git a/main.cpp b/main.cpp
index 63707fd73b..4869155142 100644
--- a/main.cpp
+++ b/main.cpp
@@ -91,7 +91,7 @@ KWinSelectionOwner::KWinSelectionOwner(int screen_P)
 {
 }
 
-Atom KWinSelectionOwner::make_selection_atom(int screen_P)
+xcb_atom_t KWinSelectionOwner::make_selection_atom(int screen_P)
 {
     if (screen_P < 0)
         screen_P = DefaultScreen(display());
@@ -132,7 +132,7 @@ bool KWinSelectionOwner::genericReply(xcb_atom_t target_P, xcb_atom_t property_P
     return true;
 }
 
-Atom KWinSelectionOwner::xa_version = None;
+xcb_atom_t KWinSelectionOwner::xa_version = XCB_ATOM_NONE;
 
 class AlternativeWMDialog : public QDialog
 {
diff --git a/main.h b/main.h
index 35d438c50c..2a5604d468 100644
--- a/main.h
+++ b/main.h
@@ -47,8 +47,8 @@ protected:
     virtual void replyTargets(xcb_atom_t property, xcb_window_t requestor);
     virtual void getAtoms();
 private:
-    Atom make_selection_atom(int screen);
-    static Atom xa_version;
+    xcb_atom_t make_selection_atom(int screen);
+    static xcb_atom_t xa_version;
 };
 
 class Application : public  KApplication