2 files changed, 12 insertions, 12 deletions
diff --git a/src/filter_config.c b/src/FilterConfig.cxx
index ab9bdb0c5..1b5cf96e9 100644
--- a/src/filter_config.c
+++ b/src/FilterConfig.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,17 +17,20 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "filter_config.h"
 #include "config.h"
+#include "FilterConfig.hxx"
 #include "conf.h"
+
+extern "C" {
 #include "filter/chain_filter_plugin.h"
+}
+
 #include "filter_plugin.h"
 #include "filter_internal.h"
 #include "filter_registry.h"
 
 #include <string.h>
 
-
 static GQuark
 filter_quark(void)
 {
@@ -83,7 +86,7 @@ filter_chain_parse(struct filter *chain, const char *spec, GError **error_r)
 	// Split on comma
 	gchar** tokens = g_strsplit_set(spec, ",", 255);
 
-	int added_filters = 0;
+	unsigned added_filters = 0;
 
 	// Add each name to the filter chain by instantiating an actual filter
 	char **template_names = tokens;
diff --git a/src/filter_config.h b/src/FilterConfig.hxx
index 920cbc07c..18cc5c44f 100644
--- a/src/filter_config.h
+++ b/src/FilterConfig.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,15 +22,12 @@
  * Utility functions for filter configuration
  */
 
-#ifndef MPD_FILTER_CONFIG_H
-#define MPD_FILTER_CONFIG_H
+#ifndef MPD_FILTER_CONFIG_HXX
+#define MPD_FILTER_CONFIG_HXX
 
-#include "conf.h"
-#include "filter/chain_filter_plugin.h"
-#include "filter_plugin.h"
-#include "filter_internal.h"
-#include "filter_registry.h"
+#include "gerror.h"
 
+struct filter;
 
 /**
  * Builds a filter chain from a configuration string on the form