diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
index 23e9220f9e..e9e73150ed 100644
--- a/libkwineffects/CMakeLists.txt
+++ b/libkwineffects/CMakeLists.txt
@@ -36,11 +36,10 @@ if(OPENGL_FOUND OR OPENGLES_FOUND)
 
     if(OPENGLES_FOUND)
         KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES})
-        set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
+        set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGLES)
     endif(OPENGLES_FOUND)
     if(OPENGL_FOUND)
         KWIN4_ADD_GLUTILS_BACKEND(kwinglutils ${OPENGL_INCLUDE_DIR} ${OPENGL_gl_LIBRARY})
-        set_target_properties(kwinglutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
 
         target_link_libraries(kwinglutils ${OPENGL_gl_LIBRARY})
         target_link_libraries(kwinglutils LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY})
diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp
index 237c14374b..8d41085e29 100644
--- a/libkwineffects/kwinglplatform.cpp
+++ b/libkwineffects/kwinglplatform.cpp
@@ -33,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <iomanip>
 #include <ios>
 
-#ifdef KWIN_HAVE_OPENGL
-
 namespace KWin
 {
 
@@ -878,5 +876,3 @@ bool GLPlatform::isSoftwareEmulation() const
 
 } // namespace KWin
 
-#endif // KWIN_HAVE_OPENGL
-
diff --git a/libkwineffects/kwinglplatform.h b/libkwineffects/kwinglplatform.h
index 714dc43c3c..beabc66966 100644
--- a/libkwineffects/kwinglplatform.h
+++ b/libkwineffects/kwinglplatform.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_GLPLATFORM_H
 #define KWIN_GLPLATFORM_H
 
-#include <kwinconfig.h> // KWIN_HAVE_OPENGL
-
-#ifdef KWIN_HAVE_OPENGL
 #include <kwinglutils_funcs.h>
 
 #include <QSet>
@@ -282,6 +279,5 @@ inline GLPlatform *GLPlatform::instance()
 
 } // namespace KWin
 
-#endif // KWIN_HAVE_OPENGL
 #endif // KWIN_GLPLATFORM_H
 
diff --git a/libkwineffects/kwingltexture.cpp b/libkwineffects/kwingltexture.cpp
index 9c812876df..7b67778789 100644
--- a/libkwineffects/kwingltexture.cpp
+++ b/libkwineffects/kwingltexture.cpp
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "kwinconfig.h" // KWIN_HAVE_OPENGL
 
-#ifdef KWIN_HAVE_OPENGL
-
 #include "kwinglplatform.h"
 #include "kwineffects.h"
 #include "kwinglutils_funcs.h"
@@ -416,5 +414,3 @@ bool GLTexture::isYInverted() const
 }
 
 } // namespace KWin
-
-#endif
diff --git a/libkwineffects/kwingltexture.h b/libkwineffects/kwingltexture.h
index eaa9b76801..9a8d4168b6 100644
--- a/libkwineffects/kwingltexture.h
+++ b/libkwineffects/kwingltexture.h
@@ -22,11 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_GLTEXTURE_H
 #define KWIN_GLTEXTURE_H
 
-#include "kwinconfig.h" // KWIN_HAVE_OPENGL
 #include "kwinglobals.h"
 
-#ifdef KWIN_HAVE_OPENGL
-
 #include <QtCore/QSize>
 #include <QtCore/QSharedData>
 
@@ -122,9 +119,6 @@ private:
 
 } // namespace
 
-
-#endif
-
 /** @} */
 
 #endif
diff --git a/libkwineffects/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp
index b53ac0e3c9..b9bba5b4e9 100644
--- a/libkwineffects/kwinglutils.cpp
+++ b/libkwineffects/kwinglutils.cpp
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "kwinglutils.h"
 
-#ifdef KWIN_HAVE_OPENGL
 #include "kwinglobals.h"
 #include "kwineffects.h"
 #include "kwinglplatform.h"
@@ -1290,5 +1289,3 @@ GLVertexBuffer *GLVertexBuffer::streamingBuffer()
 }
 
 } // namespace
-
-#endif
diff --git a/libkwineffects/kwinglutils.h b/libkwineffects/kwinglutils.h
index 76b8104454..6a0a7f95e7 100644
--- a/libkwineffects/kwinglutils.h
+++ b/libkwineffects/kwinglutils.h
@@ -22,9 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_GLUTILS_H
 #define KWIN_GLUTILS_H
 
-#include <kwinconfig.h> // KWIN_HAVE_OPENGL
-
-#ifdef KWIN_HAVE_OPENGL
 #include <kwinglutils_funcs.h>
 
 #include <QtGui/QPixmap>
@@ -537,8 +534,6 @@ private:
 
 } // namespace
 
-#endif
-
 /** @} */
 
 #endif
diff --git a/libkwineffects/kwinglutils_funcs.cpp b/libkwineffects/kwinglutils_funcs.cpp
index dfdf6e74bb..d935a7f99d 100644
--- a/libkwineffects/kwinglutils_funcs.cpp
+++ b/libkwineffects/kwinglutils_funcs.cpp
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     if ( !function ) \
         function = (function ## _func)getProcAddress( #backup );
 
-#ifdef KWIN_HAVE_OPENGL
 #ifndef KWIN_HAVE_OPENGLES
 
 namespace KWin
@@ -316,4 +315,3 @@ void glResolveFunctions()
 
 } // namespace
 #endif
-#endif
diff --git a/libkwineffects/kwinglutils_funcs.h b/libkwineffects/kwinglutils_funcs.h
index 88dab76b5a..03e4e17d48 100644
--- a/libkwineffects/kwinglutils_funcs.h
+++ b/libkwineffects/kwinglutils_funcs.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define KWIN_EXPORT KDE_EXPORT
 
-#include <kwinconfig.h> // KWIN_HAVE_OPENGL
-
-#ifdef KWIN_HAVE_OPENGL
-
 #ifndef KWIN_HAVE_OPENGLES
 
 // gcc-3.3.3 apparently cannot resolve KWin's namespaced versions properly,
@@ -404,5 +400,3 @@ extern KWIN_EXPORT glEGLImageTargetTexture2DOES_func glEGLImageTargetTexture2DOE
 #endif
 
 #endif
-
-#endif