146 files changed, 2 insertions, 2 deletions
diff --git a/src/net/builtinServices.inl b/src/vmime/net/builtinServices.inl
index 9225ff30..fa2f3fe3 100644
--- a/src/net/builtinServices.inl
+++ b/src/vmime/net/builtinServices.inl
@@ -23,7 +23,7 @@
 
 
 // Include registration helpers
-#include "src/net/serviceRegistration.inl"
+#include "vmime/net/serviceRegistration.inl"
 
 
 #ifndef VMIME_BUILDING_DOC
diff --git a/vmime/net/connectionInfos.hpp b/src/vmime/net/connectionInfos.hpp
index 6c86eeab..6c86eeab 100644
--- a/vmime/net/connectionInfos.hpp
+++ b/src/vmime/net/connectionInfos.hpp
diff --git a/src/net/defaultConnectionInfos.cpp b/src/vmime/net/defaultConnectionInfos.cpp
index 335e8f6f..335e8f6f 100644
--- a/src/net/defaultConnectionInfos.cpp
+++ b/src/vmime/net/defaultConnectionInfos.cpp
diff --git a/vmime/net/defaultConnectionInfos.hpp b/src/vmime/net/defaultConnectionInfos.hpp
index 50673bbc..50673bbc 100644
--- a/vmime/net/defaultConnectionInfos.hpp
+++ b/src/vmime/net/defaultConnectionInfos.hpp
diff --git a/src/net/events.cpp b/src/vmime/net/events.cpp
index a19e1738..a19e1738 100644
--- a/src/net/events.cpp
+++ b/src/vmime/net/events.cpp
diff --git a/vmime/net/events.hpp b/src/vmime/net/events.hpp
index a3e952d4..a3e952d4 100644
--- a/vmime/net/events.hpp
+++ b/src/vmime/net/events.hpp
diff --git a/src/net/fetchAttributes.cpp b/src/vmime/net/fetchAttributes.cpp
index 85a41b8c..85a41b8c 100644
--- a/src/net/fetchAttributes.cpp
+++ b/src/vmime/net/fetchAttributes.cpp
diff --git a/vmime/net/fetchAttributes.hpp b/src/vmime/net/fetchAttributes.hpp
index d01e9f50..d01e9f50 100644
--- a/vmime/net/fetchAttributes.hpp
+++ b/src/vmime/net/fetchAttributes.hpp
diff --git a/src/net/folder.cpp b/src/vmime/net/folder.cpp
index 1d6f3140..1d6f3140 100644
--- a/src/net/folder.cpp
+++ b/src/vmime/net/folder.cpp
diff --git a/vmime/net/folder.hpp b/src/vmime/net/folder.hpp
index 38ba4597..38ba4597 100644
--- a/vmime/net/folder.hpp
+++ b/src/vmime/net/folder.hpp
diff --git a/vmime/net/folderStatus.hpp b/src/vmime/net/folderStatus.hpp
index b94db052..b94db052 100644
--- a/vmime/net/folderStatus.hpp
+++ b/src/vmime/net/folderStatus.hpp
diff --git a/src/net/imap/IMAPConnection.cpp b/src/vmime/net/imap/IMAPConnection.cpp
index 234c2b6a..234c2b6a 100644
--- a/src/net/imap/IMAPConnection.cpp
+++ b/src/vmime/net/imap/IMAPConnection.cpp
diff --git a/vmime/net/imap/IMAPConnection.hpp b/src/vmime/net/imap/IMAPConnection.hpp
index b38d0c27..b38d0c27 100644
--- a/vmime/net/imap/IMAPConnection.hpp
+++ b/src/vmime/net/imap/IMAPConnection.hpp
diff --git a/src/net/imap/IMAPFolder.cpp b/src/vmime/net/imap/IMAPFolder.cpp
index fb98887c..fb98887c 100644
--- a/src/net/imap/IMAPFolder.cpp
+++ b/src/vmime/net/imap/IMAPFolder.cpp
diff --git a/vmime/net/imap/IMAPFolder.hpp b/src/vmime/net/imap/IMAPFolder.hpp
index cc7334ff..cc7334ff 100644
--- a/vmime/net/imap/IMAPFolder.hpp
+++ b/src/vmime/net/imap/IMAPFolder.hpp
diff --git a/src/net/imap/IMAPFolderStatus.cpp b/src/vmime/net/imap/IMAPFolderStatus.cpp
index c78a40f3..c78a40f3 100644
--- a/src/net/imap/IMAPFolderStatus.cpp
+++ b/src/vmime/net/imap/IMAPFolderStatus.cpp
diff --git a/vmime/net/imap/IMAPFolderStatus.hpp b/src/vmime/net/imap/IMAPFolderStatus.hpp
index 03ca5937..03ca5937 100644
--- a/vmime/net/imap/IMAPFolderStatus.hpp
+++ b/src/vmime/net/imap/IMAPFolderStatus.hpp
diff --git a/src/net/imap/IMAPMessage.cpp b/src/vmime/net/imap/IMAPMessage.cpp
index c11aafc2..c11aafc2 100644
--- a/src/net/imap/IMAPMessage.cpp
+++ b/src/vmime/net/imap/IMAPMessage.cpp
diff --git a/vmime/net/imap/IMAPMessage.hpp b/src/vmime/net/imap/IMAPMessage.hpp
index 92903d69..92903d69 100644
--- a/vmime/net/imap/IMAPMessage.hpp
+++ b/src/vmime/net/imap/IMAPMessage.hpp
diff --git a/src/net/imap/IMAPMessagePart.cpp b/src/vmime/net/imap/IMAPMessagePart.cpp
index eed885dc..eed885dc 100644
--- a/src/net/imap/IMAPMessagePart.cpp
+++ b/src/vmime/net/imap/IMAPMessagePart.cpp
diff --git a/vmime/net/imap/IMAPMessagePart.hpp b/src/vmime/net/imap/IMAPMessagePart.hpp
index af8581d7..af8581d7 100644
--- a/vmime/net/imap/IMAPMessagePart.hpp
+++ b/src/vmime/net/imap/IMAPMessagePart.hpp
diff --git a/src/net/imap/IMAPMessagePartContentHandler.cpp b/src/vmime/net/imap/IMAPMessagePartContentHandler.cpp
index 1f53f082..1f53f082 100644
--- a/src/net/imap/IMAPMessagePartContentHandler.cpp
+++ b/src/vmime/net/imap/IMAPMessagePartContentHandler.cpp
diff --git a/vmime/net/imap/IMAPMessagePartContentHandler.hpp b/src/vmime/net/imap/IMAPMessagePartContentHandler.hpp
index cb52b2e3..cb52b2e3 100644
--- a/vmime/net/imap/IMAPMessagePartContentHandler.hpp
+++ b/src/vmime/net/imap/IMAPMessagePartContentHandler.hpp
diff --git a/src/net/imap/IMAPMessageStructure.cpp b/src/vmime/net/imap/IMAPMessageStructure.cpp
index 8dc333e9..8dc333e9 100644
--- a/src/net/imap/IMAPMessageStructure.cpp
+++ b/src/vmime/net/imap/IMAPMessageStructure.cpp
diff --git a/vmime/net/imap/IMAPMessageStructure.hpp b/src/vmime/net/imap/IMAPMessageStructure.hpp
index 44b6d6f0..44b6d6f0 100644
--- a/vmime/net/imap/IMAPMessageStructure.hpp
+++ b/src/vmime/net/imap/IMAPMessageStructure.hpp
diff --git a/vmime/net/imap/IMAPParser.hpp b/src/vmime/net/imap/IMAPParser.hpp
index 8c7fcb60..8c7fcb60 100644
--- a/vmime/net/imap/IMAPParser.hpp
+++ b/src/vmime/net/imap/IMAPParser.hpp
diff --git a/src/net/imap/IMAPSStore.cpp b/src/vmime/net/imap/IMAPSStore.cpp
index c9e64f5b..c9e64f5b 100644
--- a/src/net/imap/IMAPSStore.cpp
+++ b/src/vmime/net/imap/IMAPSStore.cpp
diff --git a/vmime/net/imap/IMAPSStore.hpp b/src/vmime/net/imap/IMAPSStore.hpp
index 9d27bdd0..9d27bdd0 100644
--- a/vmime/net/imap/IMAPSStore.hpp
+++ b/src/vmime/net/imap/IMAPSStore.hpp
diff --git a/src/net/imap/IMAPServiceInfos.cpp b/src/vmime/net/imap/IMAPServiceInfos.cpp
index 46dbc2e1..46dbc2e1 100644
--- a/src/net/imap/IMAPServiceInfos.cpp
+++ b/src/vmime/net/imap/IMAPServiceInfos.cpp
diff --git a/vmime/net/imap/IMAPServiceInfos.hpp b/src/vmime/net/imap/IMAPServiceInfos.hpp
index 376f4476..376f4476 100644
--- a/vmime/net/imap/IMAPServiceInfos.hpp
+++ b/src/vmime/net/imap/IMAPServiceInfos.hpp
diff --git a/src/net/imap/IMAPStore.cpp b/src/vmime/net/imap/IMAPStore.cpp
index a1a8c9ca..a1a8c9ca 100644
--- a/src/net/imap/IMAPStore.cpp
+++ b/src/vmime/net/imap/IMAPStore.cpp
diff --git a/vmime/net/imap/IMAPStore.hpp b/src/vmime/net/imap/IMAPStore.hpp
index f854fadf..f854fadf 100644
--- a/vmime/net/imap/IMAPStore.hpp
+++ b/src/vmime/net/imap/IMAPStore.hpp
diff --git a/src/net/imap/IMAPTag.cpp b/src/vmime/net/imap/IMAPTag.cpp
index 14d12788..14d12788 100644
--- a/src/net/imap/IMAPTag.cpp
+++ b/src/vmime/net/imap/IMAPTag.cpp
diff --git a/vmime/net/imap/IMAPTag.hpp b/src/vmime/net/imap/IMAPTag.hpp
index 430a3b10..430a3b10 100644
--- a/vmime/net/imap/IMAPTag.hpp
+++ b/src/vmime/net/imap/IMAPTag.hpp
diff --git a/src/net/imap/IMAPUtils.cpp b/src/vmime/net/imap/IMAPUtils.cpp
index ff81ce71..ff81ce71 100644
--- a/src/net/imap/IMAPUtils.cpp
+++ b/src/vmime/net/imap/IMAPUtils.cpp
diff --git a/vmime/net/imap/IMAPUtils.hpp b/src/vmime/net/imap/IMAPUtils.hpp
index 988b6a2c..988b6a2c 100644
--- a/vmime/net/imap/IMAPUtils.hpp
+++ b/src/vmime/net/imap/IMAPUtils.hpp
diff --git a/vmime/net/imap/imap.hpp b/src/vmime/net/imap/imap.hpp
index 5e10619a..5e10619a 100644
--- a/vmime/net/imap/imap.hpp
+++ b/src/vmime/net/imap/imap.hpp
diff --git a/src/net/maildir/format/courierMaildirFormat.cpp b/src/vmime/net/maildir/format/courierMaildirFormat.cpp
index 6d460d5e..6d460d5e 100644
--- a/src/net/maildir/format/courierMaildirFormat.cpp
+++ b/src/vmime/net/maildir/format/courierMaildirFormat.cpp
diff --git a/vmime/net/maildir/format/courierMaildirFormat.hpp b/src/vmime/net/maildir/format/courierMaildirFormat.hpp
index b8443426..b8443426 100644
--- a/vmime/net/maildir/format/courierMaildirFormat.hpp
+++ b/src/vmime/net/maildir/format/courierMaildirFormat.hpp
diff --git a/src/net/maildir/format/kmailMaildirFormat.cpp b/src/vmime/net/maildir/format/kmailMaildirFormat.cpp
index 975752a5..975752a5 100644
--- a/src/net/maildir/format/kmailMaildirFormat.cpp
+++ b/src/vmime/net/maildir/format/kmailMaildirFormat.cpp
diff --git a/vmime/net/maildir/format/kmailMaildirFormat.hpp b/src/vmime/net/maildir/format/kmailMaildirFormat.hpp
index 98ca212e..98ca212e 100644
--- a/vmime/net/maildir/format/kmailMaildirFormat.hpp
+++ b/src/vmime/net/maildir/format/kmailMaildirFormat.hpp
diff --git a/vmime/net/maildir/maildir.hpp b/src/vmime/net/maildir/maildir.hpp
index 42bbbea4..42bbbea4 100644
--- a/vmime/net/maildir/maildir.hpp
+++ b/src/vmime/net/maildir/maildir.hpp
diff --git a/src/net/maildir/maildirFolder.cpp b/src/vmime/net/maildir/maildirFolder.cpp
index 660178ff..660178ff 100644
--- a/src/net/maildir/maildirFolder.cpp
+++ b/src/vmime/net/maildir/maildirFolder.cpp
diff --git a/vmime/net/maildir/maildirFolder.hpp b/src/vmime/net/maildir/maildirFolder.hpp
index 5cff53fc..5cff53fc 100644
--- a/vmime/net/maildir/maildirFolder.hpp
+++ b/src/vmime/net/maildir/maildirFolder.hpp
diff --git a/src/net/maildir/maildirFolderStatus.cpp b/src/vmime/net/maildir/maildirFolderStatus.cpp
index 9ee84dba..9ee84dba 100644
--- a/src/net/maildir/maildirFolderStatus.cpp
+++ b/src/vmime/net/maildir/maildirFolderStatus.cpp
diff --git a/vmime/net/maildir/maildirFolderStatus.hpp b/src/vmime/net/maildir/maildirFolderStatus.hpp
index 155fb20f..155fb20f 100644
--- a/vmime/net/maildir/maildirFolderStatus.hpp
+++ b/src/vmime/net/maildir/maildirFolderStatus.hpp
diff --git a/src/net/maildir/maildirFormat.cpp b/src/vmime/net/maildir/maildirFormat.cpp
index f7a3c8fe..f7a3c8fe 100644
--- a/src/net/maildir/maildirFormat.cpp
+++ b/src/vmime/net/maildir/maildirFormat.cpp
diff --git a/vmime/net/maildir/maildirFormat.hpp b/src/vmime/net/maildir/maildirFormat.hpp
index c0daf288..c0daf288 100644
--- a/vmime/net/maildir/maildirFormat.hpp
+++ b/src/vmime/net/maildir/maildirFormat.hpp
diff --git a/src/net/maildir/maildirMessage.cpp b/src/vmime/net/maildir/maildirMessage.cpp
index a14f067e..a14f067e 100644
--- a/src/net/maildir/maildirMessage.cpp
+++ b/src/vmime/net/maildir/maildirMessage.cpp
diff --git a/vmime/net/maildir/maildirMessage.hpp b/src/vmime/net/maildir/maildirMessage.hpp
index 7480d49c..7480d49c 100644
--- a/vmime/net/maildir/maildirMessage.hpp
+++ b/src/vmime/net/maildir/maildirMessage.hpp
diff --git a/src/net/maildir/maildirMessagePart.cpp b/src/vmime/net/maildir/maildirMessagePart.cpp
index 6ae085c9..6ae085c9 100644
--- a/src/net/maildir/maildirMessagePart.cpp
+++ b/src/vmime/net/maildir/maildirMessagePart.cpp
diff --git a/vmime/net/maildir/maildirMessagePart.hpp b/src/vmime/net/maildir/maildirMessagePart.hpp
index 3a4be0f3..3a4be0f3 100644
--- a/vmime/net/maildir/maildirMessagePart.hpp
+++ b/src/vmime/net/maildir/maildirMessagePart.hpp
diff --git a/src/net/maildir/maildirMessageStructure.cpp b/src/vmime/net/maildir/maildirMessageStructure.cpp
index f3b7cf59..f3b7cf59 100644
--- a/src/net/maildir/maildirMessageStructure.cpp
+++ b/src/vmime/net/maildir/maildirMessageStructure.cpp
diff --git a/vmime/net/maildir/maildirMessageStructure.hpp b/src/vmime/net/maildir/maildirMessageStructure.hpp
index a43fc15c..a43fc15c 100644
--- a/vmime/net/maildir/maildirMessageStructure.hpp
+++ b/src/vmime/net/maildir/maildirMessageStructure.hpp
diff --git a/src/net/maildir/maildirServiceInfos.cpp b/src/vmime/net/maildir/maildirServiceInfos.cpp
index 974a0c21..974a0c21 100644
--- a/src/net/maildir/maildirServiceInfos.cpp
+++ b/src/vmime/net/maildir/maildirServiceInfos.cpp
diff --git a/vmime/net/maildir/maildirServiceInfos.hpp b/src/vmime/net/maildir/maildirServiceInfos.hpp
index 70ddc6dc..70ddc6dc 100644
--- a/vmime/net/maildir/maildirServiceInfos.hpp
+++ b/src/vmime/net/maildir/maildirServiceInfos.hpp
diff --git a/src/net/maildir/maildirStore.cpp b/src/vmime/net/maildir/maildirStore.cpp
index 87e733e2..87e733e2 100644
--- a/src/net/maildir/maildirStore.cpp
+++ b/src/vmime/net/maildir/maildirStore.cpp
diff --git a/vmime/net/maildir/maildirStore.hpp b/src/vmime/net/maildir/maildirStore.hpp
index efadfdfe..efadfdfe 100644
--- a/vmime/net/maildir/maildirStore.hpp
+++ b/src/vmime/net/maildir/maildirStore.hpp
diff --git a/src/net/maildir/maildirUtils.cpp b/src/vmime/net/maildir/maildirUtils.cpp
index 77aac715..77aac715 100644
--- a/src/net/maildir/maildirUtils.cpp
+++ b/src/vmime/net/maildir/maildirUtils.cpp
diff --git a/vmime/net/maildir/maildirUtils.hpp b/src/vmime/net/maildir/maildirUtils.hpp
index 82deefbb..82deefbb 100644
--- a/vmime/net/maildir/maildirUtils.hpp
+++ b/src/vmime/net/maildir/maildirUtils.hpp
diff --git a/src/net/message.cpp b/src/vmime/net/message.cpp
index 6765e73c..6765e73c 100644
--- a/src/net/message.cpp
+++ b/src/vmime/net/message.cpp
diff --git a/vmime/net/message.hpp b/src/vmime/net/message.hpp
index 5bb62c53..5bb62c53 100644
--- a/vmime/net/message.hpp
+++ b/src/vmime/net/message.hpp
diff --git a/src/net/messageSet.cpp b/src/vmime/net/messageSet.cpp
index 2939042e..2939042e 100644
--- a/src/net/messageSet.cpp
+++ b/src/vmime/net/messageSet.cpp
diff --git a/vmime/net/messageSet.hpp b/src/vmime/net/messageSet.hpp
index 6c7d7f44..6c7d7f44 100644
--- a/vmime/net/messageSet.hpp
+++ b/src/vmime/net/messageSet.hpp
diff --git a/src/net/pop3/POP3Command.cpp b/src/vmime/net/pop3/POP3Command.cpp
index 6fe301ce..6fe301ce 100644
--- a/src/net/pop3/POP3Command.cpp
+++ b/src/vmime/net/pop3/POP3Command.cpp
diff --git a/vmime/net/pop3/POP3Command.hpp b/src/vmime/net/pop3/POP3Command.hpp
index cc3c4fd5..cc3c4fd5 100644
--- a/vmime/net/pop3/POP3Command.hpp
+++ b/src/vmime/net/pop3/POP3Command.hpp
diff --git a/src/net/pop3/POP3Connection.cpp b/src/vmime/net/pop3/POP3Connection.cpp
index 5fa923f4..5fa923f4 100644
--- a/src/net/pop3/POP3Connection.cpp
+++ b/src/vmime/net/pop3/POP3Connection.cpp
diff --git a/vmime/net/pop3/POP3Connection.hpp b/src/vmime/net/pop3/POP3Connection.hpp
index 3622f745..3622f745 100644
--- a/vmime/net/pop3/POP3Connection.hpp
+++ b/src/vmime/net/pop3/POP3Connection.hpp
diff --git a/src/net/pop3/POP3Folder.cpp b/src/vmime/net/pop3/POP3Folder.cpp
index 096de8af..096de8af 100644
--- a/src/net/pop3/POP3Folder.cpp
+++ b/src/vmime/net/pop3/POP3Folder.cpp
diff --git a/vmime/net/pop3/POP3Folder.hpp b/src/vmime/net/pop3/POP3Folder.hpp
index 27ea6e5f..27ea6e5f 100644
--- a/vmime/net/pop3/POP3Folder.hpp
+++ b/src/vmime/net/pop3/POP3Folder.hpp
diff --git a/src/net/pop3/POP3FolderStatus.cpp b/src/vmime/net/pop3/POP3FolderStatus.cpp
index 944379ac..944379ac 100644
--- a/src/net/pop3/POP3FolderStatus.cpp
+++ b/src/vmime/net/pop3/POP3FolderStatus.cpp
diff --git a/vmime/net/pop3/POP3FolderStatus.hpp b/src/vmime/net/pop3/POP3FolderStatus.hpp
index 70ba48b6..70ba48b6 100644
--- a/vmime/net/pop3/POP3FolderStatus.hpp
+++ b/src/vmime/net/pop3/POP3FolderStatus.hpp
diff --git a/src/net/pop3/POP3Message.cpp b/src/vmime/net/pop3/POP3Message.cpp
index 08523611..08523611 100644
--- a/src/net/pop3/POP3Message.cpp
+++ b/src/vmime/net/pop3/POP3Message.cpp
diff --git a/vmime/net/pop3/POP3Message.hpp b/src/vmime/net/pop3/POP3Message.hpp
index 87e71ba7..87e71ba7 100644
--- a/vmime/net/pop3/POP3Message.hpp
+++ b/src/vmime/net/pop3/POP3Message.hpp
diff --git a/src/net/pop3/POP3Response.cpp b/src/vmime/net/pop3/POP3Response.cpp
index 1dc5ee76..1dc5ee76 100644
--- a/src/net/pop3/POP3Response.cpp
+++ b/src/vmime/net/pop3/POP3Response.cpp
diff --git a/vmime/net/pop3/POP3Response.hpp b/src/vmime/net/pop3/POP3Response.hpp
index 20477b5e..20477b5e 100644
--- a/vmime/net/pop3/POP3Response.hpp
+++ b/src/vmime/net/pop3/POP3Response.hpp
diff --git a/src/net/pop3/POP3SStore.cpp b/src/vmime/net/pop3/POP3SStore.cpp
index f1c3da74..f1c3da74 100644
--- a/src/net/pop3/POP3SStore.cpp
+++ b/src/vmime/net/pop3/POP3SStore.cpp
diff --git a/vmime/net/pop3/POP3SStore.hpp b/src/vmime/net/pop3/POP3SStore.hpp
index e60b4ef8..e60b4ef8 100644
--- a/vmime/net/pop3/POP3SStore.hpp
+++ b/src/vmime/net/pop3/POP3SStore.hpp
diff --git a/src/net/pop3/POP3ServiceInfos.cpp b/src/vmime/net/pop3/POP3ServiceInfos.cpp
index 4760d4f2..4760d4f2 100644
--- a/src/net/pop3/POP3ServiceInfos.cpp
+++ b/src/vmime/net/pop3/POP3ServiceInfos.cpp
diff --git a/vmime/net/pop3/POP3ServiceInfos.hpp b/src/vmime/net/pop3/POP3ServiceInfos.hpp
index 710d8be3..710d8be3 100644
--- a/vmime/net/pop3/POP3ServiceInfos.hpp
+++ b/src/vmime/net/pop3/POP3ServiceInfos.hpp
diff --git a/src/net/pop3/POP3Store.cpp b/src/vmime/net/pop3/POP3Store.cpp
index e6e95b1b..e6e95b1b 100644
--- a/src/net/pop3/POP3Store.cpp
+++ b/src/vmime/net/pop3/POP3Store.cpp
diff --git a/vmime/net/pop3/POP3Store.hpp b/src/vmime/net/pop3/POP3Store.hpp
index b35659a0..b35659a0 100644
--- a/vmime/net/pop3/POP3Store.hpp
+++ b/src/vmime/net/pop3/POP3Store.hpp
diff --git a/src/net/pop3/POP3Utils.cpp b/src/vmime/net/pop3/POP3Utils.cpp
index 7ba65fff..7ba65fff 100644
--- a/src/net/pop3/POP3Utils.cpp
+++ b/src/vmime/net/pop3/POP3Utils.cpp
diff --git a/vmime/net/pop3/POP3Utils.hpp b/src/vmime/net/pop3/POP3Utils.hpp
index c7459efe..c7459efe 100644
--- a/vmime/net/pop3/POP3Utils.hpp
+++ b/src/vmime/net/pop3/POP3Utils.hpp
diff --git a/vmime/net/pop3/pop3.hpp b/src/vmime/net/pop3/pop3.hpp
index 366b1e4a..366b1e4a 100644
--- a/vmime/net/pop3/pop3.hpp
+++ b/src/vmime/net/pop3/pop3.hpp
diff --git a/vmime/net/securedConnectionInfos.hpp b/src/vmime/net/securedConnectionInfos.hpp
index 8ed8b138..8ed8b138 100644
--- a/vmime/net/securedConnectionInfos.hpp
+++ b/src/vmime/net/securedConnectionInfos.hpp
diff --git a/vmime/net/sendmail/sendmail.hpp b/src/vmime/net/sendmail/sendmail.hpp
index b3692526..b3692526 100644
--- a/vmime/net/sendmail/sendmail.hpp
+++ b/src/vmime/net/sendmail/sendmail.hpp
diff --git a/src/net/sendmail/sendmailServiceInfos.cpp b/src/vmime/net/sendmail/sendmailServiceInfos.cpp
index 21cac00c..21cac00c 100644
--- a/src/net/sendmail/sendmailServiceInfos.cpp
+++ b/src/vmime/net/sendmail/sendmailServiceInfos.cpp
diff --git a/vmime/net/sendmail/sendmailServiceInfos.hpp b/src/vmime/net/sendmail/sendmailServiceInfos.hpp
index de94e392..de94e392 100644
--- a/vmime/net/sendmail/sendmailServiceInfos.hpp
+++ b/src/vmime/net/sendmail/sendmailServiceInfos.hpp
diff --git a/src/net/sendmail/sendmailTransport.cpp b/src/vmime/net/sendmail/sendmailTransport.cpp
index 8ef18e3b..8ef18e3b 100644
--- a/src/net/sendmail/sendmailTransport.cpp
+++ b/src/vmime/net/sendmail/sendmailTransport.cpp
diff --git a/vmime/net/sendmail/sendmailTransport.hpp b/src/vmime/net/sendmail/sendmailTransport.hpp
index d1c6aec0..d1c6aec0 100644
--- a/vmime/net/sendmail/sendmailTransport.hpp
+++ b/src/vmime/net/sendmail/sendmailTransport.hpp
diff --git a/src/net/service.cpp b/src/vmime/net/service.cpp
index c52ba592..c52ba592 100644
--- a/src/net/service.cpp
+++ b/src/vmime/net/service.cpp
diff --git a/vmime/net/service.hpp b/src/vmime/net/service.hpp
index 6969ac20..6969ac20 100644
--- a/vmime/net/service.hpp
+++ b/src/vmime/net/service.hpp
diff --git a/src/net/serviceFactory.cpp b/src/vmime/net/serviceFactory.cpp
index 98aee646..bbc9944a 100644
--- a/src/net/serviceFactory.cpp
+++ b/src/vmime/net/serviceFactory.cpp
@@ -32,7 +32,7 @@
 
 #include "vmime/exception.hpp"
 
-#include "src/net/builtinServices.inl"
+#include "vmime/net/builtinServices.inl"
 
 
 namespace vmime {
diff --git a/vmime/net/serviceFactory.hpp b/src/vmime/net/serviceFactory.hpp
index 9295b345..9295b345 100644
--- a/vmime/net/serviceFactory.hpp
+++ b/src/vmime/net/serviceFactory.hpp
diff --git a/src/net/serviceInfos.cpp b/src/vmime/net/serviceInfos.cpp
index 8de0529e..8de0529e 100644
--- a/src/net/serviceInfos.cpp
+++ b/src/vmime/net/serviceInfos.cpp
diff --git a/vmime/net/serviceInfos.hpp b/src/vmime/net/serviceInfos.hpp
index 6e3209ca..6e3209ca 100644
--- a/vmime/net/serviceInfos.hpp
+++ b/src/vmime/net/serviceInfos.hpp
diff --git a/src/net/serviceRegistration.inl b/src/vmime/net/serviceRegistration.inl
index 2366fe01..2366fe01 100644
--- a/src/net/serviceRegistration.inl
+++ b/src/vmime/net/serviceRegistration.inl
diff --git a/src/net/session.cpp b/src/vmime/net/session.cpp
index 36b9f2c3..36b9f2c3 100644
--- a/src/net/session.cpp
+++ b/src/vmime/net/session.cpp
diff --git a/vmime/net/session.hpp b/src/vmime/net/session.hpp
index a7e0ea1a..a7e0ea1a 100644
--- a/vmime/net/session.hpp
+++ b/src/vmime/net/session.hpp
diff --git a/src/net/smtp/SMTPChunkingOutputStreamAdapter.cpp b/src/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.cpp
index 69f63bc9..69f63bc9 100644
--- a/src/net/smtp/SMTPChunkingOutputStreamAdapter.cpp
+++ b/src/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.cpp
diff --git a/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp b/src/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp
index cfb3f50f..cfb3f50f 100644
--- a/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp
+++ b/src/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp
diff --git a/src/net/smtp/SMTPCommand.cpp b/src/vmime/net/smtp/SMTPCommand.cpp
index 949ab0c1..949ab0c1 100644
--- a/src/net/smtp/SMTPCommand.cpp
+++ b/src/vmime/net/smtp/SMTPCommand.cpp
diff --git a/vmime/net/smtp/SMTPCommand.hpp b/src/vmime/net/smtp/SMTPCommand.hpp
index dbb0888b..dbb0888b 100644
--- a/vmime/net/smtp/SMTPCommand.hpp
+++ b/src/vmime/net/smtp/SMTPCommand.hpp
diff --git a/src/net/smtp/SMTPCommandSet.cpp b/src/vmime/net/smtp/SMTPCommandSet.cpp
index 3e03427c..3e03427c 100644
--- a/src/net/smtp/SMTPCommandSet.cpp
+++ b/src/vmime/net/smtp/SMTPCommandSet.cpp
diff --git a/vmime/net/smtp/SMTPCommandSet.hpp b/src/vmime/net/smtp/SMTPCommandSet.hpp
index 8e744c2b..8e744c2b 100644
--- a/vmime/net/smtp/SMTPCommandSet.hpp
+++ b/src/vmime/net/smtp/SMTPCommandSet.hpp
diff --git a/src/net/smtp/SMTPConnection.cpp b/src/vmime/net/smtp/SMTPConnection.cpp
index 26be25db..26be25db 100644
--- a/src/net/smtp/SMTPConnection.cpp
+++ b/src/vmime/net/smtp/SMTPConnection.cpp
diff --git a/vmime/net/smtp/SMTPConnection.hpp b/src/vmime/net/smtp/SMTPConnection.hpp
index cc59ef34..cc59ef34 100644
--- a/vmime/net/smtp/SMTPConnection.hpp
+++ b/src/vmime/net/smtp/SMTPConnection.hpp
diff --git a/src/net/smtp/SMTPExceptions.cpp b/src/vmime/net/smtp/SMTPExceptions.cpp
index 0c3112c0..0c3112c0 100644
--- a/src/net/smtp/SMTPExceptions.cpp
+++ b/src/vmime/net/smtp/SMTPExceptions.cpp
diff --git a/vmime/net/smtp/SMTPExceptions.hpp b/src/vmime/net/smtp/SMTPExceptions.hpp
index 75842042..75842042 100644
--- a/vmime/net/smtp/SMTPExceptions.hpp
+++ b/src/vmime/net/smtp/SMTPExceptions.hpp
diff --git a/src/net/smtp/SMTPResponse.cpp b/src/vmime/net/smtp/SMTPResponse.cpp
index f7980351..f7980351 100644
--- a/src/net/smtp/SMTPResponse.cpp
+++ b/src/vmime/net/smtp/SMTPResponse.cpp
diff --git a/vmime/net/smtp/SMTPResponse.hpp b/src/vmime/net/smtp/SMTPResponse.hpp
index 000448ac..000448ac 100644
--- a/vmime/net/smtp/SMTPResponse.hpp
+++ b/src/vmime/net/smtp/SMTPResponse.hpp
diff --git a/src/net/smtp/SMTPSTransport.cpp b/src/vmime/net/smtp/SMTPSTransport.cpp
index ab64d49d..ab64d49d 100644
--- a/src/net/smtp/SMTPSTransport.cpp
+++ b/src/vmime/net/smtp/SMTPSTransport.cpp
diff --git a/vmime/net/smtp/SMTPSTransport.hpp b/src/vmime/net/smtp/SMTPSTransport.hpp
index 7782f711..7782f711 100644
--- a/vmime/net/smtp/SMTPSTransport.hpp
+++ b/src/vmime/net/smtp/SMTPSTransport.hpp
diff --git a/src/net/smtp/SMTPServiceInfos.cpp b/src/vmime/net/smtp/SMTPServiceInfos.cpp
index 532bb8b8..532bb8b8 100644
--- a/src/net/smtp/SMTPServiceInfos.cpp
+++ b/src/vmime/net/smtp/SMTPServiceInfos.cpp
diff --git a/vmime/net/smtp/SMTPServiceInfos.hpp b/src/vmime/net/smtp/SMTPServiceInfos.hpp
index f783194d..f783194d 100644
--- a/vmime/net/smtp/SMTPServiceInfos.hpp
+++ b/src/vmime/net/smtp/SMTPServiceInfos.hpp
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/vmime/net/smtp/SMTPTransport.cpp
index 0020d010..0020d010 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/vmime/net/smtp/SMTPTransport.cpp
diff --git a/vmime/net/smtp/SMTPTransport.hpp b/src/vmime/net/smtp/SMTPTransport.hpp
index a0f02418..a0f02418 100644
--- a/vmime/net/smtp/SMTPTransport.hpp
+++ b/src/vmime/net/smtp/SMTPTransport.hpp
diff --git a/vmime/net/smtp/smtp.hpp b/src/vmime/net/smtp/smtp.hpp
index 2a9ee312..2a9ee312 100644
--- a/vmime/net/smtp/smtp.hpp
+++ b/src/vmime/net/smtp/smtp.hpp
diff --git a/vmime/net/socket.hpp b/src/vmime/net/socket.hpp
index 537c34bb..537c34bb 100644
--- a/vmime/net/socket.hpp
+++ b/src/vmime/net/socket.hpp
diff --git a/vmime/net/store.hpp b/src/vmime/net/store.hpp
index 37dcadbc..37dcadbc 100644
--- a/vmime/net/store.hpp
+++ b/src/vmime/net/store.hpp
diff --git a/vmime/net/timeoutHandler.hpp b/src/vmime/net/timeoutHandler.hpp
index 24129701..24129701 100644
--- a/vmime/net/timeoutHandler.hpp
+++ b/src/vmime/net/timeoutHandler.hpp
diff --git a/src/net/tls/TLSProperties.cpp b/src/vmime/net/tls/TLSProperties.cpp
index 1986db79..1986db79 100644
--- a/src/net/tls/TLSProperties.cpp
+++ b/src/vmime/net/tls/TLSProperties.cpp
diff --git a/vmime/net/tls/TLSProperties.hpp b/src/vmime/net/tls/TLSProperties.hpp
index 0dbc8f05..0dbc8f05 100644
--- a/vmime/net/tls/TLSProperties.hpp
+++ b/src/vmime/net/tls/TLSProperties.hpp
diff --git a/src/net/tls/TLSSecuredConnectionInfos.cpp b/src/vmime/net/tls/TLSSecuredConnectionInfos.cpp
index 4856e9af..4856e9af 100644
--- a/src/net/tls/TLSSecuredConnectionInfos.cpp
+++ b/src/vmime/net/tls/TLSSecuredConnectionInfos.cpp
diff --git a/vmime/net/tls/TLSSecuredConnectionInfos.hpp b/src/vmime/net/tls/TLSSecuredConnectionInfos.hpp
index e552d6f9..e552d6f9 100644
--- a/vmime/net/tls/TLSSecuredConnectionInfos.hpp
+++ b/src/vmime/net/tls/TLSSecuredConnectionInfos.hpp
diff --git a/src/net/tls/TLSSession.cpp b/src/vmime/net/tls/TLSSession.cpp
index a46f07ca..a46f07ca 100644
--- a/src/net/tls/TLSSession.cpp
+++ b/src/vmime/net/tls/TLSSession.cpp
diff --git a/vmime/net/tls/TLSSession.hpp b/src/vmime/net/tls/TLSSession.hpp
index 9e061f89..9e061f89 100644
--- a/vmime/net/tls/TLSSession.hpp
+++ b/src/vmime/net/tls/TLSSession.hpp
diff --git a/src/net/tls/TLSSocket.cpp b/src/vmime/net/tls/TLSSocket.cpp
index 0419a571..0419a571 100644
--- a/src/net/tls/TLSSocket.cpp
+++ b/src/vmime/net/tls/TLSSocket.cpp
diff --git a/vmime/net/tls/TLSSocket.hpp b/src/vmime/net/tls/TLSSocket.hpp
index e2668ad4..e2668ad4 100644
--- a/vmime/net/tls/TLSSocket.hpp
+++ b/src/vmime/net/tls/TLSSocket.hpp
diff --git a/src/net/tls/gnutls/TLSProperties_GnuTLS.cpp b/src/vmime/net/tls/gnutls/TLSProperties_GnuTLS.cpp
index 36ab7d7a..36ab7d7a 100644
--- a/src/net/tls/gnutls/TLSProperties_GnuTLS.cpp
+++ b/src/vmime/net/tls/gnutls/TLSProperties_GnuTLS.cpp
diff --git a/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp b/src/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp
index 2038778a..2038778a 100644
--- a/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp
+++ b/src/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp
diff --git a/src/net/tls/gnutls/TLSSession_GnuTLS.cpp b/src/vmime/net/tls/gnutls/TLSSession_GnuTLS.cpp
index 1c520ed1..1c520ed1 100644
--- a/src/net/tls/gnutls/TLSSession_GnuTLS.cpp
+++ b/src/vmime/net/tls/gnutls/TLSSession_GnuTLS.cpp
diff --git a/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp b/src/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp
index 7f762b58..7f762b58 100644
--- a/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp
+++ b/src/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp
diff --git a/src/net/tls/gnutls/TLSSocket_GnuTLS.cpp b/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp
index 5a90565b..5a90565b 100644
--- a/src/net/tls/gnutls/TLSSocket_GnuTLS.cpp
+++ b/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp
diff --git a/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp b/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp
index 885fac13..885fac13 100644
--- a/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp
+++ b/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp
diff --git a/src/net/tls/openssl/OpenSSLInitializer.cpp b/src/vmime/net/tls/openssl/OpenSSLInitializer.cpp
index 1bbb9ee5..1bbb9ee5 100644
--- a/src/net/tls/openssl/OpenSSLInitializer.cpp
+++ b/src/vmime/net/tls/openssl/OpenSSLInitializer.cpp
diff --git a/vmime/net/tls/openssl/OpenSSLInitializer.hpp b/src/vmime/net/tls/openssl/OpenSSLInitializer.hpp
index d7595aa8..d7595aa8 100644
--- a/vmime/net/tls/openssl/OpenSSLInitializer.hpp
+++ b/src/vmime/net/tls/openssl/OpenSSLInitializer.hpp
diff --git a/src/net/tls/openssl/TLSProperties_OpenSSL.cpp b/src/vmime/net/tls/openssl/TLSProperties_OpenSSL.cpp
index 932477df..932477df 100644
--- a/src/net/tls/openssl/TLSProperties_OpenSSL.cpp
+++ b/src/vmime/net/tls/openssl/TLSProperties_OpenSSL.cpp
diff --git a/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp b/src/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp
index 5d2f075a..5d2f075a 100644
--- a/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp
+++ b/src/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp
diff --git a/src/net/tls/openssl/TLSSession_OpenSSL.cpp b/src/vmime/net/tls/openssl/TLSSession_OpenSSL.cpp
index cf600a63..cf600a63 100644
--- a/src/net/tls/openssl/TLSSession_OpenSSL.cpp
+++ b/src/vmime/net/tls/openssl/TLSSession_OpenSSL.cpp
diff --git a/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp b/src/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp
index 5a2b60a8..5a2b60a8 100644
--- a/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp
+++ b/src/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp
diff --git a/src/net/tls/openssl/TLSSocket_OpenSSL.cpp b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp
index ef6647d6..ef6647d6 100644
--- a/src/net/tls/openssl/TLSSocket_OpenSSL.cpp
+++ b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp
diff --git a/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp
index 410fffcf..410fffcf 100644
--- a/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp
+++ b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp
diff --git a/src/net/transport.cpp b/src/vmime/net/transport.cpp
index dd7281d0..dd7281d0 100644
--- a/src/net/transport.cpp
+++ b/src/vmime/net/transport.cpp
diff --git a/vmime/net/transport.hpp b/src/vmime/net/transport.hpp
index 6c405cbb..6c405cbb 100644
--- a/vmime/net/transport.hpp
+++ b/src/vmime/net/transport.hpp