diff --git a/daemon/src/audio/codecs/audiocodecfactory.cpp b/daemon/src/audio/codecs/audiocodecfactory.cpp
index 1bbc5006f6f51934c9d133e6b8c1cf8aee2c021b..6436a6f6363cb2ec66dca3d83f67f6910a09b33c 100644
--- a/daemon/src/audio/codecs/audiocodecfactory.cpp
+++ b/daemon/src/audio/codecs/audiocodecfactory.cpp
@@ -155,7 +155,7 @@ std::vector<sfl::Codec*> AudioCodecFactory::scanCodecDirectory()
     if (envDir)
         dirToScan.push_back(std::string(envDir) + DIR_SEPARATOR_STR);
 
-    const char *progDir = get_program_dir();
+    const char *progDir = fileutils::get_program_dir();
 
     if (progDir)
         dirToScan.push_back(std::string(progDir) + DIR_SEPARATOR_STR + "audio/codecs/");
diff --git a/daemon/src/fileutils.cpp b/daemon/src/fileutils.cpp
index 60279ec6393284627c650804b739a785ac15c0c7..e03ff6df20cceee5df27e464d6a757e0c042f702 100644
--- a/daemon/src/fileutils.cpp
+++ b/daemon/src/fileutils.cpp
@@ -31,6 +31,7 @@
 #include <libgen.h>
 #include <cstdlib>
 
+namespace fileutils {
 static char *program_dir = NULL;
 
 void set_program_dir(char *program_path)
@@ -42,3 +43,5 @@ const char *get_program_dir()
 {
     return program_dir;
 }
+
+}
diff --git a/daemon/src/fileutils.h b/daemon/src/fileutils.h
index 92f99a6a28a17763f20cf276c78728e980d31bcc..c7188cb0d70242943b48b4ce641c41be96c7157b 100644
--- a/daemon/src/fileutils.h
+++ b/daemon/src/fileutils.h
@@ -31,7 +31,9 @@
 #ifndef __FILEUTILS_H__
 #define __FILEUTILS_H__
 
-void set_program_dir(char *program_path);
-const char *get_program_dir();
+namespace fileutils {
+    void set_program_dir(char *program_path);
+    const char *get_program_dir();
+}
 
 #endif	// __FILEUTILS_H__
diff --git a/daemon/src/main.cpp b/daemon/src/main.cpp
index 4423af4177b99330d2f468da80faf8a478f4685f..1d92cfbb5f7f7ca584a30db0e7d10b798059c4c8 100644
--- a/daemon/src/main.cpp
+++ b/daemon/src/main.cpp
@@ -78,7 +78,7 @@ static bool check_dir(const char *path)
 int
 main(int argc, char **argv)
 {
-    set_program_dir(argv[0]);
+    fileutils::set_program_dir(argv[0]);
     // makeCommandOptionParse allocates the object with operator new, so
     // auto_ptr is fine in this context.
     // TODO: This should eventually be replaced with std::unique_ptr for C++0x