ls: include cleanup

src/decoder_thread.c

@@ -20,6 +20,7 @@
 #include "decoder_thread.h"
 #include "decoder_control.h"
 #include "decoder_internal.h"
+#include "decoder_list.h"
 #include "player_control.h"
 #include "pipe.h"
 #include "song.h"
@@ -30,6 +31,8 @@
 
 #include <glib.h>
 
+#include <unistd.h>
+
 static bool
 decoder_stream_decode(const struct decoder_plugin *plugin,
 		      struct decoder *decoder,

src/ls.c

@@ -17,12 +17,10 @@
  */
 
 #include "ls.h"
-#include "playlist.h"
-#include "path.h"
 #include "client.h"
-#include "log.h"
-#include "stored_playlist.h"
 #include "config.h"
+#include "decoder_list.h"
+#include "archive_list.h"
 
 #include <string.h>
 
@@ -78,8 +76,8 @@ hasMusicSuffix(const char *utf8file, unsigned int next)
 	if (s) {
 		ret = decoder_plugin_from_suffix(s, next);
 	} else {
-		DEBUG("hasMusicSuffix: The file: %s has no valid suffix\n",
-		      utf8file);
+		g_debug("hasMusicSuffix: The file: %s has no valid suffix\n",
+			utf8file);
 	}
 
 	return ret;

src/ls.h

@@ -19,9 +19,6 @@
 #ifndef MPD_LS_H
 #define MPD_LS_H
 
-#include "decoder_list.h"
-#include "archive_list.h"
-
 #include <stdbool.h>
 
 struct stat;