1 files changed, 9 insertions, 9 deletions

diff --git a/src/tag/TagConfig.cxx b/src/tag/TagConfig.cxx
index b8be4fc4c..00f20d1c0 100644
--- a/src/tag/TagConfig.cxx
+++ b/src/tag/TagConfig.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,16 +21,16 @@
 #include "TagConfig.hxx"
 #include "TagSettings.h"
 #include "Tag.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "system/FatalError.hxx"
+#include "util/Alloc.hxx"
 #include "util/ASCII.hxx"
-
-#include <glib.h>
+#include "util/StringUtil.hxx"
 
 #include <algorithm>
 
-#include <string.h>
+#include <stdlib.h>
 
 void
 TagLoadConfig()
@@ -46,14 +46,14 @@ TagLoadConfig()
 
 	bool quit = false;
 	char *temp, *c, *s;
-	temp = c = s = g_strdup(value);
+	temp = c = s = xstrdup(value);
 	do {
 		if (*s == ',' || *s == '\0') {
 			if (*s == '\0')
 				quit = true;
 			*s = '\0';
 
-			c = g_strstrip(c);
+			c = Strip(c);
 			if (*c == 0)
 				continue;
 
@@ -70,5 +70,5 @@ TagLoadConfig()
 		s++;
 	} while (!quit);
 
-	g_free(temp);
+	free(temp);
 }