diff --git a/src/filter/FilterRegistry.cxx b/src/filter/FilterRegistry.cxx
index 192306e4a..9a5cad78f 100644
--- a/src/filter/FilterRegistry.cxx
+++ b/src/filter/FilterRegistry.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,9 @@
 
 #include "FilterRegistry.hxx"
 #include "FilterPlugin.hxx"
+#include "plugins/NullFilterPlugin.hxx"
+#include "plugins/RouteFilterPlugin.hxx"
+#include "plugins/NormalizeFilterPlugin.hxx"
 
 #include <string.h>
 
diff --git a/src/filter/FilterRegistry.hxx b/src/filter/FilterRegistry.hxx
index 808c6c1b7..c33c17028 100644
--- a/src/filter/FilterRegistry.hxx
+++ b/src/filter/FilterRegistry.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,10 +30,6 @@
 
 struct FilterPlugin;
 
-extern const FilterPlugin null_filter_plugin;
-extern const FilterPlugin route_filter_plugin;
-extern const FilterPlugin normalize_filter_plugin;
-
 gcc_pure
 const FilterPlugin *
 filter_plugin_by_name(const char *name) noexcept;
diff --git a/src/filter/plugins/AutoConvertFilterPlugin.cxx b/src/filter/plugins/AutoConvertFilterPlugin.cxx
index 08302cc00..a55081744 100644
--- a/src/filter/plugins/AutoConvertFilterPlugin.cxx
+++ b/src/filter/plugins/AutoConvertFilterPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
-#include "filter/FilterRegistry.hxx"
 #include "AudioFormat.hxx"
 #include "util/ConstBuffer.hxx"
 
diff --git a/src/filter/plugins/NormalizeFilterPlugin.cxx b/src/filter/plugins/NormalizeFilterPlugin.cxx
index a0594c3f0..4a84896e4 100644
--- a/src/filter/plugins/NormalizeFilterPlugin.cxx
+++ b/src/filter/plugins/NormalizeFilterPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
-#include "filter/FilterRegistry.hxx"
 #include "pcm/PcmBuffer.hxx"
 #include "AudioFormat.hxx"
 #include "AudioCompress/compress.h"
diff --git a/src/filter/plugins/NormalizeFilterPlugin.hxx b/src/filter/plugins/NormalizeFilterPlugin.hxx
index 1e3e1f0de..aebe69bc9 100644
--- a/src/filter/plugins/NormalizeFilterPlugin.hxx
+++ b/src/filter/plugins/NormalizeFilterPlugin.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,8 +22,11 @@
 
 #include <memory>
 
+struct FilterPlugin;
 class PreparedFilter;
 
+extern const FilterPlugin normalize_filter_plugin;
+
 std::unique_ptr<PreparedFilter>
 normalize_filter_prepare() noexcept;
 
diff --git a/src/filter/plugins/NullFilterPlugin.cxx b/src/filter/plugins/NullFilterPlugin.cxx
index ca04f8483..84c21aca2 100644
--- a/src/filter/plugins/NullFilterPlugin.cxx
+++ b/src/filter/plugins/NullFilterPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,10 +24,10 @@
  * plugins.
  */
 
+#include "NullFilterPlugin.hxx"
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
-#include "filter/FilterRegistry.hxx"
 #include "AudioFormat.hxx"
 #include "util/Compiler.h"
 #include "util/ConstBuffer.hxx"
diff --git a/src/filter/plugins/NullFilterPlugin.hxx b/src/filter/plugins/NullFilterPlugin.hxx
new file mode 100644
index 000000000..e1c877ec6
--- /dev/null
+++ b/src/filter/plugins/NullFilterPlugin.hxx
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2003-2019 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_NULL_FILTER_PLUGIN_HXX
+#define MPD_NULL_FILTER_PLUGIN_HXX
+
+struct FilterPlugin;
+
+extern const FilterPlugin null_filter_plugin;
+
+#endif
diff --git a/src/filter/plugins/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx
index ef17740a9..abf6c215b 100644
--- a/src/filter/plugins/RouteFilterPlugin.cxx
+++ b/src/filter/plugins/RouteFilterPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,13 +39,13 @@
  * one of them takes effect.
  */
 
+#include "RouteFilterPlugin.hxx"
 #include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "AudioFormat.hxx"
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
-#include "filter/FilterRegistry.hxx"
 #include "pcm/PcmBuffer.hxx"
 #include "pcm/Silence.hxx"
 #include "util/StringStrip.hxx"
diff --git a/src/filter/plugins/RouteFilterPlugin.hxx b/src/filter/plugins/RouteFilterPlugin.hxx
new file mode 100644
index 000000000..71c78384a
--- /dev/null
+++ b/src/filter/plugins/RouteFilterPlugin.hxx
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2003-2019 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_ROUTE_FILTER_PLUGIN_HXX
+#define MPD_ROUTE_FILTER_PLUGIN_HXX
+
+struct FilterPlugin;
+
+extern const FilterPlugin route_filter_plugin;
+
+#endif