diff --git a/src/config.h.in b/src/config.h.in
index 0068378f4..2baa3ae1b 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -35,13 +35,12 @@
 #cmakedefine HAVE_SPARKLE
 #cmakedefine HAVE_STATIC_SQLITE
 
-#cmakedefine HAVE_LIBGPOD
+#cmakedefine HAVE_DBUS
 #cmakedefine HAVE_GIO
 #cmakedefine HAVE_IMOBILEDEVICE
+#cmakedefine HAVE_LIBGPOD
+#cmakedefine HAVE_LIBINDICATE
+#cmakedefine HAVE_LIBLASTFM
 #cmakedefine HAVE_LIBMTP
 
-#cmakedefine HAVE_LIBINDICATE
-
-#cmakedefine HAVE_LIBLASTFM
-
 #endif // CONFIG_H_IN
diff --git a/src/core/player.h b/src/core/player.h
index 66dfdcbf3..18a1bfc44 100644
--- a/src/core/player.h
+++ b/src/core/player.h
@@ -23,6 +23,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
+#include "config.h"
 #include "core/albumcoverloader.h"
 #include "core/song.h"
 #include "engines/engine_fwd.h"
diff --git a/src/ui/screensaver.cpp b/src/ui/screensaver.cpp
index b548ce13a..58aeaa728 100644
--- a/src/ui/screensaver.cpp
+++ b/src/ui/screensaver.cpp
@@ -15,6 +15,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
 #include "screensaver.h"
 
 #include <QtGlobal>
diff --git a/src/widgets/osd.cpp b/src/widgets/osd.cpp
index f38379f8a..df97a2237 100644
--- a/src/widgets/osd.cpp
+++ b/src/widgets/osd.cpp
@@ -15,6 +15,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
 #include "osd.h"
 #include "osdpretty.h"
 #include "ui/systemtrayicon.h"
diff --git a/src/widgets/osd.h b/src/widgets/osd.h
index e899c639f..ced0cf763 100644
--- a/src/widgets/osd.h
+++ b/src/widgets/osd.h
@@ -22,6 +22,7 @@
 #include <QImage>
 #include <QObject>
 
+#include "config.h"
 #include "engines/engine_fwd.h"
 #include "core/albumcoverloader.h"
 #include "core/backgroundthread.h"
diff --git a/src/widgets/osd_x11.cpp b/src/widgets/osd_x11.cpp
index 6ea482b40..59abc9352 100644
--- a/src/widgets/osd_x11.cpp
+++ b/src/widgets/osd_x11.cpp
@@ -15,6 +15,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
 #include "osd.h"
 
 #include <QtDebug>