11 files changed, 18 insertions, 17 deletions
diff --git a/src/utility/file.hpp b/src/utility/file.hpp
index 73ffd964..6697d3d7 100644
--- a/src/utility/file.hpp
+++ b/src/utility/file.hpp
@@ -21,9 +21,10 @@
 #define VMIME_UTILITY_FILE_HPP_INCLUDED
 
 
-#include "path.hpp"
-#include "../config.hpp"
-#include "stream.hpp"
+#include "config.hpp"
+
+#include "utility/path.hpp"
+#include "utility/stream.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
diff --git a/src/utility/md5.cpp b/src/utility/md5.cpp
index e181a5d0..9a1d4129 100644
--- a/src/utility/md5.cpp
+++ b/src/utility/md5.cpp
@@ -44,7 +44,7 @@
 //     These notices must be retained in any copies of any part of this
 //     documentation and/or software.
 
-#include "md5.hpp"
+#include "utility/md5.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/path.cpp b/src/utility/path.cpp
index 24e3c56e..6455145d 100644
--- a/src/utility/path.cpp
+++ b/src/utility/path.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "path.hpp"
+#include "utility/path.hpp"
 
 #include <algorithm>
 
diff --git a/src/utility/path.hpp b/src/utility/path.hpp
index 8fc376d5..01e78935 100644
--- a/src/utility/path.hpp
+++ b/src/utility/path.hpp
@@ -23,8 +23,8 @@
 
 #include <vector>
 
-#include "../types.hpp"
-#include "../word.hpp"
+#include "types.hpp"
+#include "word.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/random.cpp b/src/utility/random.cpp
index cefaea3e..43e5703c 100644
--- a/src/utility/random.cpp
+++ b/src/utility/random.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "random.hpp"
+#include "utility/random.hpp"
 #include "platformDependant.hpp"
 
 #include <ctime>
diff --git a/src/utility/stream.cpp b/src/utility/stream.cpp
index 15c2e8eb..38d12e9f 100644
--- a/src/utility/stream.cpp
+++ b/src/utility/stream.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "stream.hpp"
-#include "stringProxy.hpp"
+#include "utility/stream.hpp"
+#include "utility/stringProxy.hpp"
 
 #include <algorithm>  // for std::copy
 #include <iterator>   // for std::back_inserter
diff --git a/src/utility/stream.hpp b/src/utility/stream.hpp
index a34e6153..f05df243 100644
--- a/src/utility/stream.hpp
+++ b/src/utility/stream.hpp
@@ -24,7 +24,7 @@
 #include <istream>
 #include <ostream>
 
-#include "../types.hpp"
+#include "types.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/stringProxy.cpp b/src/utility/stringProxy.cpp
index f79e8a58..463b11b7 100644
--- a/src/utility/stringProxy.cpp
+++ b/src/utility/stringProxy.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "stringProxy.hpp"
+#include "utility/stringProxy.hpp"
 
 #include <iterator>
 #include <algorithm>
diff --git a/src/utility/stringProxy.hpp b/src/utility/stringProxy.hpp
index e8001aed..97a27ecd 100644
--- a/src/utility/stringProxy.hpp
+++ b/src/utility/stringProxy.hpp
@@ -23,8 +23,8 @@
 
 #include <limits>
 
-#include "../types.hpp"
-#include "stream.hpp"
+#include "types.hpp"
+#include "utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/stringUtils.cpp b/src/utility/stringUtils.cpp
index 937eb99d..ab6e06c1 100644
--- a/src/utility/stringUtils.cpp
+++ b/src/utility/stringUtils.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "stringUtils.hpp"
+#include "utility/stringUtils.hpp"
 
 
 namespace vmime
diff --git a/src/utility/stringUtils.hpp b/src/utility/stringUtils.hpp
index 617874f0..95b94a52 100644
--- a/src/utility/stringUtils.hpp
+++ b/src/utility/stringUtils.hpp
@@ -21,8 +21,8 @@
 #define VMIME_STRINGUTILS_HPP_INCLUDED
 
 
-#include "../types.hpp"
-#include "../base.hpp"
+#include "types.hpp"
+#include "base.hpp"
 
 #include <sstream>