416 files changed, 2 insertions, 2 deletions

diff --git a/src/address.cpp b/src/vmime/address.cpp
index c6fa74f1..c6fa74f1 100644
--- a/src/address.cpp
+++ b/src/vmime/address.cpp
diff --git a/vmime/address.hpp b/src/vmime/address.hpp
index 5eb510f9..5eb510f9 100644
--- a/vmime/address.hpp
+++ b/src/vmime/address.hpp
diff --git a/src/addressList.cpp b/src/vmime/addressList.cpp
index 5c7d34ac..5c7d34ac 100644
--- a/src/addressList.cpp
+++ b/src/vmime/addressList.cpp
diff --git a/vmime/addressList.hpp b/src/vmime/addressList.hpp
index 0df657d3..0df657d3 100644
--- a/vmime/addressList.hpp
+++ b/src/vmime/addressList.hpp
diff --git a/vmime/attachment.hpp b/src/vmime/attachment.hpp
index 9730bc6c..9730bc6c 100644
--- a/vmime/attachment.hpp
+++ b/src/vmime/attachment.hpp
diff --git a/src/attachmentHelper.cpp b/src/vmime/attachmentHelper.cpp
index 152daeed..152daeed 100644
--- a/src/attachmentHelper.cpp
+++ b/src/vmime/attachmentHelper.cpp
diff --git a/vmime/attachmentHelper.hpp b/src/vmime/attachmentHelper.hpp
index e03a4f7d..e03a4f7d 100644
--- a/vmime/attachmentHelper.hpp
+++ b/src/vmime/attachmentHelper.hpp
diff --git a/src/base.cpp b/src/vmime/base.cpp
index 9f9a87be..9f9a87be 100644
--- a/src/base.cpp
+++ b/src/vmime/base.cpp
diff --git a/vmime/base.hpp b/src/vmime/base.hpp
index f6515794..f6515794 100644
--- a/vmime/base.hpp
+++ b/src/vmime/base.hpp
diff --git a/src/body.cpp b/src/vmime/body.cpp
index 8f5401cf..8f5401cf 100644
--- a/src/body.cpp
+++ b/src/vmime/body.cpp
diff --git a/vmime/body.hpp b/src/vmime/body.hpp
index e47f97e9..e47f97e9 100644
--- a/vmime/body.hpp
+++ b/src/vmime/body.hpp
diff --git a/src/bodyPart.cpp b/src/vmime/bodyPart.cpp
index 12896f84..12896f84 100644
--- a/src/bodyPart.cpp
+++ b/src/vmime/bodyPart.cpp
diff --git a/vmime/bodyPart.hpp b/src/vmime/bodyPart.hpp
index 214cb208..214cb208 100644
--- a/vmime/bodyPart.hpp
+++ b/src/vmime/bodyPart.hpp
diff --git a/src/bodyPartAttachment.cpp b/src/vmime/bodyPartAttachment.cpp
index 0684a896..0684a896 100644
--- a/src/bodyPartAttachment.cpp
+++ b/src/vmime/bodyPartAttachment.cpp
diff --git a/vmime/bodyPartAttachment.hpp b/src/vmime/bodyPartAttachment.hpp
index e1a4a89a..e1a4a89a 100644
--- a/vmime/bodyPartAttachment.hpp
+++ b/src/vmime/bodyPartAttachment.hpp
diff --git a/src/charset.cpp b/src/vmime/charset.cpp
index 22bff301..22bff301 100644
--- a/src/charset.cpp
+++ b/src/vmime/charset.cpp
diff --git a/vmime/charset.hpp b/src/vmime/charset.hpp
index 5bd50fdf..5bd50fdf 100644
--- a/vmime/charset.hpp
+++ b/src/vmime/charset.hpp
diff --git a/src/charsetConverter.cpp b/src/vmime/charsetConverter.cpp
index 87886823..87886823 100644
--- a/src/charsetConverter.cpp
+++ b/src/vmime/charsetConverter.cpp
diff --git a/vmime/charsetConverter.hpp b/src/vmime/charsetConverter.hpp
index 07f38d8f..07f38d8f 100644
--- a/vmime/charsetConverter.hpp
+++ b/src/vmime/charsetConverter.hpp
diff --git a/src/charsetConverterOptions.cpp b/src/vmime/charsetConverterOptions.cpp
index caeacd01..caeacd01 100644
--- a/src/charsetConverterOptions.cpp
+++ b/src/vmime/charsetConverterOptions.cpp
diff --git a/vmime/charsetConverterOptions.hpp b/src/vmime/charsetConverterOptions.hpp
index 07e7a138..07e7a138 100644
--- a/vmime/charsetConverterOptions.hpp
+++ b/src/vmime/charsetConverterOptions.hpp
diff --git a/src/charsetConverter_iconv.cpp b/src/vmime/charsetConverter_iconv.cpp
index 75d7b170..75d7b170 100644
--- a/src/charsetConverter_iconv.cpp
+++ b/src/vmime/charsetConverter_iconv.cpp
diff --git a/vmime/charsetConverter_iconv.hpp b/src/vmime/charsetConverter_iconv.hpp
index 4167dc4e..4167dc4e 100644
--- a/vmime/charsetConverter_iconv.hpp
+++ b/src/vmime/charsetConverter_iconv.hpp
diff --git a/src/charsetConverter_icu.cpp b/src/vmime/charsetConverter_icu.cpp
index 3374d448..3374d448 100644
--- a/src/charsetConverter_icu.cpp
+++ b/src/vmime/charsetConverter_icu.cpp
diff --git a/vmime/charsetConverter_icu.hpp b/src/vmime/charsetConverter_icu.hpp
index 5d054413..5d054413 100644
--- a/vmime/charsetConverter_icu.hpp
+++ b/src/vmime/charsetConverter_icu.hpp
diff --git a/src/charsetConverter_idna.cpp b/src/vmime/charsetConverter_idna.cpp
index aea6eca7..aea6eca7 100644
--- a/src/charsetConverter_idna.cpp
+++ b/src/vmime/charsetConverter_idna.cpp
diff --git a/vmime/charsetConverter_idna.hpp b/src/vmime/charsetConverter_idna.hpp
index 874d6bf1..874d6bf1 100644
--- a/vmime/charsetConverter_idna.hpp
+++ b/src/vmime/charsetConverter_idna.hpp
diff --git a/src/component.cpp b/src/vmime/component.cpp
index 46ff4036..46ff4036 100644
--- a/src/component.cpp
+++ b/src/vmime/component.cpp
diff --git a/vmime/component.hpp b/src/vmime/component.hpp
index 87d465e8..87d465e8 100644
--- a/vmime/component.hpp
+++ b/src/vmime/component.hpp
diff --git a/src/constants.cpp b/src/vmime/constants.cpp
index 3b0a54c0..3b0a54c0 100644
--- a/src/constants.cpp
+++ b/src/vmime/constants.cpp
diff --git a/vmime/constants.hpp b/src/vmime/constants.hpp
index 8e6e3f83..8e6e3f83 100644
--- a/vmime/constants.hpp
+++ b/src/vmime/constants.hpp
diff --git a/src/contentDisposition.cpp b/src/vmime/contentDisposition.cpp
index 3cf92e27..3cf92e27 100644
--- a/src/contentDisposition.cpp
+++ b/src/vmime/contentDisposition.cpp
diff --git a/vmime/contentDisposition.hpp b/src/vmime/contentDisposition.hpp
index c934b81d..c934b81d 100644
--- a/vmime/contentDisposition.hpp
+++ b/src/vmime/contentDisposition.hpp
diff --git a/src/contentDispositionField.cpp b/src/vmime/contentDispositionField.cpp
index 5a9c1212..5a9c1212 100644
--- a/src/contentDispositionField.cpp
+++ b/src/vmime/contentDispositionField.cpp
diff --git a/vmime/contentDispositionField.hpp b/src/vmime/contentDispositionField.hpp
index aac4c5de..aac4c5de 100644
--- a/vmime/contentDispositionField.hpp
+++ b/src/vmime/contentDispositionField.hpp
diff --git a/src/contentHandler.cpp b/src/vmime/contentHandler.cpp
index 3afe4324..3afe4324 100644
--- a/src/contentHandler.cpp
+++ b/src/vmime/contentHandler.cpp
diff --git a/vmime/contentHandler.hpp b/src/vmime/contentHandler.hpp
index f62af166..f62af166 100644
--- a/vmime/contentHandler.hpp
+++ b/src/vmime/contentHandler.hpp
diff --git a/src/contentTypeField.cpp b/src/vmime/contentTypeField.cpp
index 9f38294a..9f38294a 100644
--- a/src/contentTypeField.cpp
+++ b/src/vmime/contentTypeField.cpp
diff --git a/vmime/contentTypeField.hpp b/src/vmime/contentTypeField.hpp
index 8604c4a3..8604c4a3 100644
--- a/vmime/contentTypeField.hpp
+++ b/src/vmime/contentTypeField.hpp
diff --git a/src/context.cpp b/src/vmime/context.cpp
index 07fe4875..07fe4875 100644
--- a/src/context.cpp
+++ b/src/vmime/context.cpp
diff --git a/vmime/context.hpp b/src/vmime/context.hpp
index 767ec05a..767ec05a 100644
--- a/vmime/context.hpp
+++ b/src/vmime/context.hpp
diff --git a/src/dateTime.cpp b/src/vmime/dateTime.cpp
index eca8e785..eca8e785 100644
--- a/src/dateTime.cpp
+++ b/src/vmime/dateTime.cpp
diff --git a/vmime/dateTime.hpp b/src/vmime/dateTime.hpp
index 7af63040..7af63040 100644
--- a/vmime/dateTime.hpp
+++ b/src/vmime/dateTime.hpp
diff --git a/src/defaultAttachment.cpp b/src/vmime/defaultAttachment.cpp
index 8f8ad453..8f8ad453 100644
--- a/src/defaultAttachment.cpp
+++ b/src/vmime/defaultAttachment.cpp
diff --git a/vmime/defaultAttachment.hpp b/src/vmime/defaultAttachment.hpp
index 6eb0c5b6..6eb0c5b6 100644
--- a/vmime/defaultAttachment.hpp
+++ b/src/vmime/defaultAttachment.hpp
diff --git a/src/disposition.cpp b/src/vmime/disposition.cpp
index 352d3251..352d3251 100644
--- a/src/disposition.cpp
+++ b/src/vmime/disposition.cpp
diff --git a/vmime/disposition.hpp b/src/vmime/disposition.hpp
index 7322c21d..7322c21d 100644
--- a/vmime/disposition.hpp
+++ b/src/vmime/disposition.hpp
diff --git a/src/emailAddress.cpp b/src/vmime/emailAddress.cpp
index e185b17b..e185b17b 100644
--- a/src/emailAddress.cpp
+++ b/src/vmime/emailAddress.cpp
diff --git a/vmime/emailAddress.hpp b/src/vmime/emailAddress.hpp
index 30ee24ab..30ee24ab 100644
--- a/vmime/emailAddress.hpp
+++ b/src/vmime/emailAddress.hpp
diff --git a/src/emptyContentHandler.cpp b/src/vmime/emptyContentHandler.cpp
index e0f191f3..e0f191f3 100644
--- a/src/emptyContentHandler.cpp
+++ b/src/vmime/emptyContentHandler.cpp
diff --git a/vmime/emptyContentHandler.hpp b/src/vmime/emptyContentHandler.hpp
index 369a4206..369a4206 100644
--- a/vmime/emptyContentHandler.hpp
+++ b/src/vmime/emptyContentHandler.hpp
diff --git a/src/encoding.cpp b/src/vmime/encoding.cpp
index 26922395..26922395 100644
--- a/src/encoding.cpp
+++ b/src/vmime/encoding.cpp
diff --git a/vmime/encoding.hpp b/src/vmime/encoding.hpp
index 3148f899..3148f899 100644
--- a/vmime/encoding.hpp
+++ b/src/vmime/encoding.hpp
diff --git a/src/exception.cpp b/src/vmime/exception.cpp
index 042ac4f4..042ac4f4 100644
--- a/src/exception.cpp
+++ b/src/vmime/exception.cpp
diff --git a/vmime/exception.hpp b/src/vmime/exception.hpp
index e2afcc62..e2afcc62 100644
--- a/vmime/exception.hpp
+++ b/src/vmime/exception.hpp
diff --git a/vmime/export.hpp b/src/vmime/export.hpp
index 90f0cc3a..90f0cc3a 100644
--- a/vmime/export.hpp
+++ b/src/vmime/export.hpp
diff --git a/src/fileAttachment.cpp b/src/vmime/fileAttachment.cpp
index 25a97fcc..25a97fcc 100644
--- a/src/fileAttachment.cpp
+++ b/src/vmime/fileAttachment.cpp
diff --git a/vmime/fileAttachment.hpp b/src/vmime/fileAttachment.hpp
index 1e7a808a..1e7a808a 100644
--- a/vmime/fileAttachment.hpp
+++ b/src/vmime/fileAttachment.hpp
diff --git a/src/fileContentHandler.cpp b/src/vmime/fileContentHandler.cpp
index 53ec9f69..53ec9f69 100644
--- a/src/fileContentHandler.cpp
+++ b/src/vmime/fileContentHandler.cpp
diff --git a/vmime/fileContentHandler.hpp b/src/vmime/fileContentHandler.hpp
index 68b4d396..68b4d396 100644
--- a/vmime/fileContentHandler.hpp
+++ b/src/vmime/fileContentHandler.hpp
diff --git a/src/generatedMessageAttachment.cpp b/src/vmime/generatedMessageAttachment.cpp
index 0473d247..0473d247 100644
--- a/src/generatedMessageAttachment.cpp
+++ b/src/vmime/generatedMessageAttachment.cpp
diff --git a/vmime/generatedMessageAttachment.hpp b/src/vmime/generatedMessageAttachment.hpp
index 7137b22b..7137b22b 100644
--- a/vmime/generatedMessageAttachment.hpp
+++ b/src/vmime/generatedMessageAttachment.hpp
diff --git a/src/generationContext.cpp b/src/vmime/generationContext.cpp
index e9662883..e9662883 100644
--- a/src/generationContext.cpp
+++ b/src/vmime/generationContext.cpp
diff --git a/vmime/generationContext.hpp b/src/vmime/generationContext.hpp
index 949f06ac..949f06ac 100644
--- a/vmime/generationContext.hpp
+++ b/src/vmime/generationContext.hpp
diff --git a/src/header.cpp b/src/vmime/header.cpp
index 34b5fa6e..34b5fa6e 100644
--- a/src/header.cpp
+++ b/src/vmime/header.cpp
diff --git a/vmime/header.hpp b/src/vmime/header.hpp
index d2d20727..d2d20727 100644
--- a/vmime/header.hpp
+++ b/src/vmime/header.hpp
diff --git a/src/headerField.cpp b/src/vmime/headerField.cpp
index f4c6187e..f4c6187e 100644
--- a/src/headerField.cpp
+++ b/src/vmime/headerField.cpp
diff --git a/vmime/headerField.hpp b/src/vmime/headerField.hpp
index 555805db..555805db 100644
--- a/vmime/headerField.hpp
+++ b/src/vmime/headerField.hpp
diff --git a/src/headerFieldFactory.cpp b/src/vmime/headerFieldFactory.cpp
index 5c60543e..5c60543e 100644
--- a/src/headerFieldFactory.cpp
+++ b/src/vmime/headerFieldFactory.cpp
diff --git a/vmime/headerFieldFactory.hpp b/src/vmime/headerFieldFactory.hpp
index 960f27b7..960f27b7 100644
--- a/vmime/headerFieldFactory.hpp
+++ b/src/vmime/headerFieldFactory.hpp
diff --git a/src/headerFieldValue.cpp b/src/vmime/headerFieldValue.cpp
index a93e0061..a93e0061 100644
--- a/src/headerFieldValue.cpp
+++ b/src/vmime/headerFieldValue.cpp
diff --git a/vmime/headerFieldValue.hpp b/src/vmime/headerFieldValue.hpp
index a3681953..a3681953 100644
--- a/vmime/headerFieldValue.hpp
+++ b/src/vmime/headerFieldValue.hpp
diff --git a/src/htmlTextPart.cpp b/src/vmime/htmlTextPart.cpp
index 44459336..44459336 100644
--- a/src/htmlTextPart.cpp
+++ b/src/vmime/htmlTextPart.cpp
diff --git a/vmime/htmlTextPart.hpp b/src/vmime/htmlTextPart.hpp
index 4c1a8632..4c1a8632 100644
--- a/vmime/htmlTextPart.hpp
+++ b/src/vmime/htmlTextPart.hpp
diff --git a/src/mailbox.cpp b/src/vmime/mailbox.cpp
index 7c6d5e3b..7c6d5e3b 100644
--- a/src/mailbox.cpp
+++ b/src/vmime/mailbox.cpp
diff --git a/vmime/mailbox.hpp b/src/vmime/mailbox.hpp
index 88abc0f5..88abc0f5 100644
--- a/vmime/mailbox.hpp
+++ b/src/vmime/mailbox.hpp
diff --git a/src/mailboxField.cpp b/src/vmime/mailboxField.cpp
index 29fe9d33..29fe9d33 100644
--- a/src/mailboxField.cpp
+++ b/src/vmime/mailboxField.cpp
diff --git a/vmime/mailboxField.hpp b/src/vmime/mailboxField.hpp
index ca6863c0..ca6863c0 100644
--- a/vmime/mailboxField.hpp
+++ b/src/vmime/mailboxField.hpp
diff --git a/src/mailboxGroup.cpp b/src/vmime/mailboxGroup.cpp
index 5e8d6b1b..5e8d6b1b 100644
--- a/src/mailboxGroup.cpp
+++ b/src/vmime/mailboxGroup.cpp
diff --git a/vmime/mailboxGroup.hpp b/src/vmime/mailboxGroup.hpp
index b264cf60..b264cf60 100644
--- a/vmime/mailboxGroup.hpp
+++ b/src/vmime/mailboxGroup.hpp
diff --git a/src/mailboxList.cpp b/src/vmime/mailboxList.cpp
index b356a1e7..b356a1e7 100644
--- a/src/mailboxList.cpp
+++ b/src/vmime/mailboxList.cpp
diff --git a/vmime/mailboxList.hpp b/src/vmime/mailboxList.hpp
index 125c238e..125c238e 100644
--- a/vmime/mailboxList.hpp
+++ b/src/vmime/mailboxList.hpp
diff --git a/src/mdn/MDNHelper.cpp b/src/vmime/mdn/MDNHelper.cpp
index 1205aef2..1205aef2 100644
--- a/src/mdn/MDNHelper.cpp
+++ b/src/vmime/mdn/MDNHelper.cpp
diff --git a/vmime/mdn/MDNHelper.hpp b/src/vmime/mdn/MDNHelper.hpp
index 2584978f..2584978f 100644
--- a/vmime/mdn/MDNHelper.hpp
+++ b/src/vmime/mdn/MDNHelper.hpp
diff --git a/src/mdn/MDNInfos.cpp b/src/vmime/mdn/MDNInfos.cpp
index a70161b7..a70161b7 100644
--- a/src/mdn/MDNInfos.cpp
+++ b/src/vmime/mdn/MDNInfos.cpp
diff --git a/vmime/mdn/MDNInfos.hpp b/src/vmime/mdn/MDNInfos.hpp
index 030aa23e..030aa23e 100644
--- a/vmime/mdn/MDNInfos.hpp
+++ b/src/vmime/mdn/MDNInfos.hpp
diff --git a/src/mdn/receivedMDNInfos.cpp b/src/vmime/mdn/receivedMDNInfos.cpp
index 53b2281e..53b2281e 100644
--- a/src/mdn/receivedMDNInfos.cpp
+++ b/src/vmime/mdn/receivedMDNInfos.cpp
diff --git a/vmime/mdn/receivedMDNInfos.hpp b/src/vmime/mdn/receivedMDNInfos.hpp
index c6953a24..c6953a24 100644
--- a/vmime/mdn/receivedMDNInfos.hpp
+++ b/src/vmime/mdn/receivedMDNInfos.hpp
diff --git a/src/mdn/sendableMDNInfos.cpp b/src/vmime/mdn/sendableMDNInfos.cpp
index c145c3b6..c145c3b6 100644
--- a/src/mdn/sendableMDNInfos.cpp
+++ b/src/vmime/mdn/sendableMDNInfos.cpp
diff --git a/vmime/mdn/sendableMDNInfos.hpp b/src/vmime/mdn/sendableMDNInfos.hpp
index e4f6d20d..e4f6d20d 100644
--- a/vmime/mdn/sendableMDNInfos.hpp
+++ b/src/vmime/mdn/sendableMDNInfos.hpp
diff --git a/src/mediaType.cpp b/src/vmime/mediaType.cpp
index 60486da7..60486da7 100644
--- a/src/mediaType.cpp
+++ b/src/vmime/mediaType.cpp
diff --git a/vmime/mediaType.hpp b/src/vmime/mediaType.hpp
index a7d6f4e4..a7d6f4e4 100644
--- a/vmime/mediaType.hpp
+++ b/src/vmime/mediaType.hpp
diff --git a/src/message.cpp b/src/vmime/message.cpp
index 76735496..76735496 100644
--- a/src/message.cpp
+++ b/src/vmime/message.cpp
diff --git a/vmime/message.hpp b/src/vmime/message.hpp
index 62ff77e1..62ff77e1 100644
--- a/vmime/message.hpp
+++ b/src/vmime/message.hpp
diff --git a/vmime/messageAttachment.hpp b/src/vmime/messageAttachment.hpp
index 641fd3e1..641fd3e1 100644
--- a/vmime/messageAttachment.hpp
+++ b/src/vmime/messageAttachment.hpp
diff --git a/src/messageBuilder.cpp b/src/vmime/messageBuilder.cpp
index 64880483..64880483 100644
--- a/src/messageBuilder.cpp
+++ b/src/vmime/messageBuilder.cpp
diff --git a/vmime/messageBuilder.hpp b/src/vmime/messageBuilder.hpp
index af86e826..af86e826 100644
--- a/vmime/messageBuilder.hpp
+++ b/src/vmime/messageBuilder.hpp
diff --git a/src/messageId.cpp b/src/vmime/messageId.cpp
index edc4d1fb..edc4d1fb 100644
--- a/src/messageId.cpp
+++ b/src/vmime/messageId.cpp
diff --git a/vmime/messageId.hpp b/src/vmime/messageId.hpp
index 83527468..83527468 100644
--- a/vmime/messageId.hpp
+++ b/src/vmime/messageId.hpp
diff --git a/src/messageIdSequence.cpp b/src/vmime/messageIdSequence.cpp
index 23b12773..23b12773 100644
--- a/src/messageIdSequence.cpp
+++ b/src/vmime/messageIdSequence.cpp
diff --git a/vmime/messageIdSequence.hpp b/src/vmime/messageIdSequence.hpp
index 07f0c422..07f0c422 100644
--- a/vmime/messageIdSequence.hpp
+++ b/src/vmime/messageIdSequence.hpp
diff --git a/src/messageParser.cpp b/src/vmime/messageParser.cpp
index 5fe219f3..5fe219f3 100644
--- a/src/messageParser.cpp
+++ b/src/vmime/messageParser.cpp
diff --git a/vmime/messageParser.hpp b/src/vmime/messageParser.hpp
index c3a48f11..c3a48f11 100644
--- a/vmime/messageParser.hpp
+++ b/src/vmime/messageParser.hpp
diff --git a/src/misc/importanceHelper.cpp b/src/vmime/misc/importanceHelper.cpp
index b13f7466..b13f7466 100644
--- a/src/misc/importanceHelper.cpp
+++ b/src/vmime/misc/importanceHelper.cpp
diff --git a/vmime/misc/importanceHelper.hpp b/src/vmime/misc/importanceHelper.hpp
index ae8297fc..ae8297fc 100644
--- a/vmime/misc/importanceHelper.hpp
+++ b/src/vmime/misc/importanceHelper.hpp
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
diff --git a/src/object.cpp b/src/vmime/object.cpp
index d07c3c19..d07c3c19 100644
--- a/src/object.cpp
+++ b/src/vmime/object.cpp
diff --git a/vmime/object.hpp b/src/vmime/object.hpp
index 0b12df3c..0b12df3c 100644
--- a/vmime/object.hpp
+++ b/src/vmime/object.hpp
diff --git a/src/parameter.cpp b/src/vmime/parameter.cpp
index b8d5b36e..b8d5b36e 100644
--- a/src/parameter.cpp
+++ b/src/vmime/parameter.cpp
diff --git a/vmime/parameter.hpp b/src/vmime/parameter.hpp
index 682c391b..682c391b 100644
--- a/vmime/parameter.hpp
+++ b/src/vmime/parameter.hpp
diff --git a/src/parameterizedHeaderField.cpp b/src/vmime/parameterizedHeaderField.cpp
index e2925d25..e2925d25 100644
--- a/src/parameterizedHeaderField.cpp
+++ b/src/vmime/parameterizedHeaderField.cpp
diff --git a/vmime/parameterizedHeaderField.hpp b/src/vmime/parameterizedHeaderField.hpp
index 509506a9..509506a9 100644
--- a/vmime/parameterizedHeaderField.hpp
+++ b/src/vmime/parameterizedHeaderField.hpp
diff --git a/src/parsedMessageAttachment.cpp b/src/vmime/parsedMessageAttachment.cpp
index 242bfde0..242bfde0 100644
--- a/src/parsedMessageAttachment.cpp
+++ b/src/vmime/parsedMessageAttachment.cpp
diff --git a/vmime/parsedMessageAttachment.hpp b/src/vmime/parsedMessageAttachment.hpp
index 6c96f80a..6c96f80a 100644
--- a/vmime/parsedMessageAttachment.hpp
+++ b/src/vmime/parsedMessageAttachment.hpp
diff --git a/vmime/parserHelpers.hpp b/src/vmime/parserHelpers.hpp
index ce3f422a..ce3f422a 100644
--- a/vmime/parserHelpers.hpp
+++ b/src/vmime/parserHelpers.hpp
diff --git a/src/parsingContext.cpp b/src/vmime/parsingContext.cpp
index 527f4705..527f4705 100644
--- a/src/parsingContext.cpp
+++ b/src/vmime/parsingContext.cpp
diff --git a/vmime/parsingContext.hpp b/src/vmime/parsingContext.hpp
index 27d14a60..27d14a60 100644
--- a/vmime/parsingContext.hpp
+++ b/src/vmime/parsingContext.hpp
diff --git a/src/path.cpp b/src/vmime/path.cpp
index 3f1bc6af..3f1bc6af 100644
--- a/src/path.cpp
+++ b/src/vmime/path.cpp
diff --git a/vmime/path.hpp b/src/vmime/path.hpp
index 2ffa3c22..2ffa3c22 100644
--- a/vmime/path.hpp
+++ b/src/vmime/path.hpp
diff --git a/src/plainTextPart.cpp b/src/vmime/plainTextPart.cpp
index 7a1542d7..7a1542d7 100644
--- a/src/plainTextPart.cpp
+++ b/src/vmime/plainTextPart.cpp
diff --git a/vmime/plainTextPart.hpp b/src/vmime/plainTextPart.hpp
index 72a8a71c..72a8a71c 100644
--- a/vmime/plainTextPart.hpp
+++ b/src/vmime/plainTextPart.hpp
diff --git a/src/platform.cpp b/src/vmime/platform.cpp
index 631d5bcf..631d5bcf 100644
--- a/src/platform.cpp
+++ b/src/vmime/platform.cpp
diff --git a/vmime/platform.hpp b/src/vmime/platform.hpp
index c72f160e..c72f160e 100644
--- a/vmime/platform.hpp
+++ b/src/vmime/platform.hpp
diff --git a/src/platforms/posix/posixChildProcess.cpp b/src/vmime/platforms/posix/posixChildProcess.cpp
index 54d4cd75..54d4cd75 100644
--- a/src/platforms/posix/posixChildProcess.cpp
+++ b/src/vmime/platforms/posix/posixChildProcess.cpp
diff --git a/vmime/platforms/posix/posixChildProcess.hpp b/src/vmime/platforms/posix/posixChildProcess.hpp
index 5b9fa021..5b9fa021 100644
--- a/vmime/platforms/posix/posixChildProcess.hpp
+++ b/src/vmime/platforms/posix/posixChildProcess.hpp
diff --git a/src/platforms/posix/posixCriticalSection.cpp b/src/vmime/platforms/posix/posixCriticalSection.cpp
index fb2c469c..fb2c469c 100644
--- a/src/platforms/posix/posixCriticalSection.cpp
+++ b/src/vmime/platforms/posix/posixCriticalSection.cpp
diff --git a/vmime/platforms/posix/posixCriticalSection.hpp b/src/vmime/platforms/posix/posixCriticalSection.hpp
index 150799cd..150799cd 100644
--- a/vmime/platforms/posix/posixCriticalSection.hpp
+++ b/src/vmime/platforms/posix/posixCriticalSection.hpp
diff --git a/src/platforms/posix/posixFile.cpp b/src/vmime/platforms/posix/posixFile.cpp
index 9387414d..9387414d 100644
--- a/src/platforms/posix/posixFile.cpp
+++ b/src/vmime/platforms/posix/posixFile.cpp
diff --git a/vmime/platforms/posix/posixFile.hpp b/src/vmime/platforms/posix/posixFile.hpp
index 20a56699..20a56699 100644
--- a/vmime/platforms/posix/posixFile.hpp
+++ b/src/vmime/platforms/posix/posixFile.hpp
diff --git a/src/platforms/posix/posixHandler.cpp b/src/vmime/platforms/posix/posixHandler.cpp
index 7ab0341a..7ab0341a 100644
--- a/src/platforms/posix/posixHandler.cpp
+++ b/src/vmime/platforms/posix/posixHandler.cpp
diff --git a/vmime/platforms/posix/posixHandler.hpp b/src/vmime/platforms/posix/posixHandler.hpp
index 0bba372b..0bba372b 100644
--- a/vmime/platforms/posix/posixHandler.hpp
+++ b/src/vmime/platforms/posix/posixHandler.hpp
diff --git a/src/platforms/posix/posixSocket.cpp b/src/vmime/platforms/posix/posixSocket.cpp
index ab434116..ab434116 100644
--- a/src/platforms/posix/posixSocket.cpp
+++ b/src/vmime/platforms/posix/posixSocket.cpp
diff --git a/vmime/platforms/posix/posixSocket.hpp b/src/vmime/platforms/posix/posixSocket.hpp
index 4ec3edec..4ec3edec 100644
--- a/vmime/platforms/posix/posixSocket.hpp
+++ b/src/vmime/platforms/posix/posixSocket.hpp
diff --git a/src/platforms/windows/windowsCriticalSection.cpp b/src/vmime/platforms/windows/windowsCriticalSection.cpp
index d6ef0c45..d6ef0c45 100644
--- a/src/platforms/windows/windowsCriticalSection.cpp
+++ b/src/vmime/platforms/windows/windowsCriticalSection.cpp
diff --git a/vmime/platforms/windows/windowsCriticalSection.hpp b/src/vmime/platforms/windows/windowsCriticalSection.hpp
index 7ed07835..7ed07835 100644
--- a/vmime/platforms/windows/windowsCriticalSection.hpp
+++ b/src/vmime/platforms/windows/windowsCriticalSection.hpp
diff --git a/src/platforms/windows/windowsFile.cpp b/src/vmime/platforms/windows/windowsFile.cpp
index 6aa0fea8..6aa0fea8 100644
--- a/src/platforms/windows/windowsFile.cpp
+++ b/src/vmime/platforms/windows/windowsFile.cpp
diff --git a/vmime/platforms/windows/windowsFile.hpp b/src/vmime/platforms/windows/windowsFile.hpp
index 3543ee8a..3543ee8a 100644
--- a/vmime/platforms/windows/windowsFile.hpp
+++ b/src/vmime/platforms/windows/windowsFile.hpp
diff --git a/src/platforms/windows/windowsHandler.cpp b/src/vmime/platforms/windows/windowsHandler.cpp
index 9c96b271..9c96b271 100644
--- a/src/platforms/windows/windowsHandler.cpp
+++ b/src/vmime/platforms/windows/windowsHandler.cpp
diff --git a/vmime/platforms/windows/windowsHandler.hpp b/src/vmime/platforms/windows/windowsHandler.hpp
index 4a3678eb..4a3678eb 100644
--- a/vmime/platforms/windows/windowsHandler.hpp
+++ b/src/vmime/platforms/windows/windowsHandler.hpp
diff --git a/src/platforms/windows/windowsSocket.cpp b/src/vmime/platforms/windows/windowsSocket.cpp
index 40e69363..40e69363 100644
--- a/src/platforms/windows/windowsSocket.cpp
+++ b/src/vmime/platforms/windows/windowsSocket.cpp
diff --git a/vmime/platforms/windows/windowsSocket.hpp b/src/vmime/platforms/windows/windowsSocket.hpp
index e3f43b7c..e3f43b7c 100644
--- a/vmime/platforms/windows/windowsSocket.hpp
+++ b/src/vmime/platforms/windows/windowsSocket.hpp
diff --git a/src/propertySet.cpp b/src/vmime/propertySet.cpp
index c22e79a6..c22e79a6 100644
--- a/src/propertySet.cpp
+++ b/src/vmime/propertySet.cpp
diff --git a/vmime/propertySet.hpp b/src/vmime/propertySet.hpp
index bf1c39bf..bf1c39bf 100644
--- a/vmime/propertySet.hpp
+++ b/src/vmime/propertySet.hpp
diff --git a/src/relay.cpp b/src/vmime/relay.cpp
index e5d30c9e..e5d30c9e 100644
--- a/src/relay.cpp
+++ b/src/vmime/relay.cpp
diff --git a/vmime/relay.hpp b/src/vmime/relay.hpp
index 35949ff1..35949ff1 100644
--- a/vmime/relay.hpp
+++ b/src/vmime/relay.hpp
diff --git a/vmime/security/authenticator.hpp b/src/vmime/security/authenticator.hpp
index bef07b4a..bef07b4a 100644
--- a/vmime/security/authenticator.hpp
+++ b/src/vmime/security/authenticator.hpp
diff --git a/src/security/cert/X509Certificate.cpp b/src/vmime/security/cert/X509Certificate.cpp
index 2eebabfd..2eebabfd 100644
--- a/src/security/cert/X509Certificate.cpp
+++ b/src/vmime/security/cert/X509Certificate.cpp
diff --git a/vmime/security/cert/X509Certificate.hpp b/src/vmime/security/cert/X509Certificate.hpp
index 215a86cf..215a86cf 100644
--- a/vmime/security/cert/X509Certificate.hpp
+++ b/src/vmime/security/cert/X509Certificate.hpp
diff --git a/vmime/security/cert/certificate.hpp b/src/vmime/security/cert/certificate.hpp
index aef1f1f9..aef1f1f9 100644
--- a/vmime/security/cert/certificate.hpp
+++ b/src/vmime/security/cert/certificate.hpp
diff --git a/src/security/cert/certificateChain.cpp b/src/vmime/security/cert/certificateChain.cpp
index 3cb4e360..3cb4e360 100644
--- a/src/security/cert/certificateChain.cpp
+++ b/src/vmime/security/cert/certificateChain.cpp
diff --git a/vmime/security/cert/certificateChain.hpp b/src/vmime/security/cert/certificateChain.hpp
index 0ce6bda3..0ce6bda3 100644
--- a/vmime/security/cert/certificateChain.hpp
+++ b/src/vmime/security/cert/certificateChain.hpp
diff --git a/vmime/security/cert/certificateVerifier.hpp b/src/vmime/security/cert/certificateVerifier.hpp
index c72c84cb..c72c84cb 100644
--- a/vmime/security/cert/certificateVerifier.hpp
+++ b/src/vmime/security/cert/certificateVerifier.hpp
diff --git a/src/security/cert/defaultCertificateVerifier.cpp b/src/vmime/security/cert/defaultCertificateVerifier.cpp
index 1a95b353..1a95b353 100644
--- a/src/security/cert/defaultCertificateVerifier.cpp
+++ b/src/vmime/security/cert/defaultCertificateVerifier.cpp
diff --git a/vmime/security/cert/defaultCertificateVerifier.hpp b/src/vmime/security/cert/defaultCertificateVerifier.hpp
index fddcc4f5..fddcc4f5 100644
--- a/vmime/security/cert/defaultCertificateVerifier.hpp
+++ b/src/vmime/security/cert/defaultCertificateVerifier.hpp
diff --git a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp b/src/vmime/security/cert/gnutls/X509Certificate_GnuTLS.cpp
index f96ddddb..f96ddddb 100644
--- a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
+++ b/src/vmime/security/cert/gnutls/X509Certificate_GnuTLS.cpp
diff --git a/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp b/src/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp
index 76ee6d4d..76ee6d4d 100644
--- a/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp
+++ b/src/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp
diff --git a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp b/src/vmime/security/cert/openssl/X509Certificate_OpenSSL.cpp
index 5f81b2bf..5f81b2bf 100644
--- a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
+++ b/src/vmime/security/cert/openssl/X509Certificate_OpenSSL.cpp
diff --git a/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp b/src/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp
index bddb4b6c..bddb4b6c 100644
--- a/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp
+++ b/src/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp
diff --git a/src/security/defaultAuthenticator.cpp b/src/vmime/security/defaultAuthenticator.cpp
index 790196d2..790196d2 100644
--- a/src/security/defaultAuthenticator.cpp
+++ b/src/vmime/security/defaultAuthenticator.cpp
diff --git a/vmime/security/defaultAuthenticator.hpp b/src/vmime/security/defaultAuthenticator.hpp
index eead3d14..eead3d14 100644
--- a/vmime/security/defaultAuthenticator.hpp
+++ b/src/vmime/security/defaultAuthenticator.hpp
diff --git a/src/security/digest/md5/md5MessageDigest.cpp b/src/vmime/security/digest/md5/md5MessageDigest.cpp
index a83f0623..a83f0623 100644
--- a/src/security/digest/md5/md5MessageDigest.cpp
+++ b/src/vmime/security/digest/md5/md5MessageDigest.cpp
diff --git a/vmime/security/digest/md5/md5MessageDigest.hpp b/src/vmime/security/digest/md5/md5MessageDigest.hpp
index ef94f5c8..ef94f5c8 100644
--- a/vmime/security/digest/md5/md5MessageDigest.hpp
+++ b/src/vmime/security/digest/md5/md5MessageDigest.hpp
diff --git a/src/security/digest/messageDigest.cpp b/src/vmime/security/digest/messageDigest.cpp
index 18fc8628..18fc8628 100644
--- a/src/security/digest/messageDigest.cpp
+++ b/src/vmime/security/digest/messageDigest.cpp
diff --git a/vmime/security/digest/messageDigest.hpp b/src/vmime/security/digest/messageDigest.hpp
index d17dfbc2..d17dfbc2 100644
--- a/vmime/security/digest/messageDigest.hpp
+++ b/src/vmime/security/digest/messageDigest.hpp
diff --git a/src/security/digest/messageDigestFactory.cpp b/src/vmime/security/digest/messageDigestFactory.cpp
index 2831c5a1..2831c5a1 100644
--- a/src/security/digest/messageDigestFactory.cpp
+++ b/src/vmime/security/digest/messageDigestFactory.cpp
diff --git a/vmime/security/digest/messageDigestFactory.hpp b/src/vmime/security/digest/messageDigestFactory.hpp
index 15fd8a28..15fd8a28 100644
--- a/vmime/security/digest/messageDigestFactory.hpp
+++ b/src/vmime/security/digest/messageDigestFactory.hpp
diff --git a/src/security/digest/sha1/sha1MessageDigest.cpp b/src/vmime/security/digest/sha1/sha1MessageDigest.cpp
index aa055af5..aa055af5 100644
--- a/src/security/digest/sha1/sha1MessageDigest.cpp
+++ b/src/vmime/security/digest/sha1/sha1MessageDigest.cpp
diff --git a/vmime/security/digest/sha1/sha1MessageDigest.hpp b/src/vmime/security/digest/sha1/sha1MessageDigest.hpp
index 1eb09c2f..1eb09c2f 100644
--- a/vmime/security/digest/sha1/sha1MessageDigest.hpp
+++ b/src/vmime/security/digest/sha1/sha1MessageDigest.hpp
diff --git a/vmime/security/sasl/SASLAuthenticator.hpp b/src/vmime/security/sasl/SASLAuthenticator.hpp
index 9f1881f5..9f1881f5 100644
--- a/vmime/security/sasl/SASLAuthenticator.hpp
+++ b/src/vmime/security/sasl/SASLAuthenticator.hpp
diff --git a/src/security/sasl/SASLContext.cpp b/src/vmime/security/sasl/SASLContext.cpp
index 3474cbeb..3474cbeb 100644
--- a/src/security/sasl/SASLContext.cpp
+++ b/src/vmime/security/sasl/SASLContext.cpp
diff --git a/vmime/security/sasl/SASLContext.hpp b/src/vmime/security/sasl/SASLContext.hpp
index 200f78db..200f78db 100644
--- a/vmime/security/sasl/SASLContext.hpp
+++ b/src/vmime/security/sasl/SASLContext.hpp
diff --git a/vmime/security/sasl/SASLMechanism.hpp b/src/vmime/security/sasl/SASLMechanism.hpp
index 5492e48c..5492e48c 100644
--- a/vmime/security/sasl/SASLMechanism.hpp
+++ b/src/vmime/security/sasl/SASLMechanism.hpp
diff --git a/src/security/sasl/SASLMechanismFactory.cpp b/src/vmime/security/sasl/SASLMechanismFactory.cpp
index 255a13f1..255a13f1 100644
--- a/src/security/sasl/SASLMechanismFactory.cpp
+++ b/src/vmime/security/sasl/SASLMechanismFactory.cpp
diff --git a/vmime/security/sasl/SASLMechanismFactory.hpp b/src/vmime/security/sasl/SASLMechanismFactory.hpp
index 3503f71b..3503f71b 100644
--- a/vmime/security/sasl/SASLMechanismFactory.hpp
+++ b/src/vmime/security/sasl/SASLMechanismFactory.hpp
diff --git a/src/security/sasl/SASLSession.cpp b/src/vmime/security/sasl/SASLSession.cpp
index 087ef27b..087ef27b 100644
--- a/src/security/sasl/SASLSession.cpp
+++ b/src/vmime/security/sasl/SASLSession.cpp
diff --git a/vmime/security/sasl/SASLSession.hpp b/src/vmime/security/sasl/SASLSession.hpp
index ccf181cb..ccf181cb 100644
--- a/vmime/security/sasl/SASLSession.hpp
+++ b/src/vmime/security/sasl/SASLSession.hpp
diff --git a/src/security/sasl/SASLSocket.cpp b/src/vmime/security/sasl/SASLSocket.cpp
index 12d634c2..12d634c2 100644
--- a/src/security/sasl/SASLSocket.cpp
+++ b/src/vmime/security/sasl/SASLSocket.cpp
diff --git a/vmime/security/sasl/SASLSocket.hpp b/src/vmime/security/sasl/SASLSocket.hpp
index e52911b4..e52911b4 100644
--- a/vmime/security/sasl/SASLSocket.hpp
+++ b/src/vmime/security/sasl/SASLSocket.hpp
diff --git a/src/security/sasl/builtinSASLMechanism.cpp b/src/vmime/security/sasl/builtinSASLMechanism.cpp
index e179e715..e179e715 100644
--- a/src/security/sasl/builtinSASLMechanism.cpp
+++ b/src/vmime/security/sasl/builtinSASLMechanism.cpp
diff --git a/vmime/security/sasl/builtinSASLMechanism.hpp b/src/vmime/security/sasl/builtinSASLMechanism.hpp
index 09b46f00..09b46f00 100644
--- a/vmime/security/sasl/builtinSASLMechanism.hpp
+++ b/src/vmime/security/sasl/builtinSASLMechanism.hpp
diff --git a/src/security/sasl/defaultSASLAuthenticator.cpp b/src/vmime/security/sasl/defaultSASLAuthenticator.cpp
index 7fe9b3eb..7fe9b3eb 100644
--- a/src/security/sasl/defaultSASLAuthenticator.cpp
+++ b/src/vmime/security/sasl/defaultSASLAuthenticator.cpp
diff --git a/vmime/security/sasl/defaultSASLAuthenticator.hpp b/src/vmime/security/sasl/defaultSASLAuthenticator.hpp
index 6ea9af80..6ea9af80 100644
--- a/vmime/security/sasl/defaultSASLAuthenticator.hpp
+++ b/src/vmime/security/sasl/defaultSASLAuthenticator.hpp
diff --git a/src/streamContentHandler.cpp b/src/vmime/streamContentHandler.cpp
index 8676cc34..8676cc34 100644
--- a/src/streamContentHandler.cpp
+++ b/src/vmime/streamContentHandler.cpp
diff --git a/vmime/streamContentHandler.hpp b/src/vmime/streamContentHandler.hpp
index 9b72c073..9b72c073 100644
--- a/vmime/streamContentHandler.hpp
+++ b/src/vmime/streamContentHandler.hpp
diff --git a/src/stringContentHandler.cpp b/src/vmime/stringContentHandler.cpp
index 9a66663c..9a66663c 100644
--- a/src/stringContentHandler.cpp
+++ b/src/vmime/stringContentHandler.cpp
diff --git a/vmime/stringContentHandler.hpp b/src/vmime/stringContentHandler.hpp
index e9d34405..e9d34405 100644
--- a/vmime/stringContentHandler.hpp
+++ b/src/vmime/stringContentHandler.hpp
diff --git a/src/text.cpp b/src/vmime/text.cpp
index 08fc9ba9..08fc9ba9 100644
--- a/src/text.cpp
+++ b/src/vmime/text.cpp
diff --git a/vmime/text.hpp b/src/vmime/text.hpp
index b7e25669..b7e25669 100644
--- a/vmime/text.hpp
+++ b/src/vmime/text.hpp
diff --git a/vmime/textPart.hpp b/src/vmime/textPart.hpp
index 6348f8d7..6348f8d7 100644
--- a/vmime/textPart.hpp
+++ b/src/vmime/textPart.hpp
diff --git a/src/textPartFactory.cpp b/src/vmime/textPartFactory.cpp
index 85fea6e4..85fea6e4 100644
--- a/src/textPartFactory.cpp
+++ b/src/vmime/textPartFactory.cpp
diff --git a/vmime/textPartFactory.hpp b/src/vmime/textPartFactory.hpp
index f5ce3774..f5ce3774 100644
--- a/vmime/textPartFactory.hpp
+++ b/src/vmime/textPartFactory.hpp
diff --git a/vmime/types.hpp b/src/vmime/types.hpp
index 12e5bf71..12e5bf71 100644
--- a/vmime/types.hpp
+++ b/src/vmime/types.hpp
diff --git a/vmime/utility/childProcess.hpp b/src/vmime/utility/childProcess.hpp
index ebefcf0a..ebefcf0a 100644
--- a/vmime/utility/childProcess.hpp
+++ b/src/vmime/utility/childProcess.hpp
diff --git a/src/utility/datetimeUtils.cpp b/src/vmime/utility/datetimeUtils.cpp
index 2b55177e..2b55177e 100644
--- a/src/utility/datetimeUtils.cpp
+++ b/src/vmime/utility/datetimeUtils.cpp
diff --git a/vmime/utility/datetimeUtils.hpp b/src/vmime/utility/datetimeUtils.hpp
index a7291bb8..a7291bb8 100644
--- a/vmime/utility/datetimeUtils.hpp
+++ b/src/vmime/utility/datetimeUtils.hpp
diff --git a/src/utility/encoder/b64Encoder.cpp b/src/vmime/utility/encoder/b64Encoder.cpp
index 274c23c0..274c23c0 100644
--- a/src/utility/encoder/b64Encoder.cpp
+++ b/src/vmime/utility/encoder/b64Encoder.cpp
diff --git a/vmime/utility/encoder/b64Encoder.hpp b/src/vmime/utility/encoder/b64Encoder.hpp
index 2d23d9e3..2d23d9e3 100644
--- a/vmime/utility/encoder/b64Encoder.hpp
+++ b/src/vmime/utility/encoder/b64Encoder.hpp
diff --git a/src/utility/encoder/binaryEncoder.cpp b/src/vmime/utility/encoder/binaryEncoder.cpp
index 7d7c40d1..7d7c40d1 100644
--- a/src/utility/encoder/binaryEncoder.cpp
+++ b/src/vmime/utility/encoder/binaryEncoder.cpp
diff --git a/vmime/utility/encoder/binaryEncoder.hpp b/src/vmime/utility/encoder/binaryEncoder.hpp
index 1c831939..1c831939 100644
--- a/vmime/utility/encoder/binaryEncoder.hpp
+++ b/src/vmime/utility/encoder/binaryEncoder.hpp
diff --git a/src/utility/encoder/eightBitEncoder.cpp b/src/vmime/utility/encoder/eightBitEncoder.cpp
index 4ab07f06..4ab07f06 100644
--- a/src/utility/encoder/eightBitEncoder.cpp
+++ b/src/vmime/utility/encoder/eightBitEncoder.cpp
diff --git a/vmime/utility/encoder/eightBitEncoder.hpp b/src/vmime/utility/encoder/eightBitEncoder.hpp
index ee50ca95..ee50ca95 100644
--- a/vmime/utility/encoder/eightBitEncoder.hpp
+++ b/src/vmime/utility/encoder/eightBitEncoder.hpp
diff --git a/src/utility/encoder/encoder.cpp b/src/vmime/utility/encoder/encoder.cpp
index b4b13249..b4b13249 100644
--- a/src/utility/encoder/encoder.cpp
+++ b/src/vmime/utility/encoder/encoder.cpp
diff --git a/vmime/utility/encoder/encoder.hpp b/src/vmime/utility/encoder/encoder.hpp
index 34cd10b7..34cd10b7 100644
--- a/vmime/utility/encoder/encoder.hpp
+++ b/src/vmime/utility/encoder/encoder.hpp
diff --git a/src/utility/encoder/encoderFactory.cpp b/src/vmime/utility/encoder/encoderFactory.cpp
index 098a810a..098a810a 100644
--- a/src/utility/encoder/encoderFactory.cpp
+++ b/src/vmime/utility/encoder/encoderFactory.cpp
diff --git a/vmime/utility/encoder/encoderFactory.hpp b/src/vmime/utility/encoder/encoderFactory.hpp
index 763cbd5c..763cbd5c 100644
--- a/vmime/utility/encoder/encoderFactory.hpp
+++ b/src/vmime/utility/encoder/encoderFactory.hpp
diff --git a/src/utility/encoder/noopEncoder.cpp b/src/vmime/utility/encoder/noopEncoder.cpp
index 3d991b5d..3d991b5d 100644
--- a/src/utility/encoder/noopEncoder.cpp
+++ b/src/vmime/utility/encoder/noopEncoder.cpp
diff --git a/vmime/utility/encoder/noopEncoder.hpp b/src/vmime/utility/encoder/noopEncoder.hpp
index 6314812b..6314812b 100644
--- a/vmime/utility/encoder/noopEncoder.hpp
+++ b/src/vmime/utility/encoder/noopEncoder.hpp
diff --git a/src/utility/encoder/qpEncoder.cpp b/src/vmime/utility/encoder/qpEncoder.cpp
index c77b5163..c77b5163 100644
--- a/src/utility/encoder/qpEncoder.cpp
+++ b/src/vmime/utility/encoder/qpEncoder.cpp
diff --git a/vmime/utility/encoder/qpEncoder.hpp b/src/vmime/utility/encoder/qpEncoder.hpp
index c666795b..c666795b 100644
--- a/vmime/utility/encoder/qpEncoder.hpp
+++ b/src/vmime/utility/encoder/qpEncoder.hpp
diff --git a/src/utility/encoder/sevenBitEncoder.cpp b/src/vmime/utility/encoder/sevenBitEncoder.cpp
index 7c76d73f..7c76d73f 100644
--- a/src/utility/encoder/sevenBitEncoder.cpp
+++ b/src/vmime/utility/encoder/sevenBitEncoder.cpp
diff --git a/vmime/utility/encoder/sevenBitEncoder.hpp b/src/vmime/utility/encoder/sevenBitEncoder.hpp
index d260cc7b..d260cc7b 100644
--- a/vmime/utility/encoder/sevenBitEncoder.hpp
+++ b/src/vmime/utility/encoder/sevenBitEncoder.hpp
diff --git a/src/utility/encoder/uuEncoder.cpp b/src/vmime/utility/encoder/uuEncoder.cpp
index 0375a397..0375a397 100644
--- a/src/utility/encoder/uuEncoder.cpp
+++ b/src/vmime/utility/encoder/uuEncoder.cpp
diff --git a/vmime/utility/encoder/uuEncoder.hpp b/src/vmime/utility/encoder/uuEncoder.hpp
index 7365263c..7365263c 100644
--- a/vmime/utility/encoder/uuEncoder.hpp
+++ b/src/vmime/utility/encoder/uuEncoder.hpp
diff --git a/vmime/utility/file.hpp b/src/vmime/utility/file.hpp
index c0ba2c5b..c0ba2c5b 100644
--- a/vmime/utility/file.hpp
+++ b/src/vmime/utility/file.hpp
diff --git a/src/utility/filteredStream.cpp b/src/vmime/utility/filteredStream.cpp
index bb705162..bb705162 100644
--- a/src/utility/filteredStream.cpp
+++ b/src/vmime/utility/filteredStream.cpp
diff --git a/vmime/utility/filteredStream.hpp b/src/vmime/utility/filteredStream.hpp
index c60373b9..c60373b9 100644
--- a/vmime/utility/filteredStream.hpp
+++ b/src/vmime/utility/filteredStream.hpp
diff --git a/src/utility/inputStream.cpp b/src/vmime/utility/inputStream.cpp
index a7d6bc0f..a7d6bc0f 100644
--- a/src/utility/inputStream.cpp
+++ b/src/vmime/utility/inputStream.cpp
diff --git a/vmime/utility/inputStream.hpp b/src/vmime/utility/inputStream.hpp
index 809996ce..809996ce 100644
--- a/vmime/utility/inputStream.hpp
+++ b/src/vmime/utility/inputStream.hpp
diff --git a/src/utility/inputStreamAdapter.cpp b/src/vmime/utility/inputStreamAdapter.cpp
index c0b06be4..c0b06be4 100644
--- a/src/utility/inputStreamAdapter.cpp
+++ b/src/vmime/utility/inputStreamAdapter.cpp
diff --git a/vmime/utility/inputStreamAdapter.hpp b/src/vmime/utility/inputStreamAdapter.hpp
index dd761736..dd761736 100644
--- a/vmime/utility/inputStreamAdapter.hpp
+++ b/src/vmime/utility/inputStreamAdapter.hpp
diff --git a/src/utility/inputStreamByteBufferAdapter.cpp b/src/vmime/utility/inputStreamByteBufferAdapter.cpp
index c270ea56..c270ea56 100644
--- a/src/utility/inputStreamByteBufferAdapter.cpp
+++ b/src/vmime/utility/inputStreamByteBufferAdapter.cpp
diff --git a/vmime/utility/inputStreamByteBufferAdapter.hpp b/src/vmime/utility/inputStreamByteBufferAdapter.hpp
index f201f433..f201f433 100644
--- a/vmime/utility/inputStreamByteBufferAdapter.hpp
+++ b/src/vmime/utility/inputStreamByteBufferAdapter.hpp
diff --git a/src/utility/inputStreamPointerAdapter.cpp b/src/vmime/utility/inputStreamPointerAdapter.cpp
index 6bf0461a..6bf0461a 100644
--- a/src/utility/inputStreamPointerAdapter.cpp
+++ b/src/vmime/utility/inputStreamPointerAdapter.cpp
diff --git a/vmime/utility/inputStreamPointerAdapter.hpp b/src/vmime/utility/inputStreamPointerAdapter.hpp
index 4fc606a9..4fc606a9 100644
--- a/vmime/utility/inputStreamPointerAdapter.hpp
+++ b/src/vmime/utility/inputStreamPointerAdapter.hpp
diff --git a/src/utility/inputStreamSocketAdapter.cpp b/src/vmime/utility/inputStreamSocketAdapter.cpp
index d78855eb..d78855eb 100644
--- a/src/utility/inputStreamSocketAdapter.cpp
+++ b/src/vmime/utility/inputStreamSocketAdapter.cpp
diff --git a/vmime/utility/inputStreamSocketAdapter.hpp b/src/vmime/utility/inputStreamSocketAdapter.hpp
index a990f628..a990f628 100644
--- a/vmime/utility/inputStreamSocketAdapter.hpp
+++ b/src/vmime/utility/inputStreamSocketAdapter.hpp
diff --git a/src/utility/inputStreamStringAdapter.cpp b/src/vmime/utility/inputStreamStringAdapter.cpp
index 9b897b97..9b897b97 100644
--- a/src/utility/inputStreamStringAdapter.cpp
+++ b/src/vmime/utility/inputStreamStringAdapter.cpp
diff --git a/vmime/utility/inputStreamStringAdapter.hpp b/src/vmime/utility/inputStreamStringAdapter.hpp
index 4ee597e6..4ee597e6 100644
--- a/vmime/utility/inputStreamStringAdapter.hpp
+++ b/src/vmime/utility/inputStreamStringAdapter.hpp
diff --git a/src/utility/inputStreamStringProxyAdapter.cpp b/src/vmime/utility/inputStreamStringProxyAdapter.cpp
index 5513de80..5513de80 100644
--- a/src/utility/inputStreamStringProxyAdapter.cpp
+++ b/src/vmime/utility/inputStreamStringProxyAdapter.cpp
diff --git a/vmime/utility/inputStreamStringProxyAdapter.hpp b/src/vmime/utility/inputStreamStringProxyAdapter.hpp
index 02dc2056..02dc2056 100644
--- a/vmime/utility/inputStreamStringProxyAdapter.hpp
+++ b/src/vmime/utility/inputStreamStringProxyAdapter.hpp
diff --git a/src/utility/outputStream.cpp b/src/vmime/utility/outputStream.cpp
index 070e28c5..070e28c5 100644
--- a/src/utility/outputStream.cpp
+++ b/src/vmime/utility/outputStream.cpp
diff --git a/vmime/utility/outputStream.hpp b/src/vmime/utility/outputStream.hpp
index 62ee7336..62ee7336 100644
--- a/vmime/utility/outputStream.hpp
+++ b/src/vmime/utility/outputStream.hpp
diff --git a/src/utility/outputStreamAdapter.cpp b/src/vmime/utility/outputStreamAdapter.cpp
index ed90c7d3..ed90c7d3 100644
--- a/src/utility/outputStreamAdapter.cpp
+++ b/src/vmime/utility/outputStreamAdapter.cpp
diff --git a/vmime/utility/outputStreamAdapter.hpp b/src/vmime/utility/outputStreamAdapter.hpp
index f0125584..f0125584 100644
--- a/vmime/utility/outputStreamAdapter.hpp
+++ b/src/vmime/utility/outputStreamAdapter.hpp
diff --git a/src/utility/outputStreamByteArrayAdapter.cpp b/src/vmime/utility/outputStreamByteArrayAdapter.cpp
index 1bed735b..1bed735b 100644
--- a/src/utility/outputStreamByteArrayAdapter.cpp
+++ b/src/vmime/utility/outputStreamByteArrayAdapter.cpp
diff --git a/vmime/utility/outputStreamByteArrayAdapter.hpp b/src/vmime/utility/outputStreamByteArrayAdapter.hpp
index a2178a9c..a2178a9c 100644
--- a/vmime/utility/outputStreamByteArrayAdapter.hpp
+++ b/src/vmime/utility/outputStreamByteArrayAdapter.hpp
diff --git a/src/utility/outputStreamSocketAdapter.cpp b/src/vmime/utility/outputStreamSocketAdapter.cpp
index 03194497..03194497 100644
--- a/src/utility/outputStreamSocketAdapter.cpp
+++ b/src/vmime/utility/outputStreamSocketAdapter.cpp
diff --git a/vmime/utility/outputStreamSocketAdapter.hpp b/src/vmime/utility/outputStreamSocketAdapter.hpp
index 6cd00626..6cd00626 100644
--- a/vmime/utility/outputStreamSocketAdapter.hpp
+++ b/src/vmime/utility/outputStreamSocketAdapter.hpp
diff --git a/src/utility/outputStreamStringAdapter.cpp b/src/vmime/utility/outputStreamStringAdapter.cpp
index 7105480c..7105480c 100644
--- a/src/utility/outputStreamStringAdapter.cpp
+++ b/src/vmime/utility/outputStreamStringAdapter.cpp
diff --git a/vmime/utility/outputStreamStringAdapter.hpp b/src/vmime/utility/outputStreamStringAdapter.hpp
index 89516827..89516827 100644
--- a/vmime/utility/outputStreamStringAdapter.hpp
+++ b/src/vmime/utility/outputStreamStringAdapter.hpp
diff --git a/src/utility/parserInputStreamAdapter.cpp b/src/vmime/utility/parserInputStreamAdapter.cpp
index 5ab26ef0..5ab26ef0 100644
--- a/src/utility/parserInputStreamAdapter.cpp
+++ b/src/vmime/utility/parserInputStreamAdapter.cpp
diff --git a/vmime/utility/parserInputStreamAdapter.hpp b/src/vmime/utility/parserInputStreamAdapter.hpp
index 9b0639b1..9b0639b1 100644
--- a/vmime/utility/parserInputStreamAdapter.hpp
+++ b/src/vmime/utility/parserInputStreamAdapter.hpp
diff --git a/src/utility/path.cpp b/src/vmime/utility/path.cpp
index 9f746d54..9f746d54 100644
--- a/src/utility/path.cpp
+++ b/src/vmime/utility/path.cpp
diff --git a/vmime/utility/path.hpp b/src/vmime/utility/path.hpp
index 203da246..203da246 100644
--- a/vmime/utility/path.hpp
+++ b/src/vmime/utility/path.hpp
diff --git a/src/utility/progressListener.cpp b/src/vmime/utility/progressListener.cpp
index cef074e5..cef074e5 100644
--- a/src/utility/progressListener.cpp
+++ b/src/vmime/utility/progressListener.cpp
diff --git a/vmime/utility/progressListener.hpp b/src/vmime/utility/progressListener.hpp
index 4d0e9bf8..4d0e9bf8 100644
--- a/vmime/utility/progressListener.hpp
+++ b/src/vmime/utility/progressListener.hpp
diff --git a/src/utility/random.cpp b/src/vmime/utility/random.cpp
index 97d12ddc..97d12ddc 100644
--- a/src/utility/random.cpp
+++ b/src/vmime/utility/random.cpp
diff --git a/vmime/utility/random.hpp b/src/vmime/utility/random.hpp
index b667c3a2..b667c3a2 100644
--- a/vmime/utility/random.hpp
+++ b/src/vmime/utility/random.hpp
diff --git a/vmime/utility/seekableInputStream.hpp b/src/vmime/utility/seekableInputStream.hpp
index f56af9c4..f56af9c4 100644
--- a/vmime/utility/seekableInputStream.hpp
+++ b/src/vmime/utility/seekableInputStream.hpp
diff --git a/src/utility/seekableInputStreamRegionAdapter.cpp b/src/vmime/utility/seekableInputStreamRegionAdapter.cpp
index cede1ba9..cede1ba9 100644
--- a/src/utility/seekableInputStreamRegionAdapter.cpp
+++ b/src/vmime/utility/seekableInputStreamRegionAdapter.cpp
diff --git a/vmime/utility/seekableInputStreamRegionAdapter.hpp b/src/vmime/utility/seekableInputStreamRegionAdapter.hpp
index 4716d2de..4716d2de 100644
--- a/vmime/utility/seekableInputStreamRegionAdapter.hpp
+++ b/src/vmime/utility/seekableInputStreamRegionAdapter.hpp
diff --git a/src/utility/stream.cpp b/src/vmime/utility/stream.cpp
index 232b23c7..232b23c7 100644
--- a/src/utility/stream.cpp
+++ b/src/vmime/utility/stream.cpp
diff --git a/vmime/utility/stream.hpp b/src/vmime/utility/stream.hpp
index 980a2407..980a2407 100644
--- a/vmime/utility/stream.hpp
+++ b/src/vmime/utility/stream.hpp
diff --git a/src/utility/streamUtils.cpp b/src/vmime/utility/streamUtils.cpp
index f3cc69ef..f3cc69ef 100644
--- a/src/utility/streamUtils.cpp
+++ b/src/vmime/utility/streamUtils.cpp
diff --git a/vmime/utility/streamUtils.hpp b/src/vmime/utility/streamUtils.hpp
index 406b6b64..406b6b64 100644
--- a/vmime/utility/streamUtils.hpp
+++ b/src/vmime/utility/streamUtils.hpp
diff --git a/src/utility/stringProxy.cpp b/src/vmime/utility/stringProxy.cpp
index 67c96816..67c96816 100644
--- a/src/utility/stringProxy.cpp
+++ b/src/vmime/utility/stringProxy.cpp
diff --git a/vmime/utility/stringProxy.hpp b/src/vmime/utility/stringProxy.hpp
index e5efa135..e5efa135 100644
--- a/vmime/utility/stringProxy.hpp
+++ b/src/vmime/utility/stringProxy.hpp
diff --git a/src/utility/stringUtils.cpp b/src/vmime/utility/stringUtils.cpp
index dd99d845..dd99d845 100644
--- a/src/utility/stringUtils.cpp
+++ b/src/vmime/utility/stringUtils.cpp
diff --git a/vmime/utility/stringUtils.hpp b/src/vmime/utility/stringUtils.hpp
index 7d9925e2..7d9925e2 100644
--- a/vmime/utility/stringUtils.hpp
+++ b/src/vmime/utility/stringUtils.hpp
diff --git a/vmime/utility/sync/autoLock.hpp b/src/vmime/utility/sync/autoLock.hpp
index c058429d..c058429d 100644
--- a/vmime/utility/sync/autoLock.hpp
+++ b/src/vmime/utility/sync/autoLock.hpp
diff --git a/src/utility/sync/criticalSection.cpp b/src/vmime/utility/sync/criticalSection.cpp
index f2512d14..f2512d14 100644
--- a/src/utility/sync/criticalSection.cpp
+++ b/src/vmime/utility/sync/criticalSection.cpp
diff --git a/vmime/utility/sync/criticalSection.hpp b/src/vmime/utility/sync/criticalSection.hpp
index 9703d73c..9703d73c 100644
--- a/vmime/utility/sync/criticalSection.hpp
+++ b/src/vmime/utility/sync/criticalSection.hpp
diff --git a/src/utility/url.cpp b/src/vmime/utility/url.cpp
index ce0dc39a..ce0dc39a 100644
--- a/src/utility/url.cpp
+++ b/src/vmime/utility/url.cpp
diff --git a/vmime/utility/url.hpp b/src/vmime/utility/url.hpp
index 84aba618..84aba618 100644
--- a/vmime/utility/url.hpp
+++ b/src/vmime/utility/url.hpp
diff --git a/src/utility/urlUtils.cpp b/src/vmime/utility/urlUtils.cpp
index 20818764..20818764 100644
--- a/src/utility/urlUtils.cpp
+++ b/src/vmime/utility/urlUtils.cpp
diff --git a/vmime/utility/urlUtils.hpp b/src/vmime/utility/urlUtils.hpp
index c21e7aa4..c21e7aa4 100644
--- a/vmime/utility/urlUtils.hpp
+++ b/src/vmime/utility/urlUtils.hpp
diff --git a/vmime/vmime.hpp b/src/vmime/vmime.hpp
index 9bb017e3..9bb017e3 100644
--- a/vmime/vmime.hpp
+++ b/src/vmime/vmime.hpp
diff --git a/src/word.cpp b/src/vmime/word.cpp
index 2ee4d3e7..2ee4d3e7 100644
--- a/src/word.cpp
+++ b/src/vmime/word.cpp
diff --git a/vmime/word.hpp b/src/vmime/word.hpp
index a6e2402e..a6e2402e 100644
--- a/vmime/word.hpp
+++ b/src/vmime/word.hpp
diff --git a/src/wordEncoder.cpp b/src/vmime/wordEncoder.cpp
index 421a9ecd..421a9ecd 100644
--- a/src/wordEncoder.cpp
+++ b/src/vmime/wordEncoder.cpp
diff --git a/vmime/wordEncoder.hpp b/src/vmime/wordEncoder.hpp
index 6f652fa2..6f652fa2 100644
--- a/vmime/wordEncoder.hpp
+++ b/src/vmime/wordEncoder.hpp