6 files changed, 52 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index c62c252df..374c6d781 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,6 +342,7 @@ endif
 # File system library
 
 libfs_a_SOURCES = \
+	src/fs/Domain.cxx src/fs/Domain.hxx \
 	src/fs/Limits.hxx \
 	src/fs/Path.cxx src/fs/Path.hxx \
 	src/fs/FileSystem.cxx src/fs/FileSystem.hxx \
diff --git a/src/ConfigPath.cxx b/src/ConfigPath.cxx
index 879a1ea56..6c3177c17 100644
--- a/src/ConfigPath.cxx
+++ b/src/ConfigPath.cxx
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "ConfigPath.hxx"
 #include "fs/Path.hxx"
+#include "fs/Domain.hxx"
 #include "util/Error.hxx"
 #include "ConfigGlobal.hxx"
 
diff --git a/src/fs/Domain.cxx b/src/fs/Domain.cxx
new file mode 100644
index 000000000..0877bca4c
--- /dev/null
+++ b/src/fs/Domain.cxx
@@ -0,0 +1,24 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "config.h"
+#include "Domain.hxx"
+#include "util/Domain.hxx"
+
+const Domain path_domain("path");
diff --git a/src/fs/Domain.hxx b/src/fs/Domain.hxx
new file mode 100644
index 000000000..b303570fc
--- /dev/null
+++ b/src/fs/Domain.hxx
@@ -0,0 +1,25 @@
+/*
+ * 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
+ * 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_FS_DOMAIN_HXX
+#define MPD_FS_DOMAIN_HXX
+
+extern const class Domain path_domain;
+
+#endif
diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx
index 654a517bb..be2661f63 100644
--- a/src/fs/Path.cxx
+++ b/src/fs/Path.cxx
@@ -19,11 +19,11 @@
 
 #include "config.h"
 #include "Path.hxx"
+#include "Domain.hxx"
 #include "Limits.hxx"
 #include "ConfigGlobal.hxx"
 #include "system/FatalError.hxx"
 #include "util/Error.hxx"
-#include "util/Domain.hxx"
 #include "Log.hxx"
 #include "Compiler.h"
 
@@ -47,8 +47,6 @@
  */
 static constexpr size_t MPD_PATH_MAX_UTF8 = (MPD_PATH_MAX - 1) * 4 + 1;
 
-const Domain path_domain("path");
-
 static std::string fs_charset;
 
 inline Path::Path(Donate, pointer _value)
diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx
index a8e339685..10709219b 100644
--- a/src/fs/Path.hxx
+++ b/src/fs/Path.hxx
@@ -34,8 +34,6 @@
 
 class Error;
 
-extern const class Domain path_domain;
-
 /**
  * A path name in the native file system character set.
  */