diff --git a/src/devices/devicemanager.cpp b/src/devices/devicemanager.cpp
index 13814108c..666348696 100644
--- a/src/devices/devicemanager.cpp
+++ b/src/devices/devicemanager.cpp
@@ -19,15 +19,19 @@
 #include "devicemanager.h"
 #include "devicekitlister.h"
 #include "filesystemdevice.h"
-#include "giolister.h"
-#include "gpoddevice.h"
 #include "core/musicstorage.h"
 #include "core/taskmanager.h"
 #include "core/utilities.h"
 #include "ui/iconloader.h"
 
 #ifdef Q_OS_DARWIN
-#include "macdevicelister.h"
+#  include "macdevicelister.h"
+#endif
+#ifdef HAVE_LIBGPOD
+#  include "gpoddevice.h"
+#endif
+#ifdef HAVE_GIO
+#  include "giolister.h"
 #endif
 
 #include <QIcon>
diff --git a/src/devices/gpoddevice.h b/src/devices/gpoddevice.h
index fa9df48ea..b12594cb0 100644
--- a/src/devices/gpoddevice.h
+++ b/src/devices/gpoddevice.h
@@ -23,6 +23,8 @@
 #include <QMutex>
 #include <QWaitCondition>
 
+#include <gpod/itdb.h>
+
 class GPodLoader;
 
 class GPodDevice : public ConnectedDevice, public MusicStorage {