diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp
index b416af794..0fd870500 100644
--- a/src/device/devicemanager.cpp
+++ b/src/device/devicemanager.cpp
@@ -61,6 +61,9 @@
 #include "devicestatefiltermodel.h"
 #include "deviceinfo.h"
 
+#ifdef HAVE_GIO
+#  include "giolister.h"
+#endif
 #if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER)
 #  include "cddalister.h"
 #  include "cddadevice.h"
@@ -79,9 +82,6 @@
 #ifdef HAVE_LIBGPOD
 #  include "gpoddevice.h"
 #endif
-#ifdef HAVE_GIO
-#  include "giolister.h"  // Needs to be last because of #undef signals.
-#endif
 
 using std::make_unique;