diff --git a/plugins/qpa/eglhelpers.h b/plugins/qpa/eglhelpers.h
index 6c1792387..adf4711a5 100644
--- a/plugins/qpa/eglhelpers.h
+++ b/plugins/qpa/eglhelpers.h
@@ -1,40 +1,40 @@
 /********************************************************************
  KWin - the KDE window manager
  This file is part of the KDE project.
 
 Copyright (C) 2019 Vlad Zahorodnii <vladzzag@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #pragma once
 
-#define MESA_EGL_NO_X11_HEADERS
 #include <epoxy/egl.h>
 #include "fixqopengl.h"
+#include <fixx11h.h>
 
 #include <QSurfaceFormat>
 
 namespace KWin
 {
 namespace QPA
 {
 
 bool isOpenGLES();
 
 EGLConfig configFromFormat(EGLDisplay display, const QSurfaceFormat &surfaceFormat, EGLint surfaceType = 0);
 QSurfaceFormat formatFromConfig(EGLDisplay display, EGLConfig config);
 
 } // namespace QPA
 } // namespace KWin
diff --git a/plugins/qpa/offscreensurface.h b/plugins/qpa/offscreensurface.h
index c69b3ad58..a355fb4d5 100644
--- a/plugins/qpa/offscreensurface.h
+++ b/plugins/qpa/offscreensurface.h
@@ -1,53 +1,53 @@
 /********************************************************************
  KWin - the KDE window manager
  This file is part of the KDE project.
 
 Copyright (C) 2019 Vlad Zahorodnii <vladzzag@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #pragma once
 
-#define MESA_EGL_NO_X11_HEADERS
 #include <epoxy/egl.h>
 #include "fixqopengl.h"
+#include <fixx11h.h>
 
 #include <qpa/qplatformoffscreensurface.h>
 
 namespace KWin
 {
 namespace QPA
 {
 
 class OffscreenSurface : public QPlatformOffscreenSurface
 {
 public:
     explicit OffscreenSurface(QOffscreenSurface *surface);
     ~OffscreenSurface() override;
 
     QSurfaceFormat format() const override;
     bool isValid() const override;
 
     EGLSurface nativeHandle() const;
 
 private:
     QSurfaceFormat m_format;
 
     EGLDisplay m_eglDisplay = EGL_NO_DISPLAY;
     EGLSurface m_surface = EGL_NO_SURFACE;
 };
 
 } // namespace QPA
 } // namespace KWin