6 files changed, 51 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am
index 9b54b9990..c8ab8ceeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,7 +89,6 @@ mpd_headers = \
 	src/fd_util.h \
 	src/glib_compat.h \
 	src/update.h \
-	src/update_internal.h \
 	src/inotify_source.h \
 	src/inotify_queue.h \
 	src/inotify_update.h \
@@ -266,10 +265,10 @@ src_mpd_SOURCES = \
 	src/filter_plugin.c \
 	src/filter_registry.c \
 	src/update.c \
-	src/update_queue.c \
+	src/update_queue.c src/update_queue.h \
 	src/update_io.c src/update_io.h \
 	src/update_db.c src/update_db.h \
-	src/update_walk.c \
+	src/update_walk.c src/update_walk.h \
 	src/update_remove.c \
 	src/client.c \
 	src/client_event.c \
diff --git a/src/update.c b/src/update.c
index 2df1a5bf6..12eec40c4 100644
--- a/src/update.c
+++ b/src/update.c
@@ -18,7 +18,9 @@
  */
 
 #include "config.h"
-#include "update_internal.h"
+#include "update.h"
+#include "update_queue.h"
+#include "update_walk.h"
 #include "update_remove.h"
 #include "update.h"
 #include "database.h"
@@ -35,6 +37,9 @@
 
 #include <assert.h>
 
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "update"
+
 static enum update_progress {
 	UPDATE_PROGRESS_IDLE = 0,
 	UPDATE_PROGRESS_RUNNING = 1,
diff --git a/src/update_queue.c b/src/update_queue.c
index 4de250cc2..2150fa4e4 100644
--- a/src/update_queue.c
+++ b/src/update_queue.c
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "update_internal.h"
+#include "update_queue.h"
 
 #include <glib.h>
 
diff --git a/src/update_queue.h b/src/update_queue.h
new file mode 100644
index 000000000..84ba474b0
--- /dev/null
+++ b/src/update_queue.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_UPDATE_QUEUE_H
+#define MPD_UPDATE_QUEUE_H
+
+#include "check.h"
+
+#include <stdbool.h>
+
+unsigned
+update_queue_push(const char *path, bool discard, unsigned base);
+
+char *
+update_queue_shift(bool *discard_r);
+
+#endif
diff --git a/src/update_walk.c b/src/update_walk.c
index c9d6d81c6..72abf39ce 100644
--- a/src/update_walk.c
+++ b/src/update_walk.c
@@ -18,7 +18,7 @@
  */
 
 #include "config.h" /* must be first for large file support */
-#include "update_internal.h"
+#include "update_walk.h"
 #include "update_io.h"
 #include "update_db.h"
 #include "database.h"
@@ -54,6 +54,9 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "update"
+
 static bool walk_discard;
 static bool modified;
 
diff --git a/src/update_internal.h b/src/update_walk.h
index 9da74d523..ab1e41fb9 100644
--- a/src/update_internal.h
+++ b/src/update_walk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,23 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_UPDATE_INTERNAL_H
-#define MPD_UPDATE_INTERNAL_H
+#ifndef MPD_UPDATE_WALK_H
+#define MPD_UPDATE_WALK_H
 
-#include <stdbool.h>
-
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "update"
-
-struct stat;
-struct song;
-struct directory;
+#include "check.h"
 
-unsigned
-update_queue_push(const char *path, bool discard, unsigned base);
-
-char *
-update_queue_shift(bool *discard_r);
+#include <stdbool.h>
 
 void
 update_walk_global_init(void);