8 files changed, 46 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 1a5008251..c62c252df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,6 +342,7 @@ endif
 # File system library
 
 libfs_a_SOURCES = \
+	src/fs/Limits.hxx \
 	src/fs/Path.cxx src/fs/Path.hxx \
 	src/fs/FileSystem.cxx src/fs/FileSystem.hxx \
 	src/fs/DirectoryReader.hxx
diff --git a/src/ConfigFile.cxx b/src/ConfigFile.cxx
index 7d2b4e7f7..eacaae5bb 100644
--- a/src/ConfigFile.cxx
+++ b/src/ConfigFile.cxx
@@ -26,6 +26,7 @@
 #include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
+#include "fs/Limits.hxx"
 #include "fs/Path.hxx"
 #include "fs/FileSystem.hxx"
 #include "Log.hxx"
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index 16c1bcdec..a82acc1f8 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -31,6 +31,7 @@
 #include "ConfigOption.hxx"
 #include "ConfigDefaults.hxx"
 #include "Idle.hxx"
+#include "fs/Limits.hxx"
 #include "fs/Path.hxx"
 #include "fs/FileSystem.hxx"
 #include "fs/DirectoryReader.hxx"
diff --git a/src/PlaylistState.cxx b/src/PlaylistState.cxx
index 36082152d..6a2cf18ca 100644
--- a/src/PlaylistState.cxx
+++ b/src/PlaylistState.cxx
@@ -31,6 +31,7 @@
 #include "PlayerControl.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigOption.hxx"
+#include "fs/Limits.hxx"
 #include "Log.hxx"
 
 #include <glib.h>
diff --git a/src/fs/FileSystem.cxx b/src/fs/FileSystem.cxx
index 70ab01fbd..31271cf95 100644
--- a/src/fs/FileSystem.cxx
+++ b/src/fs/FileSystem.cxx
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include "FileSystem.hxx"
+#include "Limits.hxx"
 
 #include <errno.h>
 
diff --git a/src/fs/Limits.hxx b/src/fs/Limits.hxx
new file mode 100644
index 000000000..bf75f5135
--- /dev/null
+++ b/src/fs/Limits.hxx
@@ -0,0 +1,39 @@
+/*
+ * 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_LIMITS_HXX
+#define MPD_FS_LIMITS_HXX
+
+#include "check.h"
+
+#include <limits.h>
+
+#if !defined(MPD_PATH_MAX)
+#  if defined(WIN32)
+#    define MPD_PATH_MAX 260
+#  elif defined(MAXPATHLEN)
+#    define MPD_PATH_MAX MAXPATHLEN
+#  elif defined(PATH_MAX)
+#    define MPD_PATH_MAX PATH_MAX
+#  else
+#    define MPD_PATH_MAX 256
+#  endif
+#endif
+
+#endif
diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx
index 688b78515..08e18762a 100644
--- a/src/fs/Path.cxx
+++ b/src/fs/Path.cxx
@@ -18,7 +18,8 @@
  */
 
 #include "config.h"
-#include "fs/Path.hxx"
+#include "Path.hxx"
+#include "Limits.hxx"
 #include "ConfigGlobal.hxx"
 #include "system/FatalError.hxx"
 #include "util/Error.hxx"
diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx
index 3cd25e71c..0f79cce4e 100644
--- a/src/fs/Path.hxx
+++ b/src/fs/Path.hxx
@@ -32,19 +32,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <limits.h>
-
-#if !defined(MPD_PATH_MAX)
-#  if defined(WIN32)
-#    define MPD_PATH_MAX 260
-#  elif defined(MAXPATHLEN)
-#    define MPD_PATH_MAX MAXPATHLEN
-#  elif defined(PATH_MAX)
-#    define MPD_PATH_MAX PATH_MAX
-#  else
-#    define MPD_PATH_MAX 256
-#  endif
-#endif
 
 class Error;