diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt
index 0719c5d8ca..7fd5bede73 100644
--- a/clients/oxygen/CMakeLists.txt
+++ b/clients/oxygen/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
 ########### next target ###############
 set(kwin_oxygen_SRCS
      helper.cpp
-     oxygen.cpp
+     oxygenfactory.cpp
      oxygenbutton.cpp
      oxygenclient.cpp
      oxygenclientgroupitemdata.cpp
diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp
index 16cfe9e494..88e2ca4054 100644
--- a/clients/oxygen/oxygenbutton.cpp
+++ b/clients/oxygen/oxygenbutton.cpp
@@ -28,7 +28,6 @@
 #include "oxygenbutton.h"
 #include "oxygenbutton.moc"
 #include "oxygenclient.h"
-#include "oxygen.h"
 
 #include <cmath>
 
diff --git a/clients/oxygen/oxygenbutton.h b/clients/oxygen/oxygenbutton.h
index e5d1051030..fa9392a823 100644
--- a/clients/oxygen/oxygenbutton.h
+++ b/clients/oxygen/oxygenbutton.h
@@ -30,7 +30,7 @@
 
 #include <kcommondecoration.h>
 
-#include "oxygen.h"
+#include "oxygenfactory.h"
 #include "oxygenanimation.h"
 
 namespace Oxygen
diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index cb4bc12190..f5c651647c 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -28,7 +28,6 @@
 #include "oxygenclient.h"
 #include "oxygenclient.moc"
 
-#include "oxygen.h"
 #include "oxygenbutton.h"
 #include "oxygensizegrip.h"
 #include "tileset.h"
diff --git a/clients/oxygen/oxygenclient.h b/clients/oxygen/oxygenclient.h
index fbef6d7eb4..32831b5327 100644
--- a/clients/oxygen/oxygenclient.h
+++ b/clients/oxygen/oxygenclient.h
@@ -28,7 +28,7 @@
 // IN THE SOFTWARE.
 //////////////////////////////////////////////////////////////////////////////
 
-#include "oxygen.h"
+#include "oxygenfactory.h"
 #include "oxygenclientgroupitemdata.h"
 #include "oxygenconfiguration.h"
 #include "oxygentitleanimationdata.h"
diff --git a/clients/oxygen/oxygenclientgroupitemdata.cpp b/clients/oxygen/oxygenclientgroupitemdata.cpp
index 893163cf79..3e46d5f6c5 100644
--- a/clients/oxygen/oxygenclientgroupitemdata.cpp
+++ b/clients/oxygen/oxygenclientgroupitemdata.cpp
@@ -29,7 +29,6 @@
 #include "oxygenclientgroupitemdata.h"
 #include "oxygenclientgroupitemdata.moc"
 #include "oxygenclient.h"
-#include "oxygen.h"
 
 namespace Oxygen
 {
diff --git a/clients/oxygen/oxygen.cpp b/clients/oxygen/oxygenfactory.cpp
similarity index 99%
rename from clients/oxygen/oxygen.cpp
rename to clients/oxygen/oxygenfactory.cpp
index 1061538914..d58f89f6e4 100644
--- a/clients/oxygen/oxygen.cpp
+++ b/clients/oxygen/oxygenfactory.cpp
@@ -24,8 +24,8 @@
 // IN THE SOFTWARE.
 //////////////////////////////////////////////////////////////////////////////
 
-#include "oxygen.h"
-#include "oxygen.moc"
+#include "oxygenfactory.h"
+#include "oxygenfactory.moc"
 #include "oxygenclient.h"
 
 #include <cassert>
diff --git a/clients/oxygen/oxygen.h b/clients/oxygen/oxygenfactory.h
similarity index 100%
rename from clients/oxygen/oxygen.h
rename to clients/oxygen/oxygenfactory.h
diff --git a/clients/oxygen/oxygenshadowcache.cpp b/clients/oxygen/oxygenshadowcache.cpp
index 8ae717d7d8..5cc6374ce6 100644
--- a/clients/oxygen/oxygenshadowcache.cpp
+++ b/clients/oxygen/oxygenshadowcache.cpp
@@ -26,7 +26,6 @@
 
 #include "oxygenshadowcache.h"
 #include "oxygenclient.h"
-#include "oxygen.h"
 #include "oxygenhelper.h"
 
 #include <cassert>