5 files changed, 19 insertions, 10 deletions
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index ee54c465d..b3d03a85e 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -24,10 +24,10 @@
 #include "input_stream.h"
 #include "conf.h"
 #include "decoder_api.h"
+#include "InputInit.hxx"
 
 extern "C" {
 #include "io_thread.h"
-#include "input_init.h"
 #include "decoder_list.h"
 #include "playlist_list.h"
 #include "playlist_plugin.h"
diff --git a/test/dump_text_file.c b/test/dump_text_file.cxx
index f13e648b2..c0f1c86f8 100644
--- a/test/dump_text_file.c
+++ b/test/dump_text_file.cxx
@@ -18,16 +18,19 @@
  */
 
 #include "config.h"
-#include "io_thread.h"
-#include "input_init.h"
+#include "InputInit.hxx"
 #include "input_stream.h"
-#include "text_input_stream.h"
 #include "conf.h"
 #include "stdbin.h"
 
+extern "C" {
+#include "io_thread.h"
+#include "text_input_stream.h"
+
 #ifdef ENABLE_ARCHIVE
 #include "archive_list.h"
 #endif
+}
 
 #include <glib.h>
 
diff --git a/test/read_tags.c b/test/read_tags.cxx
index 43335ec2f..9fabddc6b 100644
--- a/test/read_tags.c
+++ b/test/read_tags.cxx
@@ -18,14 +18,18 @@
  */
 
 #include "config.h"
+extern "C" {
 #include "io_thread.h"
 #include "decoder_list.h"
+}
 #include "decoder_api.h"
-#include "input_init.h"
+#include "InputInit.hxx"
 #include "input_stream.h"
 #include "audio_format.h"
+extern "C" {
 #include "tag_ape.h"
 #include "tag_id3.h"
+}
 #include "tag_handler.h"
 
 #include <glib.h>
@@ -133,9 +137,9 @@ print_pair(const char *name, const char *value, G_GNUC_UNUSED void *ctx)
 }
 
 static const struct tag_handler print_handler = {
-	.duration = print_duration,
-	.tag = print_tag,
-	.pair = print_pair,
+	print_duration,
+	print_tag,
+	print_pair,
 };
 
 int main(int argc, char **argv)
diff --git a/test/run_decoder.c b/test/run_decoder.cxx
index d2f87c9ae..776c11e87 100644
--- a/test/run_decoder.c
+++ b/test/run_decoder.cxx
@@ -18,10 +18,12 @@
  */
 
 #include "config.h"
+extern "C" {
 #include "io_thread.h"
 #include "decoder_list.h"
+}
 #include "decoder_api.h"
-#include "input_init.h"
+#include "InputInit.hxx"
 #include "input_stream.h"
 #include "audio_format.h"
 #include "stdbin.h"
diff --git a/test/run_input.cxx b/test/run_input.cxx
index 2df5e69f9..adf380f00 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -23,10 +23,10 @@
 #include "tag.h"
 #include "conf.h"
 #include "input_stream.h"
+#include "InputInit.hxx"
 
 extern "C" {
 #include "io_thread.h"
-#include "input_init.h"
 
 #ifdef ENABLE_ARCHIVE
 #include "archive_list.h"