diff --git a/src/db-generic.c b/src/db-generic.c
index 9da6767f..9170da7d 100644
--- a/src/db-generic.c
+++ b/src/db-generic.c
@@ -41,7 +41,6 @@
 #include "daapd.h"
 #include "db-generic.h"
 #include "err.h"
-#include "mp3-scanner.h"
 
 #include "db-sql.h"
 
diff --git a/src/db-sql.c b/src/db-sql.c
index 8f1738c2..f73230b3 100644
--- a/src/db-sql.c
+++ b/src/db-sql.c
@@ -40,7 +40,6 @@
 
 #include "daapd.h"
 #include "err.h"
-#include "mp3-scanner.h"
 #include "db-generic.h"
 #include "db-sql.h"
 #include "smart-parser.h"
diff --git a/src/ff-plugins.c b/src/ff-plugins.c
index e8cc99b1..f5b6c47a 100644
--- a/src/ff-plugins.c
+++ b/src/ff-plugins.c
@@ -15,7 +15,6 @@
 #include "ff-dbstruct.h"
 #include "ff-plugins.h"
 #include "io.h"
-#include "mp3-scanner.h"
 #include "plugin.h"
 #include "util.h"
 #include "webserver.h"
diff --git a/src/filescanner_ffmpeg.c b/src/filescanner_ffmpeg.c
index bdca0a74..a7ac2df1 100644
--- a/src/filescanner_ffmpeg.c
+++ b/src/filescanner_ffmpeg.c
@@ -38,7 +38,7 @@
 
 #include "daapd.h"
 #include "err.h"
-#include "mp3-scanner.h"
+#include "filescanner.h"
 
 
 /* Legacy format-specific scanners */
diff --git a/src/scan-flac.c b/src/scan-flac.c
index 26b83906..af546b95 100644
--- a/src/scan-flac.c
+++ b/src/scan-flac.c
@@ -41,7 +41,7 @@
 
 #include "daapd.h"
 #include "err.h"
-#include "mp3-scanner.h"
+#include "ff-dbstruct.h"
 
 #include <FLAC/metadata.h>
 
diff --git a/src/scan-mpc.c b/src/scan-mpc.c
index d645a56e..59464556 100644
--- a/src/scan-mpc.c
+++ b/src/scan-mpc.c
@@ -31,8 +31,8 @@
 #include <taglib/tag_c.h>
 
 #include "daapd.h"
-#include "mp3-scanner.h"
 #include "err.h"
+#include "ff-dbstruct.h"
 
 /**
  * scan a musepack file for metainfo.
diff --git a/src/scan-wma.c b/src/scan-wma.c
index 78333041..f33ee1c5 100644
--- a/src/scan-wma.c
+++ b/src/scan-wma.c
@@ -33,8 +33,8 @@
 
 #include "daapd.h"
 #include "io.h"
-#include "mp3-scanner.h"
 #include "err.h"
+#include "ff-dbstruct.h"
 
 typedef struct tag_wma_guidlist {
     char *name;
diff --git a/src/xml-rpc.c b/src/xml-rpc.c
index ac4050e9..c0f12e29 100644
--- a/src/xml-rpc.c
+++ b/src/xml-rpc.c
@@ -33,7 +33,6 @@
 #include "conf.h"
 #include "db-generic.h"
 #include "err.h"
-#include "mp3-scanner.h"
 #include "plugin.h"
 #include "webserver.h"
 #include "xml-rpc.h"