diff --git a/ChangeLog b/ChangeLog
index a1c06768..3e68c25f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 VERSION 0.6.1-cvs
 =================
 
+2004-12-26  Vincent Richard  <vincent@vincent-richard.net>
+
+ * Removed relative paths from #include's.
+
 2004-12-24  Vincent Richard  <vincent@vincent-richard.net>
 
  * Renamed class 'disposition' to 'contentDisposition' and the enum
diff --git a/src/messaging/IMAPConnection.cpp b/src/messaging/IMAPConnection.cpp
index 63c96841..7992db3c 100644
--- a/src/messaging/IMAPConnection.cpp
+++ b/src/messaging/IMAPConnection.cpp
@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPTag.hpp"
-#include "IMAPConnection.hpp"
-#include "IMAPUtils.hpp"
-#include "IMAPStore.hpp"
+#include "messaging/IMAPTag.hpp"
+#include "messaging/IMAPConnection.hpp"
+#include "messaging/IMAPUtils.hpp"
+#include "messaging/IMAPStore.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 #include <sstream>
 
diff --git a/src/messaging/IMAPConnection.hpp b/src/messaging/IMAPConnection.hpp
index 0cd9b144..e53978c0 100644
--- a/src/messaging/IMAPConnection.hpp
+++ b/src/messaging/IMAPConnection.hpp
@@ -21,12 +21,13 @@
 #define VMIME_MESSAGING_IMAPCONNECTION_HPP_INCLUDED
 
 
-#include "authenticator.hpp"
-#include "socket.hpp"
-#include "../config.hpp"
-#include "timeoutHandler.hpp"
+#include "config.hpp"
 
-#include "IMAPParser.hpp"
+#include "messaging/authenticator.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/timeoutHandler.hpp"
+
+#include "messaging/IMAPParser.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPFolder.cpp b/src/messaging/IMAPFolder.cpp
index 4a3cc5fb..a60ea40b 100644
--- a/src/messaging/IMAPFolder.cpp
+++ b/src/messaging/IMAPFolder.cpp
@@ -17,16 +17,18 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPFolder.hpp"
+#include "messaging/IMAPFolder.hpp"
 
-#include "IMAPStore.hpp"
-#include "IMAPParser.hpp"
-#include "IMAPMessage.hpp"
-#include "IMAPUtils.hpp"
-#include "IMAPConnection.hpp"
+#include "messaging/IMAPStore.hpp"
+#include "messaging/IMAPParser.hpp"
+#include "messaging/IMAPMessage.hpp"
+#include "messaging/IMAPUtils.hpp"
+#include "messaging/IMAPConnection.hpp"
 
-#include "../exception.hpp"
-#include "../utility/smartPtr.hpp"
+#include "messageParser.hpp"   // to include "message.hpp" in root directory
+
+#include "exception.hpp"
+#include "utility/smartPtr.hpp"
 
 #include <algorithm>
 #include <sstream>
diff --git a/src/messaging/IMAPFolder.hpp b/src/messaging/IMAPFolder.hpp
index fae0a302..7a8382d1 100644
--- a/src/messaging/IMAPFolder.hpp
+++ b/src/messaging/IMAPFolder.hpp
@@ -24,8 +24,9 @@
 #include <vector>
 #include <map>
 
-#include "../types.hpp"
-#include "folder.hpp"
+#include "types.hpp"
+
+#include "messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPMessage.cpp b/src/messaging/IMAPMessage.cpp
index fc19d248..deb0087d 100644
--- a/src/messaging/IMAPMessage.cpp
+++ b/src/messaging/IMAPMessage.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPParser.hpp"
-#include "IMAPMessage.hpp"
-#include "IMAPFolder.hpp"
-#include "IMAPStore.hpp"
-#include "IMAPConnection.hpp"
-#include "IMAPUtils.hpp"
+#include "messaging/IMAPParser.hpp"
+#include "messaging/IMAPMessage.hpp"
+#include "messaging/IMAPFolder.hpp"
+#include "messaging/IMAPStore.hpp"
+#include "messaging/IMAPConnection.hpp"
+#include "messaging/IMAPUtils.hpp"
 
 #include <sstream>
 #include <iterator>
diff --git a/src/messaging/IMAPMessage.hpp b/src/messaging/IMAPMessage.hpp
index 430a0fbd..ad844784 100644
--- a/src/messaging/IMAPMessage.hpp
+++ b/src/messaging/IMAPMessage.hpp
@@ -21,9 +21,10 @@
 #define VMIME_MESSAGING_IMAPMESSAGE_HPP_INCLUDED
 
 
-#include "message.hpp"
-#include "folder.hpp"
-#include "../mailboxList.hpp"
+#include "messaging/message.hpp"
+#include "messaging/folder.hpp"
+
+#include "mailboxList.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPParser.hpp b/src/messaging/IMAPParser.hpp
index ed61b72f..bd4eeb56 100644
--- a/src/messaging/IMAPParser.hpp
+++ b/src/messaging/IMAPParser.hpp
@@ -21,23 +21,24 @@
 #define VMIME_MESSAGING_IMAPPARSER_HPP_INCLUDED
 
 
-#include "../base.hpp"
-#include "../dateTime.hpp"
-#include "../charset.hpp"
-#include "../exception.hpp"
-#include "../utility/smartPtr.hpp"
-#include "../utility/stringUtils.hpp"
+#include "base.hpp"
+#include "dateTime.hpp"
+#include "charset.hpp"
+#include "exception.hpp"
 
-#include "../encoderB64.hpp"
-#include "../encoderQP.hpp"
+#include "utility/smartPtr.hpp"
+#include "utility/stringUtils.hpp"
 
-#include "../platformDependant.hpp"
+#include "encoderB64.hpp"
+#include "encoderQP.hpp"
 
-#include "progressionListener.hpp"
-#include "timeoutHandler.hpp"
-#include "socket.hpp"
+#include "platformDependant.hpp"
 
-#include "IMAPTag.hpp"
+#include "messaging/progressionListener.hpp"
+#include "messaging/timeoutHandler.hpp"
+#include "messaging/socket.hpp"
+
+#include "messaging/IMAPTag.hpp"
 
 #include <vector>
 #include <stdexcept>
diff --git a/src/messaging/IMAPStore.cpp b/src/messaging/IMAPStore.cpp
index 8b8d9457..482c559f 100644
--- a/src/messaging/IMAPStore.cpp
+++ b/src/messaging/IMAPStore.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPStore.hpp"
-#include "IMAPFolder.hpp"
-#include "IMAPConnection.hpp"
+#include "messaging/IMAPStore.hpp"
+#include "messaging/IMAPFolder.hpp"
+#include "messaging/IMAPConnection.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 #include <map>
 
diff --git a/src/messaging/IMAPStore.hpp b/src/messaging/IMAPStore.hpp
index 8ad99991..70f049b5 100644
--- a/src/messaging/IMAPStore.hpp
+++ b/src/messaging/IMAPStore.hpp
@@ -21,10 +21,11 @@
 #define VMIME_MESSAGING_IMAPSTORE_HPP_INCLUDED
 
 
-#include "store.hpp"
-#include "socket.hpp"
-#include "folder.hpp"
-#include "../config.hpp"
+#include "config.hpp"
+
+#include "messaging/store.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/folder.hpp"
 
 #include <ostream>
 
diff --git a/src/messaging/IMAPTag.cpp b/src/messaging/IMAPTag.cpp
index 023130bb..12194bce 100644
--- a/src/messaging/IMAPTag.cpp
+++ b/src/messaging/IMAPTag.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPTag.hpp"
+#include "messaging/IMAPTag.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPUtils.cpp b/src/messaging/IMAPUtils.cpp
index a0fdfb8a..e04ee2ce 100644
--- a/src/messaging/IMAPUtils.cpp
+++ b/src/messaging/IMAPUtils.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPUtils.hpp"
-#include "message.hpp"
+#include "messaging/IMAPUtils.hpp"
+#include "messaging/message.hpp"
 
 #include <sstream>
 #include <iterator>
diff --git a/src/messaging/IMAPUtils.hpp b/src/messaging/IMAPUtils.hpp
index 9d523eb7..767cbc34 100644
--- a/src/messaging/IMAPUtils.hpp
+++ b/src/messaging/IMAPUtils.hpp
@@ -21,10 +21,11 @@
 #define VMIME_MESSAGING_IMAPUTILS_HPP_INCLUDED
 
 
-#include "folder.hpp"
-#include "../types.hpp"
-#include "IMAPParser.hpp"
-#include "../dateTime.hpp"
+#include "types.hpp"
+#include "dateTime.hpp"
+
+#include "messaging/folder.hpp"
+#include "messaging/IMAPParser.hpp"
 
 #include <vector>
 
diff --git a/src/messaging/POP3Folder.cpp b/src/messaging/POP3Folder.cpp
index e45e811c..d1c501ca 100644
--- a/src/messaging/POP3Folder.cpp
+++ b/src/messaging/POP3Folder.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "POP3Folder.hpp"
+#include "messaging/POP3Folder.hpp"
 
-#include "POP3Store.hpp"
-#include "POP3Message.hpp"
+#include "messaging/POP3Store.hpp"
+#include "messaging/POP3Message.hpp"
 
-#include "../exception.hpp"
+#include "exception.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/POP3Folder.hpp b/src/messaging/POP3Folder.hpp
index 7afaaa1d..93174a8a 100644
--- a/src/messaging/POP3Folder.hpp
+++ b/src/messaging/POP3Folder.hpp
@@ -24,9 +24,10 @@
 #include <vector>
 #include <map>
 
-#include "../types.hpp"
-#include "folder.hpp"
-#include "../config.hpp"
+#include "config.hpp"
+#include "types.hpp"
+
+#include "messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/POP3Message.cpp b/src/messaging/POP3Message.cpp
index a5b0aaff..f23994cd 100644
--- a/src/messaging/POP3Message.cpp
+++ b/src/messaging/POP3Message.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "POP3Message.hpp"
-#include "POP3Folder.hpp"
-#include "POP3Store.hpp"
+#include "messaging/POP3Message.hpp"
+#include "messaging/POP3Folder.hpp"
+#include "messaging/POP3Store.hpp"
 
 #include <sstream>
 
diff --git a/src/messaging/POP3Message.hpp b/src/messaging/POP3Message.hpp
index 96c1f78e..15f3562c 100644
--- a/src/messaging/POP3Message.hpp
+++ b/src/messaging/POP3Message.hpp
@@ -21,9 +21,10 @@
 #define VMIME_MESSAGING_POP3MESSAGE_HPP_INCLUDED
 
 
-#include "message.hpp"
-#include "folder.hpp"
-#include "../config.hpp"
+#include "config.hpp"
+
+#include "messaging/message.hpp"
+#include "messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/POP3Store.cpp b/src/messaging/POP3Store.cpp
index 4bf40583..d5b4ec12 100644
--- a/src/messaging/POP3Store.cpp
+++ b/src/messaging/POP3Store.cpp
@@ -17,14 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "POP3Store.hpp"
+#include "messaging/POP3Store.hpp"
+#include "messaging/POP3Folder.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
-#include "../messageId.hpp"
-#include "../utility/md5.hpp"
-
-#include "POP3Folder.hpp"
+#include "exception.hpp"
+#include "platformDependant.hpp"
+#include "messageId.hpp"
+#include "utility/md5.hpp"
 
 #include <algorithm>
 
diff --git a/src/messaging/POP3Store.hpp b/src/messaging/POP3Store.hpp
index b4c670d3..3030807d 100644
--- a/src/messaging/POP3Store.hpp
+++ b/src/messaging/POP3Store.hpp
@@ -21,11 +21,13 @@
 #define VMIME_MESSAGING_POP3STORE_HPP_INCLUDED
 
 
-#include "store.hpp"
-#include "socket.hpp"
-#include "../config.hpp"
-#include "timeoutHandler.hpp"
-#include "../utility/stream.hpp"
+#include "config.hpp"
+
+#include "messaging/store.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/timeoutHandler.hpp"
+
+#include "utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/SMTPTransport.cpp b/src/messaging/SMTPTransport.cpp
index d0401a51..54ffe546 100644
--- a/src/messaging/SMTPTransport.cpp
+++ b/src/messaging/SMTPTransport.cpp
@@ -17,14 +17,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "SMTPTransport.hpp"
+#include "messaging/SMTPTransport.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
-#include "../encoderB64.hpp"
-#include "../message.hpp"
-#include "../mailboxList.hpp"
-#include "authHelper.hpp"
+#include "exception.hpp"
+#include "platformDependant.hpp"
+#include "encoderB64.hpp"
+#include "messageParser.hpp"   // to include "message.hpp" in root directory
+#include "mailboxList.hpp"
+
+#include "messaging/authHelper.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/SMTPTransport.hpp b/src/messaging/SMTPTransport.hpp
index b63da5c3..84f680b9 100644
--- a/src/messaging/SMTPTransport.hpp
+++ b/src/messaging/SMTPTransport.hpp
@@ -21,10 +21,11 @@
 #define VMIME_MESSAGING_SMTPTRANSPORT_HPP_INCLUDED
 
 
-#include "transport.hpp"
-#include "socket.hpp"
-#include "../config.hpp"
-#include "timeoutHandler.hpp"
+#include "config.hpp"
+
+#include "messaging/transport.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/timeoutHandler.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authHelper.cpp b/src/messaging/authHelper.cpp
index 05c77d8a..0bd1c99e 100644
--- a/src/messaging/authHelper.cpp
+++ b/src/messaging/authHelper.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "authHelper.hpp"
+#include "messaging/authHelper.hpp"
 
-#include "../config.hpp"
-#include "../utility/md5.hpp"
+#include "config.hpp"
+#include "utility/md5.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authHelper.hpp b/src/messaging/authHelper.hpp
index 1fad3ced..147bc2bd 100644
--- a/src/messaging/authHelper.hpp
+++ b/src/messaging/authHelper.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHHELPER_HPP_INCLUDED
 
 
-#include "../types.hpp"
+#include "types.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authenticationInfos.cpp b/src/messaging/authenticationInfos.cpp
index 70579ff1..3bc572d6 100644
--- a/src/messaging/authenticationInfos.cpp
+++ b/src/messaging/authenticationInfos.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "authenticationInfos.hpp"
+#include "messaging/authenticationInfos.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authenticationInfos.hpp b/src/messaging/authenticationInfos.hpp
index ff049419..5cbf2fe9 100644
--- a/src/messaging/authenticationInfos.hpp
+++ b/src/messaging/authenticationInfos.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHENTICATIONINFOS_HPP_INCLUDED
 
 
-#include "../types.hpp"
+#include "types.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authenticator.cpp b/src/messaging/authenticator.cpp
index 91e488f8..87823d4f 100644
--- a/src/messaging/authenticator.cpp
+++ b/src/messaging/authenticator.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "authenticator.hpp"
+#include "messaging/authenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authenticator.hpp b/src/messaging/authenticator.hpp
index 2faed34c..1164dbbc 100644
--- a/src/messaging/authenticator.hpp
+++ b/src/messaging/authenticator.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHENTICATOR_HPP_INCLUDED
 
 
-#include "authenticationInfos.hpp"
+#include "messaging/authenticationInfos.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/defaultAuthenticator.cpp b/src/messaging/defaultAuthenticator.cpp
index c69b8c3e..4ecf8ed4 100644
--- a/src/messaging/defaultAuthenticator.cpp
+++ b/src/messaging/defaultAuthenticator.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "defaultAuthenticator.hpp"
+#include "messaging/defaultAuthenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/defaultAuthenticator.hpp b/src/messaging/defaultAuthenticator.hpp
index dcd0f297..b38e7bd6 100644
--- a/src/messaging/defaultAuthenticator.hpp
+++ b/src/messaging/defaultAuthenticator.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_DEFAULTAUTHENTICATOR_HPP_INCLUDED
 
 
-#include "authenticator.hpp"
-#include "../propertySet.hpp"
+#include "messaging/authenticator.hpp"
+#include "propertySet.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/events.cpp b/src/messaging/events.cpp
index d117cc82..7bbd6f77 100644
--- a/src/messaging/events.cpp
+++ b/src/messaging/events.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "events.hpp"
+#include "messaging/events.hpp"
 
 #include <algorithm>
 
diff --git a/src/messaging/events.hpp b/src/messaging/events.hpp
index f2ab9e29..f1a166de 100644
--- a/src/messaging/events.hpp
+++ b/src/messaging/events.hpp
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "../utility/path.hpp"
+#include "utility/path.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/folder.cpp b/src/messaging/folder.cpp
index e508389c..21514672 100644
--- a/src/messaging/folder.cpp
+++ b/src/messaging/folder.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "folder.hpp"
+#include "messaging/folder.hpp"
 
 #include <algorithm>
 
diff --git a/src/messaging/folder.hpp b/src/messaging/folder.hpp
index e7c50451..60bb0d23 100644
--- a/src/messaging/folder.hpp
+++ b/src/messaging/folder.hpp
@@ -23,14 +23,13 @@
 
 #include <vector>
 
-#include "../types.hpp"
-#include "../dateTime.hpp"
-#include "progressionListener.hpp"
-#include "message.hpp"
-#include "../message.hpp"
-#include "events.hpp"
-#include "../utility/path.hpp"
-#include "../utility/stream.hpp"
+#include "types.hpp"
+#include "dateTime.hpp"
+#include "messaging/progressionListener.hpp"
+#include "messaging/message.hpp"
+#include "messaging/events.hpp"
+#include "utility/path.hpp"
+#include "utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirFolder.cpp b/src/messaging/maildirFolder.cpp
index c92fe85f..e12b7c43 100644
--- a/src/messaging/maildirFolder.cpp
+++ b/src/messaging/maildirFolder.cpp
@@ -17,14 +17,18 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "maildirFolder.hpp"
+#include "messaging/maildirFolder.hpp"
 
-#include "maildirStore.hpp"
-#include "maildirMessage.hpp"
-#include "maildirUtils.hpp"
+#include "messaging/maildirStore.hpp"
+#include "messaging/maildirMessage.hpp"
+#include "messaging/maildirUtils.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "utility/smartPtr.hpp"
+
+#include "messageParser.hpp"   // to include "message.hpp" in root directory
+
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirFolder.hpp b/src/messaging/maildirFolder.hpp
index 73ef6efe..2a607773 100644
--- a/src/messaging/maildirFolder.hpp
+++ b/src/messaging/maildirFolder.hpp
@@ -24,10 +24,11 @@
 #include <vector>
 #include <map>
 
-#include "../types.hpp"
-#include "folder.hpp"
+#include "types.hpp"
 
-#include "../utility/file.hpp"
+#include "messaging/folder.hpp"
+
+#include "utility/file.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirMessage.cpp b/src/messaging/maildirMessage.cpp
index 2322dfd0..17f595fb 100644
--- a/src/messaging/maildirMessage.cpp
+++ b/src/messaging/maildirMessage.cpp
@@ -17,12 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "maildirMessage.hpp"
-#include "maildirFolder.hpp"
-#include "maildirUtils.hpp"
+#include "messaging/maildirMessage.hpp"
+#include "messaging/maildirFolder.hpp"
+#include "messaging/maildirUtils.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "messageParser.hpp"   // to include "message.hpp" in root directory
+
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirMessage.hpp b/src/messaging/maildirMessage.hpp
index 11eae7f6..02ada2f6 100644
--- a/src/messaging/maildirMessage.hpp
+++ b/src/messaging/maildirMessage.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_MAILDIRMESSAGE_HPP_INCLUDED
 
 
-#include "message.hpp"
-#include "folder.hpp"
+#include "messaging/message.hpp"
+#include "messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirStore.cpp b/src/messaging/maildirStore.cpp
index a74e4c7d..8390117b 100644
--- a/src/messaging/maildirStore.cpp
+++ b/src/messaging/maildirStore.cpp
@@ -17,12 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "maildirStore.hpp"
+#include "messaging/maildirStore.hpp"
 
-#include "maildirFolder.hpp"
+#include "messaging/maildirFolder.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "utility/smartPtr.hpp"
+
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirStore.hpp b/src/messaging/maildirStore.hpp
index 8a904dfa..b24eae60 100644
--- a/src/messaging/maildirStore.hpp
+++ b/src/messaging/maildirStore.hpp
@@ -21,10 +21,11 @@
 #define VMIME_MESSAGING_MAILDIRSTORE_HPP_INCLUDED
 
 
-#include "store.hpp"
-#include "socket.hpp"
-#include "folder.hpp"
-#include "../config.hpp"
+#include "config.hpp"
+
+#include "messaging/store.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/folder.hpp"
 
 #include "utility/file.hpp"
 
diff --git a/src/messaging/maildirUtils.cpp b/src/messaging/maildirUtils.cpp
index aba91372..587f8f4c 100644
--- a/src/messaging/maildirUtils.cpp
+++ b/src/messaging/maildirUtils.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "maildirUtils.hpp"
-#include "maildirStore.hpp"
+#include "messaging/maildirUtils.hpp"
+#include "messaging/maildirStore.hpp"
 
-#include "../utility/random.hpp"
+#include "utility/random.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirUtils.hpp b/src/messaging/maildirUtils.hpp
index 6d5f0628..ca0b9bfd 100644
--- a/src/messaging/maildirUtils.hpp
+++ b/src/messaging/maildirUtils.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_MAILDIRUTILS_HPP_INCLUDED
 
 
-#include "../utility/file.hpp"
-#include "../utility/path.hpp"
+#include "utility/file.hpp"
+#include "utility/path.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/message.cpp b/src/messaging/message.cpp
index 871799c3..cf36158b 100644
--- a/src/messaging/message.cpp
+++ b/src/messaging/message.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "message.hpp"
+#include "messaging/message.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/message.hpp b/src/messaging/message.hpp
index db247328..e94663b4 100644
--- a/src/messaging/message.hpp
+++ b/src/messaging/message.hpp
@@ -21,9 +21,9 @@
 #define VMIME_MESSAGING_MESSAGE_HPP_INCLUDED
 
 
-#include "../header.hpp"
-#include "progressionListener.hpp"
-#include "../utility/stream.hpp"
+#include "header.hpp"
+#include "messaging/progressionListener.hpp"
+#include "utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/service.cpp b/src/messaging/service.cpp
index 5f69600d..3b0c7ed3 100644
--- a/src/messaging/service.cpp
+++ b/src/messaging/service.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "service.hpp"
+#include "messaging/service.hpp"
 
-#include "defaultAuthenticator.hpp"
+#include "messaging/defaultAuthenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/service.hpp b/src/messaging/service.hpp
index e6aa372c..062d9b69 100644
--- a/src/messaging/service.hpp
+++ b/src/messaging/service.hpp
@@ -21,14 +21,15 @@
 #define VMIME_MESSAGING_SERVICE_HPP_INCLUDED
 
 
-#include "../types.hpp"
-#include "session.hpp"
+#include "types.hpp"
 
-#include "authenticator.hpp"
-#include "progressionListener.hpp"
+#include "messaging/session.hpp"
 
-#include "serviceFactory.hpp"
-#include "serviceInfos.hpp"
+#include "messaging/authenticator.hpp"
+#include "messaging/progressionListener.hpp"
+
+#include "messaging/serviceFactory.hpp"
+#include "messaging/serviceInfos.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/serviceFactory.cpp b/src/messaging/serviceFactory.cpp
index b6a69313..666e052d 100644
--- a/src/messaging/serviceFactory.cpp
+++ b/src/messaging/serviceFactory.cpp
@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "serviceFactory.hpp"
-#include "service.hpp"
+#include "messaging/serviceFactory.hpp"
+#include "messaging/service.hpp"
 
-#include "../exception.hpp"
-#include "../config.hpp"
+#include "exception.hpp"
+#include "config.hpp"
 
-#include "builtinServices.inl"
+#include "messaging/builtinServices.inl"
 
 
 namespace vmime {
diff --git a/src/messaging/serviceFactory.hpp b/src/messaging/serviceFactory.hpp
index 2ade7e69..89ce9773 100644
--- a/src/messaging/serviceFactory.hpp
+++ b/src/messaging/serviceFactory.hpp
@@ -23,16 +23,16 @@
 
 #include <map>
 
-#include "../types.hpp"
-#include "../base.hpp"
-#include "../utility/singleton.hpp"
-#include "../utility/stringUtils.hpp"
+#include "types.hpp"
+#include "base.hpp"
+#include "utility/singleton.hpp"
+#include "utility/stringUtils.hpp"
 
-#include "serviceInfos.hpp"
-#include "authenticator.hpp"
-#include "progressionListener.hpp"
-#include "timeoutHandler.hpp"
-#include "url.hpp"
+#include "messaging/serviceInfos.hpp"
+#include "messaging/authenticator.hpp"
+#include "messaging/progressionListener.hpp"
+#include "messaging/timeoutHandler.hpp"
+#include "messaging/url.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/serviceInfos.hpp b/src/messaging/serviceInfos.hpp
index d9ba7510..a2f4a7cc 100644
--- a/src/messaging/serviceInfos.hpp
+++ b/src/messaging/serviceInfos.hpp
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "../types.hpp"
+#include "types.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/session.cpp b/src/messaging/session.cpp
index 54f65c95..76d3c07a 100644
--- a/src/messaging/session.cpp
+++ b/src/messaging/session.cpp
@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "session.hpp"
-#include "serviceFactory.hpp"
+#include "messaging/session.hpp"
+#include "messaging/serviceFactory.hpp"
 
-#include "store.hpp"
-#include "transport.hpp"
+#include "messaging/store.hpp"
+#include "messaging/transport.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/session.hpp b/src/messaging/session.hpp
index ad521fc3..61e94fb1 100644
--- a/src/messaging/session.hpp
+++ b/src/messaging/session.hpp
@@ -21,10 +21,10 @@
 #define VMIME_MESSAGING_SESSION_HPP_INCLUDED
 
 
-#include "authenticator.hpp"
-#include "progressionListener.hpp"
+#include "messaging/authenticator.hpp"
+#include "messaging/progressionListener.hpp"
 
-#include "../propertySet.hpp"
+#include "propertySet.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/simpleAuthenticator.cpp b/src/messaging/simpleAuthenticator.cpp
index 878e5aea..abfa3086 100644
--- a/src/messaging/simpleAuthenticator.cpp
+++ b/src/messaging/simpleAuthenticator.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "simpleAuthenticator.hpp"
+#include "messaging/simpleAuthenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/simpleAuthenticator.hpp b/src/messaging/simpleAuthenticator.hpp
index 8789c40a..ddee3360 100644
--- a/src/messaging/simpleAuthenticator.hpp
+++ b/src/messaging/simpleAuthenticator.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_SIMPLEAUTHENTICATOR_HPP_INCLUDED
 
 
-#include "authenticator.hpp"
+#include "messaging/authenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/socket.hpp b/src/messaging/socket.hpp
index 257a459c..020af57e 100644
--- a/src/messaging/socket.hpp
+++ b/src/messaging/socket.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_SOCKET_HPP_INCLUDED
 
 
-#include "../base.hpp"
+#include "base.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/store.hpp b/src/messaging/store.hpp
index dc2d3358..d6830166 100644
--- a/src/messaging/store.hpp
+++ b/src/messaging/store.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_STORE_HPP_INCLUDED
 
 
-#include "service.hpp"
-#include "folder.hpp"
+#include "messaging/service.hpp"
+#include "messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/transport.hpp b/src/messaging/transport.hpp
index bb3306c2..be7caab9 100644
--- a/src/messaging/transport.hpp
+++ b/src/messaging/transport.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_TRANSPORT_HPP_INCLUDED
 
 
-#include "service.hpp"
-#include "../utility/stream.hpp"
+#include "messaging/service.hpp"
+#include "utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/url.cpp b/src/messaging/url.cpp
index 9bedb150..f8b24fd7 100644
--- a/src/messaging/url.cpp
+++ b/src/messaging/url.cpp
@@ -20,7 +20,7 @@
 #include "url.hpp"
 
 #include "parserHelpers.hpp"
-#include "urlUtils.hpp"
+#include "messaging/urlUtils.hpp"
 #include "exception.hpp"
 
 #include <sstream>
diff --git a/src/messaging/url.hpp b/src/messaging/url.hpp
index 15c9d402..9440e61d 100644
--- a/src/messaging/url.hpp
+++ b/src/messaging/url.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_URL_HPP_INCLUDED
 
 
-#include "../types.hpp"
-#include "../base.hpp"
+#include "types.hpp"
+#include "base.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/urlUtils.cpp b/src/messaging/urlUtils.cpp
index b8e9cb91..03b20a8f 100644
--- a/src/messaging/urlUtils.cpp
+++ b/src/messaging/urlUtils.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "urlUtils.hpp"
+#include "messaging/urlUtils.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/urlUtils.hpp b/src/messaging/urlUtils.hpp
index c6296805..1e73a38a 100644
--- a/src/messaging/urlUtils.hpp
+++ b/src/messaging/urlUtils.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_URLUTILS_HPP_INCLUDED
 
 
-#include "../types.hpp"
-#include "../base.hpp"
+#include "types.hpp"
+#include "base.hpp"
 
 
 namespace vmime {
diff --git a/src/platforms/posix/file.cpp b/src/platforms/posix/file.cpp
index f46b09ec..463d4ca0 100644
--- a/src/platforms/posix/file.cpp
+++ b/src/platforms/posix/file.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "file.hpp"
+#include "platforms/posix/file.hpp"
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -30,7 +30,7 @@
 
 #include <string.h>
 
-#include "../../exception.hpp"
+#include "exception.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
diff --git a/src/platforms/posix/file.hpp b/src/platforms/posix/file.hpp
index 8672973a..7405d238 100644
--- a/src/platforms/posix/file.hpp
+++ b/src/platforms/posix/file.hpp
@@ -21,7 +21,7 @@
 #define VMIME_PLATFORMS_POSIX_FILE_HPP_INCLUDED
 
 
-#include "../../utility/file.hpp"
+#include "utility/file.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
diff --git a/src/platforms/posix/handler.cpp b/src/platforms/posix/handler.cpp
index 35f0a21b..ddb1c421 100644
--- a/src/platforms/posix/handler.cpp
+++ b/src/platforms/posix/handler.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "handler.hpp"
+#include "platforms/posix/handler.hpp"
 
 #include <time.h>
 
diff --git a/src/platforms/posix/handler.hpp b/src/platforms/posix/handler.hpp
index 252d45d3..a284e5ab 100644
--- a/src/platforms/posix/handler.hpp
+++ b/src/platforms/posix/handler.hpp
@@ -21,15 +21,15 @@
 #define VMIME_PLATFORMS_POSIX_HANDLER_HPP_INCLUDED
 
 
-#include "../../config.hpp"
-#include "../../platformDependant.hpp"
+#include "config.hpp"
+#include "platformDependant.hpp"
 
 #if VMIME_HAVE_MESSAGING_FEATURES
-	#include "socket.hpp"
+	#include "platforms/posix/socket.hpp"
 #endif
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
-     #include "file.hpp"
+     #include "platforms/posix/file.hpp"
 #endif
 
 
diff --git a/src/platforms/posix/socket.cpp b/src/platforms/posix/socket.cpp
index 51cc5cc1..e5a07f36 100644
--- a/src/platforms/posix/socket.cpp
+++ b/src/platforms/posix/socket.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "socket.hpp"
+#include "platforms/posix/socket.hpp"
 
 #include <unistd.h>
 #include <sys/socket.h>
@@ -27,7 +27,7 @@
 #include <netdb.h>
 #include <fcntl.h>
 
-#include "../../exception.hpp"
+#include "exception.hpp"
 
 
 #if VMIME_HAVE_MESSAGING_FEATURES
diff --git a/src/platforms/posix/socket.hpp b/src/platforms/posix/socket.hpp
index 44d4ab73..83291bbf 100644
--- a/src/platforms/posix/socket.hpp
+++ b/src/platforms/posix/socket.hpp
@@ -21,7 +21,7 @@
 #define VMIME_PLATFORMS_POSIX_SOCKET_HPP_INCLUDED
 
 
-#include "../../messaging/socket.hpp"
+#include "messaging/socket.hpp"
 
 
 #if VMIME_HAVE_MESSAGING_FEATURES
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>