Remove/replace mp3-scanner.h include

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"
 

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"

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"

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 */

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>
 

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.

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;

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"