Moved all header files to 'vmime/' directory.

ChangeLog

@@ -4,7 +4,11 @@ VERSION 0.6.1-cvs
 
 2004-12-26  Vincent Richard  <vincent@vincent-richard.net>
 
- * Removed relative paths from #include's.
+ * Removed relative paths from #include's and moved all header files
+   to 'vmime/' directory.
+
+ * Renamed main VMime include from 'vmime' to 'vmime.hpp'. So, in your
+   program, you have to #include <vmime/vmime.hpp>.
 
  * Added support for 'pkg-config'.
 

SConstruct

@@ -86,7 +86,7 @@ libvmime_sources = [
 	'typeAdapter.cpp', 'typeAdapter.hpp',
 	'types.hpp',
 	'word.cpp', 'word.hpp',
-	'vmime',
+	'vmime.hpp',
 	'utility/file.hpp',
 	'utility/md5.cpp', 'utility/md5.hpp',
 	'utility/path.cpp', 'utility/path.hpp',
@@ -249,14 +249,24 @@ libvmimetest_sources = [
 libvmime_dist_files = libvmime_sources + libvmime_messaging_sources
 
 for i in range(len(libvmime_dist_files)):
-	libvmime_dist_files[i] = 'src/' + libvmime_dist_files[i]
+	f = libvmime_dist_files[i]
+	if f[-4:] == '.hpp':
+		libvmime_dist_files[i] = 'vmime/' + f
+	else:
+		libvmime_dist_files[i] = 'src/' + f
 
 for p in libvmime_messaging_proto_sources:
 	for f in p[1]:
+		if f[-4:] == '.hpp':
+			libvmime_dist_files.append('vmime/' + f)
+		else:
 			libvmime_dist_files.append('src/' + f)
 
 for p in libvmime_platforms_sources:
 	for f in libvmime_platforms_sources[p]:
+		if f[-4:] == '.hpp':
+			libvmime_dist_files.append('vmime/' + f)
+		else:
 			libvmime_dist_files.append('src/' + f)
 
 libvmime_dist_files = libvmime_dist_files + libvmime_extra + libvmime_examples_sources
@@ -426,7 +436,7 @@ env = Environment(options = opts)
 env.Append(ENV = os.environ)
 env.Append(ENV = {'PATH' : os.environ['PATH']})
 
-env.Append(CPPPATH = [ '.', 'src' ])
+env.Append(CPPPATH = [ '.' ])
 
 env.Append(CPPDEFINES = { '_REENTRANT' : 1 })
 
@@ -518,7 +528,7 @@ if env['with_messaging'] == 'yes':
 #  Generate config.hpp  #
 #########################
 
-config_hpp = open('src/config.hpp', 'w')
+config_hpp = open('vmime/config.hpp', 'w')
 
 config_hpp.write("""
 //
@@ -663,11 +673,11 @@ for file in libvmime_full_sources:
 	if slash != -1:
 		dir = file[0:slash] + '/'
 
-	if file[-4:] == '.cpp':
-		libvmime_sources_CPP.append(buildDirectory + file)
-	else:
+	if file[-4:] == '.hpp':
 		libvmime_sources_HPP.append(buildDirectory + file)
-		libvmime_install_includes.append([dir, buildDirectory + file])
+		libvmime_install_includes.append([dir, 'vmime/' + file])
+	else:
+		libvmime_sources_CPP.append(buildDirectory + file)
 
 # HACK: SCons does not allow '.' in target name, so we have to
 # detect the suffix for library name and add it ourself
@@ -704,7 +714,7 @@ for platform in libvmime_platforms_sources:
 			dir = file[0:slash] + '/'
 
 		if file[-4:] == '.hpp':
-			libvmime_install_includes.append([dir, buildDirectory + file])
+			libvmime_install_includes.append([dir, 'vmime/' + file])
 
 # Platform libraries
 platformLibraries = [ ]
@@ -769,7 +779,7 @@ for i in range(len(libvmime_install_includes)):
 	env.Install(includeDir + '/' + libvmime_install_includes[i][0], libvmime_install_includes[i][1])
 
 # Configuration header file
-env.Install(includeDir, 'src/config.hpp')
+env.Install(includeDir, 'vmime/config.hpp')
 
 # Pkg-config support
 vmime_pc = open(versionedPackageName + ".pc", 'w')

examples/example1.cpp

@@ -29,8 +29,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()

examples/example2.cpp

@@ -29,8 +29,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()

examples/example3.cpp

@@ -29,8 +29,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()

examples/example4.cpp

@@ -28,8 +28,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()

examples/example5.cpp

@@ -29,8 +29,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()

examples/example6.cpp

@@ -19,8 +19,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 //

src/address.cpp

@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "address.hpp"
+#include "vmime/address.hpp"
 
-#include "mailbox.hpp"
-#include "mailboxGroup.hpp"
+#include "vmime/mailbox.hpp"
+#include "vmime/mailboxGroup.hpp"
 
-#include "parserHelpers.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/addressList.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "addressList.hpp"
-#include "parserHelpers.hpp"
-#include "exception.hpp"
-#include "mailboxList.hpp"
+#include "vmime/addressList.hpp"
+#include "vmime/parserHelpers.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/mailboxList.hpp"
 
 
 namespace vmime

src/base.cpp

@@ -17,30 +17,30 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "charset.hpp"
-#include "base.hpp"
+#include "vmime/charset.hpp"
+#include "vmime/base.hpp"
 
-#include "encoder.hpp"
-#include "encoderB64.hpp"
-#include "encoderQP.hpp"
+#include "vmime/encoder.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/encoderQP.hpp"
 
-#include "text.hpp"
+#include "vmime/text.hpp"
 
-#include "parserHelpers.hpp"
+#include "vmime/parserHelpers.hpp"
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 // For initializing
-#include "encoderFactory.hpp"
-#include "headerFieldFactory.hpp"
-#include "parameterFactory.hpp"
-#include "textPartFactory.hpp"
-#include "options.hpp"
+#include "vmime/encoderFactory.hpp"
+#include "vmime/headerFieldFactory.hpp"
+#include "vmime/parameterFactory.hpp"
+#include "vmime/textPartFactory.hpp"
+#include "vmime/options.hpp"
 
 #if VMIME_HAVE_MESSAGING_FEATURES
-	#include "messaging/serviceFactory.hpp"
+	#include "vmime/messaging/serviceFactory.hpp"
 #endif
 
 

src/body.cpp

@@ -17,16 +17,16 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "bodyPart.hpp"
-#include "body.hpp"
+#include "vmime/bodyPart.hpp"
+#include "vmime/body.hpp"
 
-#include "options.hpp"
+#include "vmime/options.hpp"
 
-#include "contentTypeField.hpp"
+#include "vmime/contentTypeField.hpp"
 
-#include "utility/random.hpp"
+#include "vmime/utility/random.hpp"
 
-#include "parserHelpers.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/bodyPart.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "bodyPart.hpp"
+#include "vmime/bodyPart.hpp"
 
 
 namespace vmime

src/charset.cpp

@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "charset.hpp"
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/charset.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 extern "C"

src/component.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "component.hpp"
-#include "base.hpp"
+#include "vmime/component.hpp"
+#include "vmime/base.hpp"
 
 #include <sstream>
 

src/constants.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "constants.hpp"
+#include "vmime/constants.hpp"
 
 
 namespace vmime

src/contentDisposition.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "contentDisposition.hpp"
-#include "utility/stringUtils.hpp"
+#include "vmime/contentDisposition.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 namespace vmime

src/contentDispositionField.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "contentDispositionField.hpp"
-#include "exception.hpp"
+#include "vmime/contentDispositionField.hpp"
+#include "vmime/exception.hpp"
 
-#include "standardParams.hpp"
+#include "vmime/standardParams.hpp"
 
 
 namespace vmime

src/contentHandler.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "contentHandler.hpp"
+#include "vmime/contentHandler.hpp"
 
 
 namespace vmime

src/contentTypeField.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "contentTypeField.hpp"
-#include "exception.hpp"
+#include "vmime/contentTypeField.hpp"
+#include "vmime/exception.hpp"
 
-#include "standardParams.hpp"
+#include "vmime/standardParams.hpp"
 
 
 namespace vmime

src/dateTime.cpp

@@ -19,9 +19,9 @@
 
 #include <iomanip>
 
-#include "dateTime.hpp"
-#include "platformDependant.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/dateTime.hpp"
+#include "vmime/platformDependant.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/defaultAttachment.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "defaultAttachment.hpp"
-#include "encoding.hpp"
+#include "vmime/defaultAttachment.hpp"
+#include "vmime/encoding.hpp"
 
 
 namespace vmime

src/encoder.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoder.hpp"
-#include "exception.hpp"
+#include "vmime/encoder.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime

src/encoder7bit.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoder7bit.hpp"
+#include "vmime/encoder7bit.hpp"
 
 
 namespace vmime

src/encoder8bit.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoder8bit.hpp"
+#include "vmime/encoder8bit.hpp"
 
 
 namespace vmime

src/encoderB64.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderB64.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/encoderBinary.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderBinary.hpp"
+#include "vmime/encoderBinary.hpp"
 
 
 namespace vmime

src/encoderDefault.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderDefault.hpp"
+#include "vmime/encoderDefault.hpp"
 
 
 namespace vmime

src/encoderFactory.cpp

@@ -17,15 +17,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderFactory.hpp"
-#include "exception.hpp"
+#include "vmime/encoderFactory.hpp"
+#include "vmime/exception.hpp"
 
-#include "encoderB64.hpp"
-#include "encoderQP.hpp"
-#include "encoderUUE.hpp"
-#include "encoderBinary.hpp"
-#include "encoder7bit.hpp"
-#include "encoder8bit.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/encoderQP.hpp"
+#include "vmime/encoderUUE.hpp"
+#include "vmime/encoderBinary.hpp"
+#include "vmime/encoder7bit.hpp"
+#include "vmime/encoder8bit.hpp"
 
 
 namespace vmime

src/encoderQP.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderQP.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/encoderQP.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/encoderUUE.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderUUE.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/encoderUUE.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/encoding.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoding.hpp"
-#include "encoderFactory.hpp"
-#include "contentHandler.hpp"
+#include "vmime/encoding.hpp"
+#include "vmime/encoderFactory.hpp"
+#include "vmime/contentHandler.hpp"
 
 #include <algorithm>
 

src/exception.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "exception.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime {

src/fileAttachment.cpp

@@ -20,8 +20,8 @@
 #include <fstream>
 #include <sstream>
 
-#include "fileAttachment.hpp"
-#include "exception.hpp"
+#include "vmime/fileAttachment.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime

src/header.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "header.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/header.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/headerField.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "headerField.hpp"
-#include "headerFieldFactory.hpp"
+#include "vmime/headerField.hpp"
+#include "vmime/headerFieldFactory.hpp"
 
 
 namespace vmime

src/headerFieldFactory.cpp

@@ -17,14 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "headerFieldFactory.hpp"
-#include "exception.hpp"
+#include "vmime/headerFieldFactory.hpp"
+#include "vmime/exception.hpp"
 
-#include "standardFields.hpp"
+#include "vmime/standardFields.hpp"
 
-#include "mailboxField.hpp"
-#include "contentTypeField.hpp"
-#include "contentDispositionField.hpp"
+#include "vmime/mailboxField.hpp"
+#include "vmime/contentTypeField.hpp"
+#include "vmime/contentDispositionField.hpp"
 
 
 namespace vmime

src/htmlTextPart.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "htmlTextPart.hpp"
-#include "exception.hpp"
+#include "vmime/htmlTextPart.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime

src/mailbox.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mailbox.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/mailbox.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/mailboxField.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mailboxField.hpp"
-#include "mailboxGroup.hpp"
+#include "vmime/mailboxField.hpp"
+#include "vmime/mailboxGroup.hpp"
 
 
 namespace vmime

src/mailboxGroup.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mailboxGroup.hpp"
-#include "parserHelpers.hpp"
-#include "exception.hpp"
+#include "vmime/mailboxGroup.hpp"
+#include "vmime/parserHelpers.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime

src/mailboxList.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mailboxList.hpp"
-#include "exception.hpp"
+#include "vmime/mailboxList.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime

src/mediaType.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mediaType.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/message.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "message.hpp"
-#include "options.hpp"
+#include "vmime/message.hpp"
+#include "vmime/options.hpp"
 
 #include <sstream>
 

src/messageBuilder.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messageBuilder.hpp"
+#include "vmime/messageBuilder.hpp"
 
-#include "textPartFactory.hpp"
+#include "vmime/textPartFactory.hpp"
 
 
 namespace vmime

src/messageId.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messageId.hpp"
-#include "utility/random.hpp"
-#include "platformDependant.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/messageId.hpp"
+#include "vmime/utility/random.hpp"
+#include "vmime/platformDependant.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/messageParser.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messageParser.hpp"
+#include "vmime/messageParser.hpp"
 
-#include "defaultAttachment.hpp"
-#include "textPartFactory.hpp"
+#include "vmime/defaultAttachment.hpp"
+#include "vmime/textPartFactory.hpp"
 
 
 namespace vmime

src/messaging/IMAPConnection.cpp

@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPTag.hpp"
-#include "messaging/IMAPConnection.hpp"
-#include "messaging/IMAPUtils.hpp"
-#include "messaging/IMAPStore.hpp"
+#include "vmime/messaging/IMAPTag.hpp"
+#include "vmime/messaging/IMAPConnection.hpp"
+#include "vmime/messaging/IMAPUtils.hpp"
+#include "vmime/messaging/IMAPStore.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 #include <sstream>
 

src/messaging/IMAPFolder.cpp

@@ -17,18 +17,18 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPFolder.hpp"
+#include "vmime/messaging/IMAPFolder.hpp"
 
-#include "messaging/IMAPStore.hpp"
-#include "messaging/IMAPParser.hpp"
-#include "messaging/IMAPMessage.hpp"
-#include "messaging/IMAPUtils.hpp"
-#include "messaging/IMAPConnection.hpp"
+#include "vmime/messaging/IMAPStore.hpp"
+#include "vmime/messaging/IMAPParser.hpp"
+#include "vmime/messaging/IMAPMessage.hpp"
+#include "vmime/messaging/IMAPUtils.hpp"
+#include "vmime/messaging/IMAPConnection.hpp"
 
-#include "messageParser.hpp"   // to include "message.hpp" in root directory
+#include "vmime/message.hpp"
 
-#include "exception.hpp"
-#include "utility/smartPtr.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/utility/smartPtr.hpp"
 
 #include <algorithm>
 #include <sstream>

src/messaging/IMAPMessage.cpp

@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPParser.hpp"
-#include "messaging/IMAPMessage.hpp"
-#include "messaging/IMAPFolder.hpp"
-#include "messaging/IMAPStore.hpp"
-#include "messaging/IMAPConnection.hpp"
-#include "messaging/IMAPUtils.hpp"
+#include "vmime/messaging/IMAPParser.hpp"
+#include "vmime/messaging/IMAPMessage.hpp"
+#include "vmime/messaging/IMAPFolder.hpp"
+#include "vmime/messaging/IMAPStore.hpp"
+#include "vmime/messaging/IMAPConnection.hpp"
+#include "vmime/messaging/IMAPUtils.hpp"
 
 #include <sstream>
 #include <iterator>

src/messaging/IMAPStore.cpp

@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPStore.hpp"
-#include "messaging/IMAPFolder.hpp"
-#include "messaging/IMAPConnection.hpp"
+#include "vmime/messaging/IMAPStore.hpp"
+#include "vmime/messaging/IMAPFolder.hpp"
+#include "vmime/messaging/IMAPConnection.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 #include <map>
 

src/messaging/IMAPTag.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPTag.hpp"
+#include "vmime/messaging/IMAPTag.hpp"
 
 
 namespace vmime {

src/messaging/IMAPUtils.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPUtils.hpp"
-#include "messaging/message.hpp"
+#include "vmime/messaging/IMAPUtils.hpp"
+#include "vmime/messaging/message.hpp"
 
 #include <sstream>
 #include <iterator>

src/messaging/POP3Folder.cpp

@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/POP3Folder.hpp"
+#include "vmime/messaging/POP3Folder.hpp"
 
-#include "messaging/POP3Store.hpp"
-#include "messaging/POP3Message.hpp"
+#include "vmime/messaging/POP3Store.hpp"
+#include "vmime/messaging/POP3Message.hpp"
 
-#include "exception.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime {

src/messaging/POP3Message.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/POP3Message.hpp"
-#include "messaging/POP3Folder.hpp"
-#include "messaging/POP3Store.hpp"
+#include "vmime/messaging/POP3Message.hpp"
+#include "vmime/messaging/POP3Folder.hpp"
+#include "vmime/messaging/POP3Store.hpp"
 
 #include <sstream>
 

src/messaging/POP3Store.cpp

@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/POP3Store.hpp"
-#include "messaging/POP3Folder.hpp"
+#include "vmime/messaging/POP3Store.hpp"
+#include "vmime/messaging/POP3Folder.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
-#include "messageId.hpp"
-#include "utility/md5.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
+#include "vmime/messageId.hpp"
+#include "vmime/utility/md5.hpp"
 
 #include <algorithm>
 

src/messaging/SMTPTransport.cpp

@@ -17,15 +17,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/SMTPTransport.hpp"
+#include "vmime/messaging/SMTPTransport.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
-#include "encoderB64.hpp"
-#include "messageParser.hpp"   // to include "message.hpp" in root directory
-#include "mailboxList.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/message.hpp"
+#include "vmime/mailboxList.hpp"
 
-#include "messaging/authHelper.hpp"
+#include "vmime/messaging/authHelper.hpp"
 
 
 namespace vmime {

src/messaging/authHelper.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/authHelper.hpp"
+#include "vmime/messaging/authHelper.hpp"
 
-#include "config.hpp"
-#include "utility/md5.hpp"
+#include "vmime/config.hpp"
+#include "vmime/utility/md5.hpp"
 
 
 namespace vmime {

src/messaging/authenticationInfos.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/authenticationInfos.hpp"
+#include "vmime/messaging/authenticationInfos.hpp"
 
 
 namespace vmime {

src/messaging/authenticator.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/authenticator.hpp"
+#include "vmime/messaging/authenticator.hpp"
 
 
 namespace vmime {

src/messaging/builtinServices.inl

@@ -25,25 +25,25 @@
 
 
 #if VMIME_BUILTIN_MESSAGING_PROTO_POP3
-	#include "POP3Store.hpp"
+	#include "vmime/messaging/POP3Store.hpp"
 	REGISTER_SERVICE(POP3Store, pop3);
 #endif
 
 
 #if VMIME_BUILTIN_MESSAGING_PROTO_SMTP
-	#include "SMTPTransport.hpp"
+	#include "vmime/messaging/SMTPTransport.hpp"
 	REGISTER_SERVICE(SMTPTransport, smtp);
 #endif
 
 
 #if VMIME_BUILTIN_MESSAGING_PROTO_IMAP
-	#include "IMAPStore.hpp"
+	#include "vmime/messaging/IMAPStore.hpp"
 	REGISTER_SERVICE(IMAPStore, imap);
 #endif
 
 
 #if VMIME_BUILTIN_MESSAGING_PROTO_MAILDIR
-	#include "maildirStore.hpp"
+	#include "vmime/messaging/maildirStore.hpp"
 	REGISTER_SERVICE(maildirStore, maildir);
 #endif
 

src/messaging/defaultAuthenticator.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/defaultAuthenticator.hpp"
+#include "vmime/messaging/defaultAuthenticator.hpp"
 
 
 namespace vmime {

src/messaging/events.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/events.hpp"
+#include "vmime/messaging/events.hpp"
 
 #include <algorithm>
 

src/messaging/folder.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/folder.hpp"
+#include "vmime/messaging/folder.hpp"
 
 #include <algorithm>
 

src/messaging/maildirFolder.cpp

@@ -17,18 +17,18 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/maildirFolder.hpp"
+#include "vmime/messaging/maildirFolder.hpp"
 
-#include "messaging/maildirStore.hpp"
-#include "messaging/maildirMessage.hpp"
-#include "messaging/maildirUtils.hpp"
+#include "vmime/messaging/maildirStore.hpp"
+#include "vmime/messaging/maildirMessage.hpp"
+#include "vmime/messaging/maildirUtils.hpp"
 
-#include "utility/smartPtr.hpp"
+#include "vmime/utility/smartPtr.hpp"
 
-#include "messageParser.hpp"   // to include "message.hpp" in root directory
+#include "vmime/message.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 
 namespace vmime {

src/messaging/maildirMessage.cpp

@@ -17,14 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/maildirMessage.hpp"
-#include "messaging/maildirFolder.hpp"
-#include "messaging/maildirUtils.hpp"
+#include "vmime/messaging/maildirMessage.hpp"
+#include "vmime/messaging/maildirFolder.hpp"
+#include "vmime/messaging/maildirUtils.hpp"
 
-#include "messageParser.hpp"   // to include "message.hpp" in root directory
+#include "vmime/messageParser.hpp"   // to include "message.hpp" in root directory
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 
 namespace vmime {

src/messaging/maildirStore.cpp

@@ -17,14 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/maildirStore.hpp"
+#include "vmime/messaging/maildirStore.hpp"
 
-#include "messaging/maildirFolder.hpp"
+#include "vmime/messaging/maildirFolder.hpp"
 
-#include "utility/smartPtr.hpp"
+#include "vmime/utility/smartPtr.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 
 namespace vmime {

src/messaging/maildirUtils.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/maildirUtils.hpp"
-#include "messaging/maildirStore.hpp"
+#include "vmime/messaging/maildirUtils.hpp"
+#include "vmime/messaging/maildirStore.hpp"
 
-#include "utility/random.hpp"
+#include "vmime/utility/random.hpp"
 
 
 namespace vmime {

src/messaging/message.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/message.hpp"
+#include "vmime/messaging/message.hpp"
 
 
 namespace vmime {

src/messaging/service.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/service.hpp"
+#include "vmime/messaging/service.hpp"
 
-#include "messaging/defaultAuthenticator.hpp"
+#include "vmime/messaging/defaultAuthenticator.hpp"
 
 
 namespace vmime {

src/messaging/serviceFactory.cpp

@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/serviceFactory.hpp"
-#include "messaging/service.hpp"
+#include "vmime/messaging/serviceFactory.hpp"
+#include "vmime/messaging/service.hpp"
 
-#include "exception.hpp"
-#include "config.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/config.hpp"
 
-#include "messaging/builtinServices.inl"
+#include "builtinServices.inl"
 
 
 namespace vmime {

src/messaging/session.cpp

@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/session.hpp"
-#include "messaging/serviceFactory.hpp"
+#include "vmime/messaging/session.hpp"
+#include "vmime/messaging/serviceFactory.hpp"
 
-#include "messaging/store.hpp"
-#include "messaging/transport.hpp"
+#include "vmime/messaging/store.hpp"
+#include "vmime/messaging/transport.hpp"
 
 
 namespace vmime {

src/messaging/simpleAuthenticator.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/simpleAuthenticator.hpp"
+#include "vmime/messaging/simpleAuthenticator.hpp"
 
 
 namespace vmime {

src/messaging/url.cpp

@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "url.hpp"
+#include "vmime/messaging/url.hpp"
 
-#include "parserHelpers.hpp"
-#include "messaging/urlUtils.hpp"
-#include "exception.hpp"
+#include "vmime/parserHelpers.hpp"
+#include "vmime/messaging/urlUtils.hpp"
+#include "vmime/exception.hpp"
 
 #include <sstream>
 

src/messaging/urlUtils.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/urlUtils.hpp"
+#include "vmime/messaging/urlUtils.hpp"
 
 
 namespace vmime {

src/options.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "options.hpp"
+#include "vmime/options.hpp"
 
 
 namespace vmime

src/parameter.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "parameter.hpp"
-#include "parameterFactory.hpp"
+#include "vmime/parameter.hpp"
+#include "vmime/parameterFactory.hpp"
 
 
 namespace vmime

src/parameterFactory.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "parameterFactory.hpp"
-#include "exception.hpp"
+#include "vmime/parameterFactory.hpp"
+#include "vmime/exception.hpp"
 
-#include "standardParams.hpp"
+#include "vmime/standardParams.hpp"
 
 
 namespace vmime

src/parameterizedHeaderField.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "parameterizedHeaderField.hpp"
-#include "parameterFactory.hpp"
-#include "text.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/parameterizedHeaderField.hpp"
+#include "vmime/parameterFactory.hpp"
+#include "vmime/text.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime

src/plainTextPart.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "plainTextPart.hpp"
-#include "header.hpp"
-#include "exception.hpp"
+#include "vmime/plainTextPart.hpp"
+#include "vmime/header.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime

src/platformDependant.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "platformDependant.hpp"
+#include "vmime/platformDependant.hpp"
 
 
 namespace vmime

src/platforms/posix/file.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "platforms/posix/file.hpp"
+#include "vmime/platforms/posix/file.hpp"
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -30,7 +30,7 @@
 
 #include <string.h>
 
-#include "exception.hpp"
+#include "vmime/exception.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES

src/platforms/posix/handler.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "platforms/posix/handler.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 #include <time.h>
 

src/platforms/posix/socket.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "platforms/posix/socket.hpp"
+#include "vmime/platforms/posix/socket.hpp"
 
 #include <unistd.h>
 #include <sys/socket.h>
@@ -27,7 +27,7 @@
 #include <netdb.h>
 #include <fcntl.h>
 
-#include "exception.hpp"
+#include "vmime/exception.hpp"
 
 
 #if VMIME_HAVE_MESSAGING_FEATURES

src/propertySet.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "propertySet.hpp"
+#include "vmime/propertySet.hpp"
 
 
 namespace vmime

src/relay.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "relay.hpp"
-#include "text.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/relay.hpp"
+#include "vmime/text.hpp"
+#include "vmime/parserHelpers.hpp"
 
 #include <sstream>
 

src/text.cpp

@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "text.hpp"
+#include "vmime/text.hpp"
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
-#include "encoder.hpp"
-#include "encoderB64.hpp"
-#include "encoderQP.hpp"
+#include "vmime/encoder.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/encoderQP.hpp"
 
 
 namespace vmime

src/textPartFactory.cpp

@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "textPartFactory.hpp"
-#include "exception.hpp"
+#include "vmime/textPartFactory.hpp"
+#include "vmime/exception.hpp"
 
 
-#include "plainTextPart.hpp"
-#include "htmlTextPart.hpp"
+#include "vmime/plainTextPart.hpp"
+#include "vmime/htmlTextPart.hpp"
 
 
 namespace vmime

src/typeAdapter.cpp

@@ -18,7 +18,7 @@
 //
 
 
-#include "typeAdapter.hpp"
+#include "vmime/typeAdapter.hpp"
 
 
 namespace vmime

src/utility/md5.cpp

@@ -44,7 +44,7 @@
 //     These notices must be retained in any copies of any part of this
 //     documentation and/or software.
 
-#include "utility/md5.hpp"
+#include "vmime/utility/md5.hpp"
 
 
 namespace vmime {

src/utility/path.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/path.hpp"
+#include "vmime/utility/path.hpp"
 
 #include <algorithm>
 

src/utility/random.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/random.hpp"
-#include "platformDependant.hpp"
+#include "vmime/utility/random.hpp"
+#include "vmime/platformDependant.hpp"
 
 #include <ctime>
 

src/utility/singleton.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "singleton.hpp"
+#include "vmime/utility/singleton.hpp"
 
 
 namespace vmime {

src/utility/stream.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/stream.hpp"
-#include "utility/stringProxy.hpp"
+#include "vmime/utility/stream.hpp"
+#include "vmime/utility/stringProxy.hpp"
 
 #include <algorithm>  // for std::copy
 #include <iterator>   // for std::back_inserter

src/utility/stringProxy.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/stringProxy.hpp"
+#include "vmime/utility/stringProxy.hpp"
 
 #include <iterator>
 #include <algorithm>

src/utility/stringUtils.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 namespace vmime

src/vmime

@@ -1,92 +0,0 @@
-//
-// VMime library (http://vmime.sourceforge.net)
-// Copyright (C) 2002-2004 Vincent Richard <vincent@vincent-richard.net>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should.have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-
-#ifndef VMIME_INCLUDED
-#define VMIME_INCLUDED
-
-
-// Configuration
-#include "config.hpp"
-
-// Base definitions
-#include "base.hpp"
-#include "exception.hpp"
-#include "options.hpp"
-#include "platformDependant.hpp"
-
-// Base components
-#include "dateTime.hpp"
-#include "message.hpp"
-#include "bodyPart.hpp"
-#include "charset.hpp"
-#include "text.hpp"
-#include "encoding.hpp"
-#include "contentDisposition.hpp"
-#include "mailbox.hpp"
-#include "mailboxGroup.hpp"
-#include "mailboxList.hpp"
-#include "addressList.hpp"
-#include "mediaType.hpp"
-#include "messageId.hpp"
-#include "relay.hpp"
-
-// Message components
-#include "message.hpp"
-
-// Header fields
-#include "headerFieldFactory.hpp"
-#include "mailboxField.hpp"
-#include "parameterizedHeaderField.hpp"
-#include "standardFields.hpp"
-
-// Encoders
-#include "encoderFactory.hpp"
-
-// Message builder/parser
-#include "messageBuilder.hpp"
-#include "messageParser.hpp"
-
-#include "fileAttachment.hpp"
-#include "defaultAttachment.hpp"
-
-#include "plainTextPart.hpp"
-#include "htmlTextPart.hpp"
-
-// Property set
-#include "propertySet.hpp"
-
-// Messaging features
-#if VMIME_HAVE_MESSAGING_FEATURES
-	#include "messaging/socket.hpp"
-
-	#include "messaging/service.hpp"
-	#include "messaging/store.hpp"
-	#include "messaging/transport.hpp"
-
-	#include "messaging/session.hpp"
-	#include "messaging/authenticator.hpp"
-	#include "messaging/defaultAuthenticator.hpp"
-	#include "messaging/simpleAuthenticator.hpp"
-
-	#include "messaging/folder.hpp"
-	#include "messaging/message.hpp"
-#endif // VMIME_HAVE_MESSAGING_FEATURES
-
-
-#endif // VMIME_INCLUDED

src/word.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "word.hpp"
+#include "vmime/word.hpp"
 
 
 namespace vmime

tests/parser/encoderTest.cpp

@@ -22,8 +22,8 @@
 #include <iostream>
 #include <ostream>
 
-#include "../../src/vmime"
-#include "../../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 using namespace unitpp;
 

tests/parser/headerTest.cpp

@@ -22,8 +22,8 @@
 #include <iostream>
 #include <ostream>
 
-#include "../../src/vmime"
-#include "../../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 using namespace unitpp;