diff --git a/hotkeywrapper.hh b/hotkeywrapper.hh
index a7967d0d..ab95da68 100644
--- a/hotkeywrapper.hh
+++ b/hotkeywrapper.hh
@@ -12,9 +12,9 @@
 #include <QX11Info>
 #include <X11/Xlibint.h>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #undef Bool
-#endif
+#undef min
+#undef max
 
 #endif
 
diff --git a/main.cc b/main.cc
index 046c0f1e..b3f16ed7 100644
--- a/main.cc
+++ b/main.cc
@@ -9,6 +9,9 @@
 
 #include "processwrapper.hh"
 #include "hotkeywrapper.hh"
+#ifdef HAVE_X11
+#include <fixx11h.h>
+#endif
 
 //#define __DO_DEBUG
 
diff --git a/mainwindow.cc b/mainwindow.cc
index 74a4ada5..239a44e9 100644
--- a/mainwindow.cc
+++ b/mainwindow.cc
@@ -66,6 +66,7 @@
 #ifdef HAVE_X11
 #include <QX11Info>
 #include <X11/Xlib.h>
+#include <fixx11h.h>
 #endif
 
 #define MIN_THREAD_COUNT 4
diff --git a/mainwindow.hh b/mainwindow.hh
index 64f9739d..e4e78ec6 100644
--- a/mainwindow.hh
+++ b/mainwindow.hh
@@ -23,7 +23,6 @@
 #include "wordfinder.hh"
 #include "dictionarybar.hh"
 #include "history.hh"
-#include "hotkeywrapper.hh"
 #include "mainstatusbar.hh"
 #include "mruqmenu.hh"
 #include "translatebox.hh"
@@ -32,6 +31,7 @@
 #include "fulltextsearch.hh"
 #include "helpwindow.hh"
 
+#include "hotkeywrapper.hh"
 #ifdef HAVE_X11
 #include <fixx11h.h>
 #endif