5 files changed, 44 insertions, 16 deletions
diff --git a/src/update.c b/src/update.c
index 1a306065..2df1a5bf 100644
--- a/src/update.c
+++ b/src/update.c
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include "update_internal.h"
+#include "update_remove.h"
 #include "update.h"
 #include "database.h"
 #include "mapper.h"
diff --git a/src/update_db.c b/src/update_db.c
index f2126c55..2ead6d43 100644
--- a/src/update_db.c
+++ b/src/update_db.c
@@ -19,7 +19,7 @@
 
 #include "config.h" /* must be first for large file support */
 #include "update_db.h"
-#include "update_internal.h"
+#include "update_remove.h"
 #include "directory.h"
 #include "song.h"
 #include "db_lock.h"
diff --git a/src/update_internal.h b/src/update_internal.h
index d4fe9101..9da74d52 100644
--- a/src/update_internal.h
+++ b/src/update_internal.h
@@ -47,18 +47,4 @@ update_walk_global_finish(void);
 bool
 update_walk(const char *path, bool discard);
 
-void
-update_remove_global_init(void);
-
-void
-update_remove_global_finish(void);
-
-/**
- * Sends a signal to the main thread which will in turn remove the
- * song: from the sticker database and from the playlist.  This
- * serialized access is implemented to avoid excessive locking.
- */
-void
-update_remove_song(const struct song *song);
-
 #endif
diff --git a/src/update_remove.c b/src/update_remove.c
index ca5fbd18..ef697e44 100644
--- a/src/update_remove.c
+++ b/src/update_remove.c
@@ -18,7 +18,7 @@
  */
 
 #include "config.h" /* must be first for large file support */
-#include "update_internal.h"
+#include "update_remove.h"
 #include "event_pipe.h"
 #include "song.h"
 #include "playlist.h"
diff --git a/src/update_remove.h b/src/update_remove.h
new file mode 100644
index 00000000..479ef83f
--- /dev/null
+++ b/src/update_remove.h
@@ -0,0 +1,41 @@
+/*
+ * 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_REMOVE_H
+#define MPD_UPDATE_REMOVE_H
+
+#include "check.h"
+
+struct song;
+
+void
+update_remove_global_init(void);
+
+void
+update_remove_global_finish(void);
+
+/**
+ * Sends a signal to the main thread which will in turn remove the
+ * song: from the sticker database and from the playlist.  This
+ * serialized access is implemented to avoid excessive locking.
+ */
+void
+update_remove_song(const struct song *song);
+
+#endif