aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--build-mac/framework-Info.plist30
-rw-r--r--build-mac/mailcore2.xcodeproj/project.pbxproj72
-rw-r--r--src/async/MCAsync.h6
-rw-r--r--src/async/imap/MCAsyncIMAP.h34
-rw-r--r--src/async/imap/MCIMAPAppendMessageOperation.h4
-rw-r--r--src/async/imap/MCIMAPAsyncConnection.h4
-rw-r--r--src/async/imap/MCIMAPAsyncSession.h4
-rw-r--r--src/async/imap/MCIMAPCapabilityOperation.h2
-rw-r--r--src/async/imap/MCIMAPCheckAccountOperation.h2
-rw-r--r--src/async/imap/MCIMAPCopyMessagesOperation.h2
-rw-r--r--src/async/imap/MCIMAPCreateFolderOperation.h2
-rw-r--r--src/async/imap/MCIMAPDeleteFolderOperation.h2
-rw-r--r--src/async/imap/MCIMAPExpungeOperation.h2
-rw-r--r--src/async/imap/MCIMAPFetchContentOperation.h2
-rw-r--r--src/async/imap/MCIMAPFetchFoldersOperation.h4
-rw-r--r--src/async/imap/MCIMAPFetchMessagesOperation.h2
-rw-r--r--src/async/imap/MCIMAPFetchNamespaceOperation.h2
-rw-r--r--src/async/imap/MCIMAPFolderInfoOperation.h2
-rw-r--r--src/async/imap/MCIMAPIdentityOperation.h2
-rw-r--r--src/async/imap/MCIMAPIdleOperation.h2
-rw-r--r--src/async/imap/MCIMAPOperation.h4
-rw-r--r--src/async/imap/MCIMAPRenameFolderOperation.h2
-rw-r--r--src/async/imap/MCIMAPSearchOperation.h4
-rw-r--r--src/async/imap/MCIMAPStoreFlagsOperation.h2
-rw-r--r--src/async/imap/MCIMAPStoreLabelsOperation.h2
-rw-r--r--src/async/imap/MCIMAPSubscribeFolderOperation.h2
-rw-r--r--src/async/pop/MCAsyncPOP.h12
-rw-r--r--src/async/pop/MCPOPAsyncSession.h2
-rw-r--r--src/async/pop/MCPOPDeleteMessagesOperation.h2
-rw-r--r--src/async/pop/MCPOPFetchHeaderOperation.h2
-rw-r--r--src/async/pop/MCPOPFetchMessageOperation.h2
-rw-r--r--src/async/pop/MCPOPFetchMessagesOperation.h2
-rw-r--r--src/async/pop/MCPOPOperation.h4
-rw-r--r--src/async/smtp/MCAsyncSMTP.h6
-rw-r--r--src/async/smtp/MCSMTPAsyncSession.h4
-rw-r--r--src/async/smtp/MCSMTPCheckAccountOperation.h4
-rw-r--r--src/async/smtp/MCSMTPOperation.h4
-rw-r--r--src/async/smtp/MCSMTPSendWithDataOperation.h6
-rw-r--r--src/core/MCCore.h14
-rw-r--r--src/core/abstract/MCAbstract.h14
-rw-r--r--src/core/abstract/MCAbstractMessage.h2
-rw-r--r--src/core/abstract/MCAbstractMessagePart.h4
-rw-r--r--src/core/abstract/MCAbstractMultipart.h4
-rw-r--r--src/core/abstract/MCAbstractPart.h4
-rw-r--r--src/core/abstract/MCAddress.h2
-rw-r--r--src/core/abstract/MCMessageHeader.h2
-rw-r--r--src/core/basetypes/MCArray.h2
-rw-r--r--src/core/basetypes/MCAutoreleasePool.h2
-rw-r--r--src/core/basetypes/MCBaseTypes.h34
-rw-r--r--src/core/basetypes/MCData.h4
-rw-r--r--src/core/basetypes/MCHTMLCleaner.h2
-rw-r--r--src/core/basetypes/MCHashMap.h2
-rw-r--r--src/core/basetypes/MCIndexSet.h4
-rw-r--r--src/core/basetypes/MCOperation.h2
-rw-r--r--src/core/basetypes/MCOperationQueue.h2
-rw-r--r--src/core/basetypes/MCSet.h2
-rw-r--r--src/core/basetypes/MCString.h4
-rw-r--r--src/core/basetypes/MCValue.h2
-rw-r--r--src/core/imap/MCIMAP.h22
-rw-r--r--src/core/imap/MCIMAPFolder.h4
-rw-r--r--src/core/imap/MCIMAPMessage.h8
-rw-r--r--src/core/imap/MCIMAPMessagePart.h2
-rw-r--r--src/core/imap/MCIMAPMultipart.h2
-rw-r--r--src/core/imap/MCIMAPNamespace.h2
-rw-r--r--src/core/imap/MCIMAPNamespaceItem.h2
-rw-r--r--src/core/imap/MCIMAPPart.h4
-rw-r--r--src/core/imap/MCIMAPSearchExpression.h4
-rw-r--r--src/core/imap/MCIMAPSession.h4
-rw-r--r--src/core/imap/MCIMAPSyncResult.h2
-rw-r--r--src/core/pop/MCPOP.h6
-rw-r--r--src/core/pop/MCPOPMessageInfo.h2
-rw-r--r--src/core/pop/MCPOPSession.h4
-rw-r--r--src/core/renderer/MCAddressDisplay.h2
-rw-r--r--src/core/renderer/MCDateFormatter.h2
-rw-r--r--src/core/renderer/MCHTMLRenderer.h6
-rw-r--r--src/core/renderer/MCHTMLRendererCallback.h4
-rw-r--r--src/core/renderer/MCRenderer.h2
-rw-r--r--src/core/renderer/MCSizeFormatter.h2
-rw-r--r--src/core/rfc822/MCAttachment.h8
-rw-r--r--src/core/rfc822/MCMessageBuilder.h4
-rw-r--r--src/core/rfc822/MCMessageParser.h6
-rw-r--r--src/core/rfc822/MCMessagePart.h4
-rw-r--r--src/core/rfc822/MCMultipart.h4
-rw-r--r--src/core/rfc822/MCRFC822.h10
-rw-r--r--src/core/smtp/MCSMTP.h4
-rw-r--r--src/core/smtp/MCSMTPSession.h4
-rw-r--r--src/mailcore.h6
-rw-r--r--src/objc/MCObjC.h12
-rw-r--r--src/objc/abstract/MCOAbstract.h16
-rw-r--r--src/objc/abstract/MCOAbstractMessagePart.h2
-rw-r--r--src/objc/abstract/MCOAbstractMultipart.h2
-rw-r--r--src/objc/abstract/MCOAbstractPart+Private.h2
-rw-r--r--src/objc/abstract/MCOHTMLRendererIMAPDelegate.h2
-rw-r--r--src/objc/imap/MCOIMAP.h50
-rw-r--r--src/objc/imap/MCOIMAPAppendMessageOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPBaseOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPCapabilityOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPCopyMessagesOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPFetchContentOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPFetchFoldersOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPFetchFoldersOperation.mm2
-rw-r--r--src/objc/imap/MCOIMAPFetchMessagesOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPFetchNamespaceOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPFolder.h2
-rw-r--r--src/objc/imap/MCOIMAPFolderInfoOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPIdentityOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPIdleOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPMessage.h4
-rw-r--r--src/objc/imap/MCOIMAPMessagePart.h2
-rw-r--r--src/objc/imap/MCOIMAPMultipart.h2
-rw-r--r--src/objc/imap/MCOIMAPOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPPart.h4
-rw-r--r--src/objc/imap/MCOIMAPSearchExpression.h2
-rw-r--r--src/objc/imap/MCOIMAPSearchOperation.h2
-rw-r--r--src/objc/imap/MCOIMAPSession.h2
-rw-r--r--src/objc/imap/MCOIMAPSession.mm2
-rw-r--r--src/objc/pop/MCOPOP.h12
-rw-r--r--src/objc/pop/MCOPOPFetchHeaderOperation.h2
-rw-r--r--src/objc/pop/MCOPOPFetchMessageOperation.h2
-rw-r--r--src/objc/pop/MCOPOPFetchMessagesOperation.h2
-rw-r--r--src/objc/pop/MCOPOPOperation.h2
-rw-r--r--src/objc/pop/MCOPOPSession.h2
-rw-r--r--src/objc/rfc822/MCOAttachment.h2
-rw-r--r--src/objc/rfc822/MCOMessageBuilder.h2
-rw-r--r--src/objc/rfc822/MCOMessageParser.h2
-rw-r--r--src/objc/rfc822/MCOMessagePart.h2
-rw-r--r--src/objc/rfc822/MCOMultipart.h2
-rw-r--r--src/objc/rfc822/MCORFC822.h10
-rw-r--r--src/objc/smtp/MCOSMTP.h6
-rw-r--r--src/objc/smtp/MCOSMTPOperation.h2
-rw-r--r--src/objc/smtp/MCOSMTPSendOperation.h2
-rw-r--r--src/objc/smtp/MCOSMTPSession.h2
-rw-r--r--src/objc/utils/MCOIndexSet.h2
-rw-r--r--src/objc/utils/MCOIndexSet.mm2
-rw-r--r--src/objc/utils/MCORange.h2
-rw-r--r--src/objc/utils/MCOUtils.h26
-rw-r--r--src/ui/mac/MCOCIDURLProtocol.h2
-rw-r--r--src/ui/mac/MCOMessageView.h2
-rw-r--r--tests/test-all.h2
-rw-r--r--tests/test-all.mm2
140 files changed, 379 insertions, 347 deletions
diff --git a/build-mac/framework-Info.plist b/build-mac/framework-Info.plist
new file mode 100644
index 00000000..e92ea282
--- /dev/null
+++ b/build-mac/framework-Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>com.libmailcore.${PRODUCT_NAME:rfc1034identifier}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright © 2013 MailCore. All rights reserved.</string>
+ <key>NSPrincipalClass</key>
+ <string></string>
+</dict>
+</plist>
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index ced5b166..1b131e71 100644
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -214,7 +214,7 @@
C6A81B961706840C00882C15 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6A81B951706840C00882C15 /* CoreGraphics.framework */; };
C6A81BAE1706847900882C15 /* test-all.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6A81BAC1706847900882C15 /* test-all.mm */; };
C6A81BAF170684D300882C15 /* test-all.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6A81BAC1706847900882C15 /* test-all.mm */; };
- C6A81BB2170685A700882C15 /* libmailcore2-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BA2C191705F4E6003F0E9E /* libmailcore2-ios.a */; };
+ C6A81BB2170685A700882C15 /* libMailCore-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BA2C191705F4E6003F0E9E /* libMailCore-ios.a */; };
C6A81BB41706891B00882C15 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6A81BB31706891B00882C15 /* CFNetwork.framework */; };
C6A81BBA17068C0600882C15 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6A81BB717068C0600882C15 /* AppDelegate.mm */; };
C6A81BBB17068C0600882C15 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C6A81BB817068C0600882C15 /* main.m */; };
@@ -524,11 +524,11 @@
C6BA2C131705F4E6003F0E9E /* MCOIMAPFolderInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.m */; };
C6BA2C141705F4E6003F0E9E /* MCOIMAPBaseOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61FB41702AB2F0073032E /* MCOIMAPBaseOperation.mm */; };
C6BD288F170BD71100A91AC1 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BD288E170BD71100A91AC1 /* Cocoa.framework */; };
- C6BD28A3170BD84F00A91AC1 /* libmailcore2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C64EA537169E772200778456 /* libmailcore2.a */; };
+ C6BD28A3170BD84F00A91AC1 /* libMailCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C64EA537169E772200778456 /* libMailCore.a */; };
C6BD28A7170BD99800A91AC1 /* mailcore.h in Headers */ = {isa = PBXBuildFile; fileRef = C64EA7A4169F2A3E00778456 /* mailcore.h */; settings = {ATTRIBUTES = (Public, ); }; };
C6BD28AA170BDB6B00A91AC1 /* MCOFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = C6BD28A8170BDB6B00A91AC1 /* MCOFramework.h */; };
C6BD28AB170BDB6B00A91AC1 /* MCOFramework.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6BD28A9170BDB6B00A91AC1 /* MCOFramework.mm */; };
- C6BD28AC170BDEA200A91AC1 /* MailCore2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BD288D170BD71100A91AC1 /* MailCore2.framework */; };
+ C6BD28AC170BDEA200A91AC1 /* MailCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BD288D170BD71100A91AC1 /* MailCore.framework */; };
C6CCC5C716FFE5190077A5FC /* MCORange.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6CCC5C616FFE5190077A5FC /* MCORange.mm */; };
C6CCC5C916FFEA070077A5FC /* MCORange.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6CCC5C816FFE54F0077A5FC /* MCORange.h */; };
C6CCC5CA16FFEA090077A5FC /* MCOIndexSet.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6F5B9F216FEAC6C00D9DABD /* MCOIndexSet.h */; };
@@ -596,13 +596,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- C64EA7A2169F2A1D00778456 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C64EA52E169E772200778456 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C64EA536169E772200778456;
- remoteInfo = mailcore2;
- };
C6A81BB01706852200882C15 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C64EA52E169E772200778456 /* Project object */;
@@ -617,6 +610,13 @@
remoteGlobalIDString = C64EA536169E772200778456;
remoteInfo = "static mailcore2 osx";
};
+ C6BD28B5170C034B00A91AC1 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = C64EA52E169E772200778456 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = C6BD288C170BD71100A91AC1;
+ remoteInfo = "mailcore osx";
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -1036,7 +1036,7 @@
C64BB26B16FD4C3B000DB34C /* MCORFC822.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCORFC822.h; sourceTree = "<group>"; };
C64BB26C16FD62FB000DB34C /* MCOUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCOUtils.h; sourceTree = "<group>"; };
C64BB26D16FD63F6000DB34C /* MCOConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOConstants.h; sourceTree = "<group>"; };
- C64EA537169E772200778456 /* libmailcore2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmailcore2.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ C64EA537169E772200778456 /* libMailCore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMailCore.a; sourceTree = BUILT_PRODUCTS_DIR; };
C64EA68C169E847800778456 /* MCIMAPAsyncConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPAsyncConnection.h; sourceTree = "<group>"; };
C64EA68F169E847800778456 /* MCSMTPAsyncSession.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCSMTPAsyncSession.cc; sourceTree = "<group>"; };
C64EA690169E847800778456 /* MCSMTPAsyncSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCSMTPAsyncSession.h; sourceTree = "<group>"; };
@@ -1212,8 +1212,8 @@
C6A81BFB170781BC00882C15 /* MCOPOP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOPOP.h; sourceTree = "<group>"; };
C6A81BFE1707CEE400882C15 /* MCOPOPMessageInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOPOPMessageInfo.h; sourceTree = "<group>"; };
C6A81BFF1707CEE500882C15 /* MCOPOPMessageInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOPOPMessageInfo.mm; sourceTree = "<group>"; };
- C6BA2C191705F4E6003F0E9E /* libmailcore2-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libmailcore2-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; };
- C6BD288D170BD71100A91AC1 /* MailCore2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MailCore2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ C6BA2C191705F4E6003F0E9E /* libMailCore-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libMailCore-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+ C6BD288D170BD71100A91AC1 /* MailCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MailCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C6BD288E170BD71100A91AC1 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
C6BD2891170BD71100A91AC1 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
C6BD2892170BD71100A91AC1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
@@ -1295,7 +1295,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- C6BD28AC170BDEA200A91AC1 /* MailCore2.framework in Frameworks */,
+ C6BD28AC170BDEA200A91AC1 /* MailCore.framework in Frameworks */,
C64EA7B116A00BBB00778456 /* CoreServices.framework in Frameworks */,
C64EA790169F259200778456 /* Foundation.framework in Frameworks */,
);
@@ -1306,7 +1306,7 @@
buildActionMask = 2147483647;
files = (
C6A81BB41706891B00882C15 /* CFNetwork.framework in Frameworks */,
- C6A81BB2170685A700882C15 /* libmailcore2-ios.a in Frameworks */,
+ C6A81BB2170685A700882C15 /* libMailCore-ios.a in Frameworks */,
C6A81B931706840C00882C15 /* UIKit.framework in Frameworks */,
C6A81B941706840C00882C15 /* Foundation.framework in Frameworks */,
C6A81B961706840C00882C15 /* CoreGraphics.framework in Frameworks */,
@@ -1324,7 +1324,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- C6BD28A3170BD84F00A91AC1 /* libmailcore2.a in Frameworks */,
+ C6BD28A3170BD84F00A91AC1 /* libMailCore.a in Frameworks */,
C6BD288F170BD71100A91AC1 /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1412,11 +1412,11 @@
C64EA538169E772200778456 /* Products */ = {
isa = PBXGroup;
children = (
- C64EA537169E772200778456 /* libmailcore2.a */,
+ C64EA537169E772200778456 /* libMailCore.a */,
C64EA78C169F259200778456 /* tests */,
- C6BA2C191705F4E6003F0E9E /* libmailcore2-ios.a */,
+ C6BA2C191705F4E6003F0E9E /* libMailCore-ios.a */,
C6A81B911706840C00882C15 /* test-ios.app */,
- C6BD288D170BD71100A91AC1 /* MailCore2.framework */,
+ C6BD288D170BD71100A91AC1 /* MailCore.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -1908,7 +1908,7 @@
);
name = "static mailcore2 osx";
productName = mailcore;
- productReference = C64EA537169E772200778456 /* libmailcore2.a */;
+ productReference = C64EA537169E772200778456 /* libMailCore.a */;
productType = "com.apple.product-type.library.static";
};
C64EA78B169F259200778456 /* tests */ = {
@@ -1922,7 +1922,7 @@
buildRules = (
);
dependencies = (
- C64EA7A3169F2A1D00778456 /* PBXTargetDependency */,
+ C6BD28B6170C034B00A91AC1 /* PBXTargetDependency */,
);
name = tests;
productName = tests;
@@ -1962,7 +1962,7 @@
);
name = "static mailcore2 ios";
productName = mailcore;
- productReference = C6BA2C191705F4E6003F0E9E /* libmailcore2-ios.a */;
+ productReference = C6BA2C191705F4E6003F0E9E /* libMailCore-ios.a */;
productType = "com.apple.product-type.library.static";
};
C6BD288C170BD71100A91AC1 /* mailcore osx */ = {
@@ -1982,7 +1982,7 @@
);
name = "mailcore osx";
productName = "mailcore framework";
- productReference = C6BD288D170BD71100A91AC1 /* MailCore2.framework */;
+ productReference = C6BD288D170BD71100A91AC1 /* MailCore.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
@@ -1991,7 +1991,7 @@
C64EA52E169E772200778456 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0460;
ORGANIZATIONNAME = MailCore;
};
buildConfigurationList = C64EA531169E772200778456 /* Build configuration list for PBXProject "mailcore2" */;
@@ -2385,11 +2385,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- C64EA7A3169F2A1D00778456 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = C64EA536169E772200778456 /* static mailcore2 osx */;
- targetProxy = C64EA7A2169F2A1D00778456 /* PBXContainerItemProxy */;
- };
C6A81BB11706852200882C15 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C6BA2B091705F4E6003F0E9E /* static mailcore2 ios */;
@@ -2400,6 +2395,11 @@
target = C64EA536169E772200778456 /* static mailcore2 osx */;
targetProxy = C6BD28A4170BD86A00A91AC1 /* PBXContainerItemProxy */;
};
+ C6BD28B6170C034B00A91AC1 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = C6BD288C170BD71100A91AC1 /* mailcore osx */;
+ targetProxy = C6BD28B5170C034B00A91AC1 /* PBXContainerItemProxy */;
+ };
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@@ -2563,16 +2563,18 @@
C64EA53C169E772200778456 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_PREFIX = lib;
- PRODUCT_NAME = mailcore2;
+ PRODUCT_NAME = MailCore;
};
name = Debug;
};
C64EA53D169E772200778456 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_PREFIX = lib;
- PRODUCT_NAME = mailcore2;
+ PRODUCT_NAME = MailCore;
};
name = Release;
};
@@ -2674,7 +2676,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libstdc++";
EXECUTABLE_PREFIX = lib;
- PRODUCT_NAME = "mailcore2-ios";
+ PRODUCT_NAME = "MailCore-ios";
SDKROOT = iphoneos;
};
name = Debug;
@@ -2686,7 +2688,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libstdc++";
EXECUTABLE_PREFIX = lib;
- PRODUCT_NAME = "mailcore2-ios";
+ PRODUCT_NAME = "MailCore-ios";
SDKROOT = iphoneos;
};
name = Release;
@@ -2713,7 +2715,7 @@
"-all_load",
"-ltidy",
);
- PRODUCT_NAME = MailCore2;
+ PRODUCT_NAME = MailCore;
WRAPPER_EXTENSION = framework;
};
name = Debug;
@@ -2740,7 +2742,7 @@
"-all_load",
"-ltidy",
);
- PRODUCT_NAME = MailCore2;
+ PRODUCT_NAME = MailCore;
WRAPPER_EXTENSION = framework;
};
name = Release;
diff --git a/src/async/MCAsync.h b/src/async/MCAsync.h
index 245bf15b..3198985d 100644
--- a/src/async/MCAsync.h
+++ b/src/async/MCAsync.h
@@ -9,8 +9,8 @@
#ifndef mailcore2_MCAsync_h
#define mailcore2_MCAsync_h
-#include <mailcore/MCAsyncSMTP.h>
-#include <mailcore/MCAsyncIMAP.h>
-#include <mailcore/MCAsyncPOP.h>
+#include <MailCore/MCAsyncSMTP.h>
+#include <MailCore/MCAsyncIMAP.h>
+#include <MailCore/MCAsyncPOP.h>
#endif
diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h
index 18ea5e20..441d05b4 100644
--- a/src/async/imap/MCAsyncIMAP.h
+++ b/src/async/imap/MCAsyncIMAP.h
@@ -9,22 +9,22 @@
#ifndef mailcore2_MCAsyncIMAP_h
#define mailcore2_MCAsyncIMAP_h
-#include <mailcore/MCIMAPAsyncSession.h>
-#include <mailcore/MCIMAPOperation.h>
-#include <mailcore/MCIMAPFetchFoldersOperation.h>
-#include <mailcore/MCIMAPAppendMessageOperation.h>
-#include <mailcore/MCIMAPCopyMessagesOperation.h>
-#include <mailcore/MCIMAPFetchMessagesOperation.h>
-#include <mailcore/MCIMAPFetchContentOperation.h>
-#include <mailcore/MCIMAPIdleOperation.h>
-#include <mailcore/MCIMAPFolderInfoOperation.h>
-#include <mailcore/MCIMAPSession.h>
-#include <mailcore/MCIMAPNamespace.h>
-#include <mailcore/MCIMAPSearchOperation.h>
-#include <mailcore/MCIMAPSearchExpression.h>
-#include <mailcore/MCIMAPFetchNamespaceOperation.h>
-#include <mailcore/MCIMAPIdentityOperation.h>
-#include <mailcore/MCIMAPCapabilityOperation.h>
-#include <mailcore/MCIMAPOperationCallback.h>
+#include <MailCore/MCIMAPAsyncSession.h>
+#include <MailCore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPFetchFoldersOperation.h>
+#include <MailCore/MCIMAPAppendMessageOperation.h>
+#include <MailCore/MCIMAPCopyMessagesOperation.h>
+#include <MailCore/MCIMAPFetchMessagesOperation.h>
+#include <MailCore/MCIMAPFetchContentOperation.h>
+#include <MailCore/MCIMAPIdleOperation.h>
+#include <MailCore/MCIMAPFolderInfoOperation.h>
+#include <MailCore/MCIMAPSession.h>
+#include <MailCore/MCIMAPNamespace.h>
+#include <MailCore/MCIMAPSearchOperation.h>
+#include <MailCore/MCIMAPSearchExpression.h>
+#include <MailCore/MCIMAPFetchNamespaceOperation.h>
+#include <MailCore/MCIMAPIdentityOperation.h>
+#include <MailCore/MCIMAPCapabilityOperation.h>
+#include <MailCore/MCIMAPOperationCallback.h>
#endif
diff --git a/src/async/imap/MCIMAPAppendMessageOperation.h b/src/async/imap/MCIMAPAppendMessageOperation.h
index 15b18e2f..3a047adb 100644
--- a/src/async/imap/MCIMAPAppendMessageOperation.h
+++ b/src/async/imap/MCIMAPAppendMessageOperation.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCIMAPAppendMessageOperation__
#define __mailcore2__MCIMAPAppendMessageOperation__
-#include <mailcore/MCIMAPOperation.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCIMAPOperation.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h
index 12efcf14..2cbc4ef9 100644
--- a/src/async/imap/MCIMAPAsyncConnection.h
+++ b/src/async/imap/MCIMAPAsyncConnection.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCIMAPASYNCCONNECTION_H
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h
index 874ae571..3a11256b 100644
--- a/src/async/imap/MCIMAPAsyncSession.h
+++ b/src/async/imap/MCIMAPAsyncSession.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCIMAPAccount__
#define __mailcore2__MCIMAPAccount__
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPCapabilityOperation.h b/src/async/imap/MCIMAPCapabilityOperation.h
index f11828bb..8fb76dc2 100644
--- a/src/async/imap/MCIMAPCapabilityOperation.h
+++ b/src/async/imap/MCIMAPCapabilityOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPCapabilityOperation__
#define __mailcore2__MCIMAPCapabilityOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h
index 7d61645b..c0f2f4f7 100644
--- a/src/async/imap/MCIMAPCheckAccountOperation.h
+++ b/src/async/imap/MCIMAPCheckAccountOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPCheckAccountOperation__
#define __mailcore2__MCIMAPCheckAccountOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPCopyMessagesOperation.h b/src/async/imap/MCIMAPCopyMessagesOperation.h
index 9f8e75f0..a37d442e 100644
--- a/src/async/imap/MCIMAPCopyMessagesOperation.h
+++ b/src/async/imap/MCIMAPCopyMessagesOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPCopyMessagesOperation__
#define __mailcore2__MCIMAPCopyMessagesOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPCreateFolderOperation.h b/src/async/imap/MCIMAPCreateFolderOperation.h
index d37abfba..ff8955fe 100644
--- a/src/async/imap/MCIMAPCreateFolderOperation.h
+++ b/src/async/imap/MCIMAPCreateFolderOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPCreateFolderOperation__
#define __mailcore2__MCIMAPCreateFolderOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPDeleteFolderOperation.h b/src/async/imap/MCIMAPDeleteFolderOperation.h
index 99027456..c5d7cbfc 100644
--- a/src/async/imap/MCIMAPDeleteFolderOperation.h
+++ b/src/async/imap/MCIMAPDeleteFolderOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPDeleteFolderOperation__
#define __mailcore2__MCIMAPDeleteFolderOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPExpungeOperation.h b/src/async/imap/MCIMAPExpungeOperation.h
index fbdf8118..5ed86352 100644
--- a/src/async/imap/MCIMAPExpungeOperation.h
+++ b/src/async/imap/MCIMAPExpungeOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPExpungeOperation__
#define __mailcore2__MCIMAPExpungeOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPFetchContentOperation.h b/src/async/imap/MCIMAPFetchContentOperation.h
index 390c57b7..5ea0fe01 100644
--- a/src/async/imap/MCIMAPFetchContentOperation.h
+++ b/src/async/imap/MCIMAPFetchContentOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__IMAPFetchContentOperation__
#define __mailcore2__IMAPFetchContentOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h
index 025a3210..84d2a87f 100644
--- a/src/async/imap/MCIMAPFetchFoldersOperation.h
+++ b/src/async/imap/MCIMAPFetchFoldersOperation.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCIMAPFetchFoldersOperation__
#define __mailcore2__MCIMAPFetchFoldersOperation__
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h
index 4afa59e5..42f0ea0a 100644
--- a/src/async/imap/MCIMAPFetchMessagesOperation.h
+++ b/src/async/imap/MCIMAPFetchMessagesOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__IMAPFetchMessagesOperation__
#define __mailcore2__IMAPFetchMessagesOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPFetchNamespaceOperation.h b/src/async/imap/MCIMAPFetchNamespaceOperation.h
index 5e18b38a..8fa348b1 100644
--- a/src/async/imap/MCIMAPFetchNamespaceOperation.h
+++ b/src/async/imap/MCIMAPFetchNamespaceOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__IMAPFetchNamespaceOperation__
#define __mailcore2__IMAPFetchNamespaceOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h
index bce16579..f11bb7ca 100644
--- a/src/async/imap/MCIMAPFolderInfoOperation.h
+++ b/src/async/imap/MCIMAPFolderInfoOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPFolderInfoOperation__
#define __mailcore2__MCIMAPFolderInfoOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPIdentityOperation.h b/src/async/imap/MCIMAPIdentityOperation.h
index 22a27a28..1cd2d662 100644
--- a/src/async/imap/MCIMAPIdentityOperation.h
+++ b/src/async/imap/MCIMAPIdentityOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__IMAPIdentityOperation__
#define __mailcore2__IMAPIdentityOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h
index 5841c73d..3ba5fdf4 100644
--- a/src/async/imap/MCIMAPIdleOperation.h
+++ b/src/async/imap/MCIMAPIdleOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__IMAPIdleOperation__
#define __mailcore2__IMAPIdleOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPOperation.h b/src/async/imap/MCIMAPOperation.h
index 57541993..7a8c1384 100644
--- a/src/async/imap/MCIMAPOperation.h
+++ b/src/async/imap/MCIMAPOperation.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCIMAPOperation__
#define __mailcore2__MCIMAPOperation__
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCIMAPProgressCallback.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCIMAPProgressCallback.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPRenameFolderOperation.h b/src/async/imap/MCIMAPRenameFolderOperation.h
index 83f949bf..cd966794 100644
--- a/src/async/imap/MCIMAPRenameFolderOperation.h
+++ b/src/async/imap/MCIMAPRenameFolderOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPRenameFolderOperation__
#define __mailcore2__MCIMAPRenameFolderOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPSearchOperation.h b/src/async/imap/MCIMAPSearchOperation.h
index 96efb35b..7063284a 100644
--- a/src/async/imap/MCIMAPSearchOperation.h
+++ b/src/async/imap/MCIMAPSearchOperation.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__IMAPSearchOperation__
#define __mailcore2__IMAPSearchOperation__
-#include <mailcore/MCIMAPOperation.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCIMAPOperation.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPStoreFlagsOperation.h b/src/async/imap/MCIMAPStoreFlagsOperation.h
index 6e50e015..cf5655ec 100644
--- a/src/async/imap/MCIMAPStoreFlagsOperation.h
+++ b/src/async/imap/MCIMAPStoreFlagsOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPStoreFlagsOperation__
#define __mailcore2__MCIMAPStoreFlagsOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h
index 3e5cad2c..cf6e1925 100644
--- a/src/async/imap/MCIMAPStoreLabelsOperation.h
+++ b/src/async/imap/MCIMAPStoreLabelsOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPStoreLabelsOperation__
#define __mailcore2__MCIMAPStoreLabelsOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPSubscribeFolderOperation.h b/src/async/imap/MCIMAPSubscribeFolderOperation.h
index 277a87ad..1a344378 100644
--- a/src/async/imap/MCIMAPSubscribeFolderOperation.h
+++ b/src/async/imap/MCIMAPSubscribeFolderOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPSubscribeFolderOperation__
#define __mailcore2__MCIMAPSubscribeFolderOperation__
-#include <mailcore/MCIMAPOperation.h>
+#include <MailCore/MCIMAPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/pop/MCAsyncPOP.h b/src/async/pop/MCAsyncPOP.h
index d41d406d..962b6ab9 100644
--- a/src/async/pop/MCAsyncPOP.h
+++ b/src/async/pop/MCAsyncPOP.h
@@ -9,11 +9,11 @@
#ifndef mailcore2_MCAsyncPOP_h
#define mailcore2_MCAsyncPOP_h
-#include <mailcore/MCPOPAsyncSession.h>
-#include <mailcore/MCPOPOperation.h>
-#include <mailcore/MCPOPFetchHeaderOperation.h>
-#include <mailcore/MCPOPFetchMessageOperation.h>
-#include <mailcore/MCPOPFetchMessagesOperation.h>
-#include <mailcore/MCPOPOperationCallback.h>
+#include <MailCore/MCPOPAsyncSession.h>
+#include <MailCore/MCPOPOperation.h>
+#include <MailCore/MCPOPFetchHeaderOperation.h>
+#include <MailCore/MCPOPFetchMessageOperation.h>
+#include <MailCore/MCPOPFetchMessagesOperation.h>
+#include <MailCore/MCPOPOperationCallback.h>
#endif
diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h
index 66401eb6..48dae219 100644
--- a/src/async/pop/MCPOPAsyncSession.h
+++ b/src/async/pop/MCPOPAsyncSession.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCPopAsyncSession__
#define __mailcore2__MCPopAsyncSession__
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#ifdef __cplusplus
diff --git a/src/async/pop/MCPOPDeleteMessagesOperation.h b/src/async/pop/MCPOPDeleteMessagesOperation.h
index c7819ce6..7056ad9c 100644
--- a/src/async/pop/MCPOPDeleteMessagesOperation.h
+++ b/src/async/pop/MCPOPDeleteMessagesOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCPOPDeleteMessagesOperation__
#define __mailcore2__MCPOPDeleteMessagesOperation__
-#include <mailcore/MCPOPOperation.h>
+#include <MailCore/MCPOPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h
index 1ad4a40b..038769a3 100644
--- a/src/async/pop/MCPOPFetchHeaderOperation.h
+++ b/src/async/pop/MCPOPFetchHeaderOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCPOPFetchHeaderOperation__
#define __mailcore2__MCPOPFetchHeaderOperation__
-#include <mailcore/MCPOPOperation.h>
+#include <MailCore/MCPOPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h
index 7b61db8a..10864a70 100644
--- a/src/async/pop/MCPOPFetchMessageOperation.h
+++ b/src/async/pop/MCPOPFetchMessageOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCPOPFetchMessageOperation__
#define __mailcore2__MCPOPFetchMessageOperation__
-#include <mailcore/MCPOPOperation.h>
+#include <MailCore/MCPOPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h
index 1078257c..6a3d099a 100644
--- a/src/async/pop/MCPOPFetchMessagesOperation.h
+++ b/src/async/pop/MCPOPFetchMessagesOperation.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCPOPFetchMessagesOperation__
#define __mailcore2__MCPOPFetchMessagesOperation__
-#include <mailcore/MCPOPOperation.h>
+#include <MailCore/MCPOPOperation.h>
#ifdef __cplusplus
diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h
index e621caa0..d1ce9f94 100644
--- a/src/async/pop/MCPOPOperation.h
+++ b/src/async/pop/MCPOPOperation.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCPOPOperation__
#define __mailcore2__MCPOPOperation__
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCPOPProgressCallback.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCPOPProgressCallback.h>
#ifdef __cplusplus
diff --git a/src/async/smtp/MCAsyncSMTP.h b/src/async/smtp/MCAsyncSMTP.h
index 5d5e8282..1c565d25 100644
--- a/src/async/smtp/MCAsyncSMTP.h
+++ b/src/async/smtp/MCAsyncSMTP.h
@@ -9,8 +9,8 @@
#ifndef mailcore2_MCAsyncSMTP_h
#define mailcore2_MCAsyncSMTP_h
-#include <mailcore/MCSMTPAsyncSession.h>
-#include <mailcore/MCSMTPOperation.h>
-#include <mailcore/MCSMTPOperationCallback.h>
+#include <MailCore/MCSMTPAsyncSession.h>
+#include <MailCore/MCSMTPOperation.h>
+#include <MailCore/MCSMTPOperationCallback.h>
#endif
diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h
index 3159809b..6b1538c4 100644
--- a/src/async/smtp/MCSMTPAsyncSession.h
+++ b/src/async/smtp/MCSMTPAsyncSession.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCSMTPASYNCSESSION_H
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#include <libetpan/libetpan.h>
#ifdef __cplusplus
diff --git a/src/async/smtp/MCSMTPCheckAccountOperation.h b/src/async/smtp/MCSMTPCheckAccountOperation.h
index 68850d15..5eb2bfbd 100644
--- a/src/async/smtp/MCSMTPCheckAccountOperation.h
+++ b/src/async/smtp/MCSMTPCheckAccountOperation.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCSMTPCheckAccountOperation__
#define __mailcore2__MCSMTPCheckAccountOperation__
-#include <mailcore/MCSMTPOperation.h>
-#include <mailcore/MCAbstract.h>
+#include <MailCore/MCSMTPOperation.h>
+#include <MailCore/MCAbstract.h>
#ifdef __cplusplus
diff --git a/src/async/smtp/MCSMTPOperation.h b/src/async/smtp/MCSMTPOperation.h
index d41154d1..79846532 100644
--- a/src/async/smtp/MCSMTPOperation.h
+++ b/src/async/smtp/MCSMTPOperation.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCSMTPOperation__
#define __mailcore2__MCSMTPOperation__
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCSMTPProgressCallback.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCSMTPProgressCallback.h>
#ifdef __cplusplus
diff --git a/src/async/smtp/MCSMTPSendWithDataOperation.h b/src/async/smtp/MCSMTPSendWithDataOperation.h
index 105cb751..8e9b6cd9 100644
--- a/src/async/smtp/MCSMTPSendWithDataOperation.h
+++ b/src/async/smtp/MCSMTPSendWithDataOperation.h
@@ -9,9 +9,9 @@
#ifndef __mailcore2__MCSMTPSendWithDataOperation__
#define __mailcore2__MCSMTPSendWithDataOperation__
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstract.h>
-#include <mailcore/MCSMTPOperation.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstract.h>
+#include <MailCore/MCSMTPOperation.h>
#ifdef __cplusplus
diff --git a/src/core/MCCore.h b/src/core/MCCore.h
index a909e677..952ae1b5 100644
--- a/src/core/MCCore.h
+++ b/src/core/MCCore.h
@@ -9,12 +9,12 @@
#ifndef __MAILCORE_MCCORE_H_
#define __MAILCORE_MCCORE_H_
-#include <mailcore/MCAbstract.h>
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCIMAP.h>
-#include <mailcore/MCPOP.h>
-#include <mailcore/MCRFC822.h>
-#include <mailcore/MCSMTP.h>
-#include <mailcore/MCRenderer.h>
+#include <MailCore/MCAbstract.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCIMAP.h>
+#include <MailCore/MCPOP.h>
+#include <MailCore/MCRFC822.h>
+#include <MailCore/MCSMTP.h>
+#include <MailCore/MCRenderer.h>
#endif
diff --git a/src/core/abstract/MCAbstract.h b/src/core/abstract/MCAbstract.h
index fd36af46..d53a69a4 100644
--- a/src/core/abstract/MCAbstract.h
+++ b/src/core/abstract/MCAbstract.h
@@ -2,12 +2,12 @@
#define __MAILCORE_MCABSTRACT_H
-#include <mailcore/MCAbstractMessage.h>
-#include <mailcore/MCAbstractMessagePart.h>
-#include <mailcore/MCAbstractMultipart.h>
-#include <mailcore/MCAbstractPart.h>
-#include <mailcore/MCAddress.h>
-#include <mailcore/MCMessageConstants.h>
-#include <mailcore/MCMessageHeader.h>
+#include <MailCore/MCAbstractMessage.h>
+#include <MailCore/MCAbstractMessagePart.h>
+#include <MailCore/MCAbstractMultipart.h>
+#include <MailCore/MCAbstractPart.h>
+#include <MailCore/MCAddress.h>
+#include <MailCore/MCMessageConstants.h>
+#include <MailCore/MCMessageHeader.h>
#endif
diff --git a/src/core/abstract/MCAbstractMessage.h b/src/core/abstract/MCAbstractMessage.h
index 9dccdbb8..657ddaa5 100644
--- a/src/core/abstract/MCAbstractMessage.h
+++ b/src/core/abstract/MCAbstractMessage.h
@@ -1,7 +1,7 @@
#ifndef __MAILCORE_MCABSTRACTMESSAGE_H_
#define __MAILCORE_MCABSTRACTMESSAGE_H_
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#ifdef __cplusplus
diff --git a/src/core/abstract/MCAbstractMessagePart.h b/src/core/abstract/MCAbstractMessagePart.h
index 1bc6981e..1ff1def6 100644
--- a/src/core/abstract/MCAbstractMessagePart.h
+++ b/src/core/abstract/MCAbstractMessagePart.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCABSTRACTMESSAGEPART_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstractPart.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstractPart.h>
#ifdef __cplusplus
diff --git a/src/core/abstract/MCAbstractMultipart.h b/src/core/abstract/MCAbstractMultipart.h
index ca2a163b..da77f9a6 100644
--- a/src/core/abstract/MCAbstractMultipart.h
+++ b/src/core/abstract/MCAbstractMultipart.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCABSTRACTMULTIPART_H
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstractPart.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstractPart.h>
#ifdef __cplusplus
diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h
index 49360089..970b5e04 100644
--- a/src/core/abstract/MCAbstractPart.h
+++ b/src/core/abstract/MCAbstractPart.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCABSTRACTPART_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/core/abstract/MCAddress.h b/src/core/abstract/MCAddress.h
index add45f7d..9ed71414 100644
--- a/src/core/abstract/MCAddress.h
+++ b/src/core/abstract/MCAddress.h
@@ -3,7 +3,7 @@
#define __MAILCORE_MCADDRESS_H_
#include <libetpan/libetpan.h>
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#ifdef __cplusplus
diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h
index c8e2c5f6..3e481db3 100644
--- a/src/core/abstract/MCMessageHeader.h
+++ b/src/core/abstract/MCMessageHeader.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCMESSAGEHEADER_H_
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#include <time.h>
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCArray.h b/src/core/basetypes/MCArray.h
index c6dd1090..6ee17549 100644
--- a/src/core/basetypes/MCArray.h
+++ b/src/core/basetypes/MCArray.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCARRAY_H_
-#include <mailcore/MCObject.h>
+#include <MailCore/MCObject.h>
#include <libetpan/libetpan.h>
diff --git a/src/core/basetypes/MCAutoreleasePool.h b/src/core/basetypes/MCAutoreleasePool.h
index 583015c9..6d0b2ad2 100644
--- a/src/core/basetypes/MCAutoreleasePool.h
+++ b/src/core/basetypes/MCAutoreleasePool.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCAUTORELEASEPOOL_H_
-#include <mailcore/MCObject.h>
+#include <MailCore/MCObject.h>
#include <libetpan/libetpan.h>
#include <pthread.h>
diff --git a/src/core/basetypes/MCBaseTypes.h b/src/core/basetypes/MCBaseTypes.h
index d5b12083..8ce52531 100644
--- a/src/core/basetypes/MCBaseTypes.h
+++ b/src/core/basetypes/MCBaseTypes.h
@@ -2,22 +2,22 @@
#define __MAILCORE_MCBASETYPES_H_
-#include <mailcore/MCAutoreleasePool.h>
-#include <mailcore/MCObject.h>
-#include <mailcore/MCValue.h>
-#include <mailcore/MCString.h>
-#include <mailcore/MCData.h>
-#include <mailcore/MCArray.h>
-#include <mailcore/MCHashMap.h>
-#include <mailcore/MCSet.h>
-#include <mailcore/MCHash.h>
-#include <mailcore/MCLog.h>
-#include <mailcore/MCAssert.h>
-#include <mailcore/MCUtils.h>
-#include <mailcore/MCRange.h>
-#include <mailcore/MCIndexSet.h>
-#include <mailcore/MCOperation.h>
-#include <mailcore/MCOperationQueue.h>
-#include <mailcore/MCOperationCallback.h>
+#include <MailCore/MCAutoreleasePool.h>
+#include <MailCore/MCObject.h>
+#include <MailCore/MCValue.h>
+#include <MailCore/MCString.h>
+#include <MailCore/MCData.h>
+#include <MailCore/MCArray.h>
+#include <MailCore/MCHashMap.h>
+#include <MailCore/MCSet.h>
+#include <MailCore/MCHash.h>
+#include <MailCore/MCLog.h>
+#include <MailCore/MCAssert.h>
+#include <MailCore/MCUtils.h>
+#include <MailCore/MCRange.h>
+#include <MailCore/MCIndexSet.h>
+#include <MailCore/MCOperation.h>
+#include <MailCore/MCOperationQueue.h>
+#include <MailCore/MCOperationCallback.h>
#endif
diff --git a/src/core/basetypes/MCData.h b/src/core/basetypes/MCData.h
index 7a9d6db7..a8f3fe8b 100644
--- a/src/core/basetypes/MCData.h
+++ b/src/core/basetypes/MCData.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCDATA_H_
-#include <mailcore/MCObject.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCObject.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCHTMLCleaner.h b/src/core/basetypes/MCHTMLCleaner.h
index f4707872..81af69df 100644
--- a/src/core/basetypes/MCHTMLCleaner.h
+++ b/src/core/basetypes/MCHTMLCleaner.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__HTMLCleaner__
#define __mailcore2__HTMLCleaner__
-#include <mailcore/MCString.h>
+#include <MailCore/MCString.h>
namespace mailcore {
diff --git a/src/core/basetypes/MCHashMap.h b/src/core/basetypes/MCHashMap.h
index 92700190..40751b8e 100644
--- a/src/core/basetypes/MCHashMap.h
+++ b/src/core/basetypes/MCHashMap.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCHASHMAP_H_
-#include <mailcore/MCObject.h>
+#include <MailCore/MCObject.h>
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h
index 3d9bdb6c..461bb063 100644
--- a/src/core/basetypes/MCIndexSet.h
+++ b/src/core/basetypes/MCIndexSet.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCIndexSet__
#define __mailcore2__MCIndexSet__
-#include <mailcore/MCObject.h>
-#include <mailcore/MCRange.h>
+#include <MailCore/MCObject.h>
+#include <MailCore/MCRange.h>
#include <inttypes.h>
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCOperation.h b/src/core/basetypes/MCOperation.h
index e5b8fa33..71d0b465 100644
--- a/src/core/basetypes/MCOperation.h
+++ b/src/core/basetypes/MCOperation.h
@@ -3,7 +3,7 @@
#define __MAILCORE_MCOPERATION_H_
#include <pthread.h>
-#include <mailcore/MCObject.h>
+#include <MailCore/MCObject.h>
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCOperationQueue.h b/src/core/basetypes/MCOperationQueue.h
index dd503bb3..02f77d7a 100644
--- a/src/core/basetypes/MCOperationQueue.h
+++ b/src/core/basetypes/MCOperationQueue.h
@@ -4,7 +4,7 @@
#include <pthread.h>
#include <semaphore.h>
-#include <mailcore/MCObject.h>
+#include <MailCore/MCObject.h>
#include <libetpan/libetpan.h>
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCSet.h b/src/core/basetypes/MCSet.h
index 2d6df20c..8b82ad33 100644
--- a/src/core/basetypes/MCSet.h
+++ b/src/core/basetypes/MCSet.h
@@ -2,7 +2,7 @@
#define __MAILCORE_CSET_H_
-#include <mailcore/MCObject.h>
+#include <MailCore/MCObject.h>
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h
index 521291d3..53a27068 100644
--- a/src/core/basetypes/MCString.h
+++ b/src/core/basetypes/MCString.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCSTR_H_
-#include <mailcore/MCObject.h>
-#include <mailcore/MCRange.h>
+#include <MailCore/MCObject.h>
+#include <MailCore/MCRange.h>
#include <stdarg.h>
#include <unicode/utypes.h>
diff --git a/src/core/basetypes/MCValue.h b/src/core/basetypes/MCValue.h
index 52866235..09c05d6b 100644
--- a/src/core/basetypes/MCValue.h
+++ b/src/core/basetypes/MCValue.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCVALUE_H_
-#include <mailcore/MCObject.h>
+#include <MailCore/MCObject.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAP.h b/src/core/imap/MCIMAP.h
index 28782163..add670a2 100644
--- a/src/core/imap/MCIMAP.h
+++ b/src/core/imap/MCIMAP.h
@@ -2,16 +2,16 @@
#define __MAILCORE_MCIMAP_H_
-#include <mailcore/MCIMAPFolder.h>
-#include <mailcore/MCIMAPMessage.h>
-#include <mailcore/MCIMAPMessagePart.h>
-#include <mailcore/MCIMAPMultipart.h>
-#include <mailcore/MCIMAPNamespace.h>
-#include <mailcore/MCIMAPNamespaceItem.h>
-#include <mailcore/MCIMAPPart.h>
-#include <mailcore/MCIMAPProgressCallback.h>
-#include <mailcore/MCIMAPSearchExpression.h>
-#include <mailcore/MCIMAPSession.h>
-#include <mailcore/MCIMAPSyncResult.h>
+#include <MailCore/MCIMAPFolder.h>
+#include <MailCore/MCIMAPMessage.h>
+#include <MailCore/MCIMAPMessagePart.h>
+#include <MailCore/MCIMAPMultipart.h>
+#include <MailCore/MCIMAPNamespace.h>
+#include <MailCore/MCIMAPNamespaceItem.h>
+#include <MailCore/MCIMAPPart.h>
+#include <MailCore/MCIMAPProgressCallback.h>
+#include <MailCore/MCIMAPSearchExpression.h>
+#include <MailCore/MCIMAPSession.h>
+#include <MailCore/MCIMAPSyncResult.h>
#endif
diff --git a/src/core/imap/MCIMAPFolder.h b/src/core/imap/MCIMAPFolder.h
index 23a4a831..f4f6e7ef 100644
--- a/src/core/imap/MCIMAPFolder.h
+++ b/src/core/imap/MCIMAPFolder.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCIMAPFOLDER_H
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h
index fdf2779b..5bc5f843 100644
--- a/src/core/imap/MCIMAPMessage.h
+++ b/src/core/imap/MCIMAPMessage.h
@@ -2,10 +2,10 @@
#define __MAILCORE_IMAP_MESSAGE_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstractMessage.h>
-#include <mailcore/MCMessageConstants.h>
-#include <mailcore/MCAbstractPart.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstractMessage.h>
+#include <MailCore/MCMessageConstants.h>
+#include <MailCore/MCAbstractPart.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPMessagePart.h b/src/core/imap/MCIMAPMessagePart.h
index 8e23eff2..a4ff6e39 100644
--- a/src/core/imap/MCIMAPMessagePart.h
+++ b/src/core/imap/MCIMAPMessagePart.h
@@ -2,7 +2,7 @@
#define __MAILCORE_IMAPMESSAGEPART_H_
-#include <mailcore/MCAbstractMessagePart.h>
+#include <MailCore/MCAbstractMessagePart.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPMultipart.h b/src/core/imap/MCIMAPMultipart.h
index 02ee5cf8..126a4398 100644
--- a/src/core/imap/MCIMAPMultipart.h
+++ b/src/core/imap/MCIMAPMultipart.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCIMAPMULTIPART_H
-#include <mailcore/MCAbstractMultipart.h>
+#include <MailCore/MCAbstractMultipart.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h
index faf15330..09c029e2 100644
--- a/src/core/imap/MCIMAPNamespace.h
+++ b/src/core/imap/MCIMAPNamespace.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCIMAPNAMESPACE_H_
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h
index 7ac96a35..4cee0aea 100644
--- a/src/core/imap/MCIMAPNamespaceItem.h
+++ b/src/core/imap/MCIMAPNamespaceItem.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCIMAPNAMESPACEITEM_H
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h
index 44d03b2f..bca5a5bb 100644
--- a/src/core/imap/MCIMAPPart.h
+++ b/src/core/imap/MCIMAPPart.h
@@ -2,9 +2,9 @@
#define __MAILCORE_MCIMAPPART_H_
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#include <libetpan/libetpan.h>
-#include <mailcore/MCAbstractPart.h>
+#include <MailCore/MCAbstractPart.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index b6546507..59028092 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCIMAPSEARCHEXPRESSION_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index bd31527e..fc6a8456 100644
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCIMAPSESSION_H
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#include <libetpan/libetpan.h>
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h
index 3505a441..74a42355 100644
--- a/src/core/imap/MCIMAPSyncResult.h
+++ b/src/core/imap/MCIMAPSyncResult.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__MCIMAPSyncResult__
#define __mailcore2__MCIMAPSyncResult__
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#ifdef __cplusplus
diff --git a/src/core/pop/MCPOP.h b/src/core/pop/MCPOP.h
index 7651f9e6..c72498f6 100644
--- a/src/core/pop/MCPOP.h
+++ b/src/core/pop/MCPOP.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCPOP_H
-#include <mailcore/MCPOPMessageInfo.h>
-#include <mailcore/MCPOPProgressCallback.h>
-#include <mailcore/MCPOPSession.h>
+#include <MailCore/MCPOPMessageInfo.h>
+#include <MailCore/MCPOPProgressCallback.h>
+#include <MailCore/MCPOPSession.h>
#endif
diff --git a/src/core/pop/MCPOPMessageInfo.h b/src/core/pop/MCPOPMessageInfo.h
index 5a87b3e4..f7bb9f18 100644
--- a/src/core/pop/MCPOPMessageInfo.h
+++ b/src/core/pop/MCPOPMessageInfo.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCPOPMESSAGEINFO_H_
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#ifdef __cplusplus
diff --git a/src/core/pop/MCPOPSession.h b/src/core/pop/MCPOPSession.h
index 1f9af5cc..22eca94b 100644
--- a/src/core/pop/MCPOPSession.h
+++ b/src/core/pop/MCPOPSession.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCPOPSESSION_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#include <libetpan/libetpan.h>
#ifdef __cplusplus
diff --git a/src/core/renderer/MCAddressDisplay.h b/src/core/renderer/MCAddressDisplay.h
index 153ad245..167bce9e 100644
--- a/src/core/renderer/MCAddressDisplay.h
+++ b/src/core/renderer/MCAddressDisplay.h
@@ -9,7 +9,7 @@
#ifndef __MCAddressDisplay__
#define __MCAddressDisplay__
-#include <mailcore/MCAbstract.h>
+#include <MailCore/MCAbstract.h>
#ifdef __cplusplus
diff --git a/src/core/renderer/MCDateFormatter.h b/src/core/renderer/MCDateFormatter.h
index 6467aae6..2649f7ae 100644
--- a/src/core/renderer/MCDateFormatter.h
+++ b/src/core/renderer/MCDateFormatter.h
@@ -9,7 +9,7 @@
#ifndef __testUI__MCDateFormatter__
#define __testUI__MCDateFormatter__
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#include <unicode/udat.h>
#ifdef __cplusplus
diff --git a/src/core/renderer/MCHTMLRenderer.h b/src/core/renderer/MCHTMLRenderer.h
index 042625cf..5de2056f 100644
--- a/src/core/renderer/MCHTMLRenderer.h
+++ b/src/core/renderer/MCHTMLRenderer.h
@@ -9,9 +9,9 @@
#ifndef __testUI__MCHTMLRenderer__
#define __testUI__MCHTMLRenderer__
-#include <mailcore/MCAbstract.h>
-#include <mailcore/MCIMAP.h>
-#include <mailcore/MCRFC822.h>
+#include <MailCore/MCAbstract.h>
+#include <MailCore/MCIMAP.h>
+#include <MailCore/MCRFC822.h>
#ifdef __cplusplus
diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h
index fdccdce2..6c900827 100644
--- a/src/core/renderer/MCHTMLRendererCallback.h
+++ b/src/core/renderer/MCHTMLRendererCallback.h
@@ -9,8 +9,8 @@
#ifndef __mailcore2__MCHTMLRendererCallback__
#define __mailcore2__MCHTMLRendererCallback__
-#include <mailcore/MCAbstract.h>
-#include <mailcore/MCIMAP.h>
+#include <MailCore/MCAbstract.h>
+#include <MailCore/MCIMAP.h>
#ifdef __cplusplus
diff --git a/src/core/renderer/MCRenderer.h b/src/core/renderer/MCRenderer.h
index 65999f95..b79b160d 100644
--- a/src/core/renderer/MCRenderer.h
+++ b/src/core/renderer/MCRenderer.h
@@ -9,6 +9,6 @@
#ifndef mailcore2_MCRenderer_h
#define mailcore2_MCRenderer_h
-#include <mailcore/MCHTMLRendererCallback.h>
+#include <MailCore/MCHTMLRendererCallback.h>
#endif
diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h
index a6c74010..625c1d3d 100644
--- a/src/core/renderer/MCSizeFormatter.h
+++ b/src/core/renderer/MCSizeFormatter.h
@@ -9,7 +9,7 @@
#ifndef __testUI__MCSizeFormatter__
#define __testUI__MCSizeFormatter__
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#ifdef __cplusplus
diff --git a/src/core/rfc822/MCAttachment.h b/src/core/rfc822/MCAttachment.h
index ed0d8f1d..c1fc232e 100644
--- a/src/core/rfc822/MCAttachment.h
+++ b/src/core/rfc822/MCAttachment.h
@@ -2,10 +2,10 @@
#define __MAILCORE_MCATTACHMENT_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstractPart.h>
-#include <mailcore/MCAbstractMultipart.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstractPart.h>
+#include <MailCore/MCAbstractMultipart.h>
+#include <MailCore/MCMessageConstants.h>
#ifdef __cplusplus
diff --git a/src/core/rfc822/MCMessageBuilder.h b/src/core/rfc822/MCMessageBuilder.h
index f34e09f4..0da545d9 100644
--- a/src/core/rfc822/MCMessageBuilder.h
+++ b/src/core/rfc822/MCMessageBuilder.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCMESSAGEBUILDER_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstractMessage.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstractMessage.h>
#ifdef __cplusplus
diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h
index ba129933..f5d043c5 100644
--- a/src/core/rfc822/MCMessageParser.h
+++ b/src/core/rfc822/MCMessageParser.h
@@ -2,9 +2,9 @@
#define __MAILCORE_MCPARSEDMESSAGE_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstractMessage.h>
-#include <mailcore/MCAbstractPart.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstractMessage.h>
+#include <MailCore/MCAbstractPart.h>
#ifdef __cplusplus
diff --git a/src/core/rfc822/MCMessagePart.h b/src/core/rfc822/MCMessagePart.h
index c4f80551..6dd5eb7f 100644
--- a/src/core/rfc822/MCMessagePart.h
+++ b/src/core/rfc822/MCMessagePart.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCMESSAGEPART_H_
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstractMessagePart.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstractMessagePart.h>
#ifdef __cplusplus
diff --git a/src/core/rfc822/MCMultipart.h b/src/core/rfc822/MCMultipart.h
index 2853a2ed..f65e8993 100644
--- a/src/core/rfc822/MCMultipart.h
+++ b/src/core/rfc822/MCMultipart.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCMULTIPART_H
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCAbstractMultipart.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCAbstractMultipart.h>
#ifdef __cplusplus
diff --git a/src/core/rfc822/MCRFC822.h b/src/core/rfc822/MCRFC822.h
index 9eb381b8..340577ae 100644
--- a/src/core/rfc822/MCRFC822.h
+++ b/src/core/rfc822/MCRFC822.h
@@ -2,10 +2,10 @@
#define __MAILCORE_MCRFC822_H
-#include <mailcore/MCAttachment.h>
-#include <mailcore/MCMessageBuilder.h>
-#include <mailcore/MCMessageParser.h>
-#include <mailcore/MCMessagePart.h>
-#include <mailcore/MCMultipart.h>
+#include <MailCore/MCAttachment.h>
+#include <MailCore/MCMessageBuilder.h>
+#include <MailCore/MCMessageParser.h>
+#include <MailCore/MCMessagePart.h>
+#include <MailCore/MCMultipart.h>
#endif
diff --git a/src/core/smtp/MCSMTP.h b/src/core/smtp/MCSMTP.h
index 1f7d17d7..0b1560bd 100644
--- a/src/core/smtp/MCSMTP.h
+++ b/src/core/smtp/MCSMTP.h
@@ -2,7 +2,7 @@
#define __MAILCORE_MCSMTP_H
-#include <mailcore/MCSMTPProgressCallback.h>
-#include <mailcore/MCSMTPSession.h>
+#include <MailCore/MCSMTPProgressCallback.h>
+#include <MailCore/MCSMTPSession.h>
#endif
diff --git a/src/core/smtp/MCSMTPSession.h b/src/core/smtp/MCSMTPSession.h
index dafe8b44..bae57cca 100644
--- a/src/core/smtp/MCSMTPSession.h
+++ b/src/core/smtp/MCSMTPSession.h
@@ -2,8 +2,8 @@
#define __MAILCORE_MCSMTPSESSION_H
-#include <mailcore/MCBaseTypes.h>
-#include <mailcore/MCMessageConstants.h>
+#include <MailCore/MCBaseTypes.h>
+#include <MailCore/MCMessageConstants.h>
#include <libetpan/libetpan.h>
#ifdef __cplusplus
diff --git a/src/mailcore.h b/src/mailcore.h
index d6a36aa7..d890a5e8 100644
--- a/src/mailcore.h
+++ b/src/mailcore.h
@@ -9,8 +9,8 @@
#ifndef mailcore2_mailcore_h
#define mailcore2_mailcore_h
-#include <mailcore/MCCore.h>
-#include <mailcore/MCAsync.h>
-#include <mailcore/MCObjC.h>
+#include <MailCore/MCCore.h>
+#include <MailCore/MCAsync.h>
+#include <MailCore/MCObjC.h>
#endif
diff --git a/src/objc/MCObjC.h b/src/objc/MCObjC.h
index ca817cff..809f57df 100644
--- a/src/objc/MCObjC.h
+++ b/src/objc/MCObjC.h
@@ -11,12 +11,12 @@
#ifdef __OBJC__
-#import <mailcore/MCOUtils.h>
-#import <mailcore/MCOAbstract.h>
-#import <mailcore/MCOIMAP.h>
-#import <mailcore/MCORFC822.h>
-#import <mailcore/MCOPOP.h>
-#import <mailcore/MCOSMTP.h>
+#import <MailCore/MCOUtils.h>
+#import <MailCore/MCOAbstract.h>
+#import <MailCore/MCOIMAP.h>
+#import <MailCore/MCORFC822.h>
+#import <MailCore/MCOPOP.h>
+#import <MailCore/MCOSMTP.h>
#endif
diff --git a/src/objc/abstract/MCOAbstract.h b/src/objc/abstract/MCOAbstract.h
index 3100b5af..62acc8e7 100644
--- a/src/objc/abstract/MCOAbstract.h
+++ b/src/objc/abstract/MCOAbstract.h
@@ -9,13 +9,13 @@
#ifndef mailcore2_MCOAbstract_h
#define mailcore2_MCOAbstract_h
-#import <mailcore/MCOAbstractMessage.h>
-#import <mailcore/MCOAbstractMessagePart.h>
-#import <mailcore/MCOAbstractMultipart.h>
-#import <mailcore/MCOAbstractPart.h>
-#import <mailcore/MCOAddress.h>
-#import <mailcore/MCOMessageHeader.h>
-#import <mailcore/MCOHTMLRendererDelegate.h>
-#import <mailcore/MCOHTMLRendererIMAPDelegate.h>
+#import <MailCore/MCOAbstractMessage.h>
+#import <MailCore/MCOAbstractMessagePart.h>
+#import <MailCore/MCOAbstractMultipart.h>
+#import <MailCore/MCOAbstractPart.h>
+#import <MailCore/MCOAddress.h>
+#import <MailCore/MCOMessageHeader.h>
+#import <MailCore/MCOHTMLRendererDelegate.h>
+#import <MailCore/MCOHTMLRendererIMAPDelegate.h>
#endif
diff --git a/src/objc/abstract/MCOAbstractMessagePart.h b/src/objc/abstract/MCOAbstractMessagePart.h
index 75cda3cd..b7275a88 100644
--- a/src/objc/abstract/MCOAbstractMessagePart.h
+++ b/src/objc/abstract/MCOAbstractMessagePart.h
@@ -11,7 +11,7 @@
#define __MAILCORE_MCOABSTRACTMESSAGEPART_H_
#import <Foundation/Foundation.h>
-#import <mailcore/MCOAbstractPart.h>
+#import <MailCore/MCOAbstractPart.h>
@class MCOMessageHeader;
diff --git a/src/objc/abstract/MCOAbstractMultipart.h b/src/objc/abstract/MCOAbstractMultipart.h
index 3eeb6794..e39809ff 100644
--- a/src/objc/abstract/MCOAbstractMultipart.h
+++ b/src/objc/abstract/MCOAbstractMultipart.h
@@ -11,7 +11,7 @@
#define __MAILCORE_MCOABSTRACTMULTIPART_H_
#import <Foundation/Foundation.h>
-#import <mailcore/MCOAbstractPart.h>
+#import <MailCore/MCOAbstractPart.h>
@interface MCOAbstractMultipart : MCOAbstractPart
diff --git a/src/objc/abstract/MCOAbstractPart+Private.h b/src/objc/abstract/MCOAbstractPart+Private.h
index 47ea189b..43349941 100644
--- a/src/objc/abstract/MCOAbstractPart+Private.h
+++ b/src/objc/abstract/MCOAbstractPart+Private.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOABSTRACTPART_PRIVATE_H_
-#include <mailcore/MCOAbstractPart.h>
+#include <MailCore/MCOAbstractPart.h>
#ifdef __cplusplus
diff --git a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h
index 57b1dac7..83389cf3 100644
--- a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h
+++ b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h
@@ -9,7 +9,7 @@
#ifndef mailcore2_MCOHTMLRendererIMAPDelegate_h
#define mailcore2_MCOHTMLRendererIMAPDelegate_h
-#import <mailcore/MCOHTMLRendererDelegate.h>
+#import <MailCore/MCOHTMLRendererDelegate.h>
@class MCOIMAPPart;
diff --git a/src/objc/imap/MCOIMAP.h b/src/objc/imap/MCOIMAP.h
index b44f52d6..55e430ae 100644
--- a/src/objc/imap/MCOIMAP.h
+++ b/src/objc/imap/MCOIMAP.h
@@ -10,30 +10,30 @@
#define __MAILCORE_MCOIMAP_H_
-#import <mailcore/MCOIMAPSession.h>
-#import <mailcore/MCOIMAPOperation.h>
-#import <mailcore/MCOIMAPFetchFoldersOperation.h>
-#import <mailcore/MCOIMAPFolder.h>
-#import <mailcore/MCOIMAPMessage.h>
-#import <mailcore/MCOIMAPMessagePart.h>
-#import <mailcore/MCOIMAPMultipart.h>
-#import <mailcore/MCOIMAPNamespace.h>
-#import <mailcore/MCOIMAPNamespaceItem.h>
-#import <mailcore/MCOIMAPPart.h>
-#import <mailcore/MCOIMAPFolderInfoOperation.h>
-#import <mailcore/MCOIMAPFolderInfo.h>
-#import <mailcore/MCOIMAPAppendMessageOperation.h>
-#import <mailcore/MCOIMAPCopyMessagesOperation.h>
-#import <mailcore/MCOIMAPFetchMessagesOperation.h>
-#import <mailcore/MCOIMAPFetchContentOperation.h>
-#import <mailcore/MCOIMAPSearchOperation.h>
-#import <mailcore/MCOIMAPIdleOperation.h>
-#import <mailcore/MCOIMAPFetchNamespaceOperation.h>
-#import <mailcore/MCOIMAPSearchOperation.h>
-#import <mailcore/MCOIMAPIdleOperation.h>
-#import <mailcore/MCOIMAPFetchNamespaceOperation.h>
-#import <mailcore/MCOIMAPIdentityOperation.h>
-#import <mailcore/MCOIMAPCapabilityOperation.h>
-#import <mailcore/MCOIMAPSearchExpression.h>
+#import <MailCore/MCOIMAPSession.h>
+#import <MailCore/MCOIMAPOperation.h>
+#import <MailCore/MCOIMAPFetchFoldersOperation.h>
+#import <MailCore/MCOIMAPFolder.h>
+#import <MailCore/MCOIMAPMessage.h>
+#import <MailCore/MCOIMAPMessagePart.h>
+#import <MailCore/MCOIMAPMultipart.h>
+#import <MailCore/MCOIMAPNamespace.h>
+#import <MailCore/MCOIMAPNamespaceItem.h>
+#import <MailCore/MCOIMAPPart.h>
+#import <MailCore/MCOIMAPFolderInfoOperation.h>
+#import <MailCore/MCOIMAPFolderInfo.h>
+#import <MailCore/MCOIMAPAppendMessageOperation.h>
+#import <MailCore/MCOIMAPCopyMessagesOperation.h>
+#import <MailCore/MCOIMAPFetchMessagesOperation.h>
+#import <MailCore/MCOIMAPFetchContentOperation.h>
+#import <MailCore/MCOIMAPSearchOperation.h>
+#import <MailCore/MCOIMAPIdleOperation.h>
+#import <MailCore/MCOIMAPFetchNamespaceOperation.h>
+#import <MailCore/MCOIMAPSearchOperation.h>
+#import <MailCore/MCOIMAPIdleOperation.h>
+#import <MailCore/MCOIMAPFetchNamespaceOperation.h>
+#import <MailCore/MCOIMAPIdentityOperation.h>
+#import <MailCore/MCOIMAPCapabilityOperation.h>
+#import <MailCore/MCOIMAPSearchExpression.h>
#endif
diff --git a/src/objc/imap/MCOIMAPAppendMessageOperation.h b/src/objc/imap/MCOIMAPAppendMessageOperation.h
index 53704e3f..1f988acd 100644
--- a/src/objc/imap/MCOIMAPAppendMessageOperation.h
+++ b/src/objc/imap/MCOIMAPAppendMessageOperation.h
@@ -6,8 +6,8 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOConstants.h>
#ifndef __MAILCORE_MCOIMAPAPPENDMESSAGEOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPBaseOperation.h b/src/objc/imap/MCOIMAPBaseOperation.h
index 65e590db..be0aaf70 100644
--- a/src/objc/imap/MCOIMAPBaseOperation.h
+++ b/src/objc/imap/MCOIMAPBaseOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOOperation.h>
+#import <MailCore/MCOOperation.h>
#ifndef __MAILCORE_MCOIMAPBASEOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPCapabilityOperation.h b/src/objc/imap/MCOIMAPCapabilityOperation.h
index b7ddf9d5..446b8cfe 100644
--- a/src/objc/imap/MCOIMAPCapabilityOperation.h
+++ b/src/objc/imap/MCOIMAPCapabilityOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
#ifndef __MAILCORE_MCOIMAPCAPABILITYOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPCopyMessagesOperation.h b/src/objc/imap/MCOIMAPCopyMessagesOperation.h
index 4171fc76..112d23fa 100644
--- a/src/objc/imap/MCOIMAPCopyMessagesOperation.h
+++ b/src/objc/imap/MCOIMAPCopyMessagesOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
#ifndef __MAILCORE_MCOCOPYMESSAGESOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPFetchContentOperation.h b/src/objc/imap/MCOIMAPFetchContentOperation.h
index b6484ff1..6873860b 100644
--- a/src/objc/imap/MCOIMAPFetchContentOperation.h
+++ b/src/objc/imap/MCOIMAPFetchContentOperation.h
@@ -6,8 +6,8 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOConstants.h>
#ifndef __MAILCORE_MCOIMAPFETCHCONTENTOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.h b/src/objc/imap/MCOIMAPFetchFoldersOperation.h
index 8f7b6592..87912f60 100644
--- a/src/objc/imap/MCOIMAPFetchFoldersOperation.h
+++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOIMAPFETCHFOLDERSOPERATION_H_
-#import <mailcore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
@interface MCOIMAPFetchFoldersOperation : MCOIMAPBaseOperation
- (void)start:(void (^)(NSError *error, NSArray *folder))completionBlock;
diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
index 09b75131..4700ee85 100644
--- a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
+++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
@@ -14,7 +14,7 @@
#import "MCOUtils.h"
#import <Foundation/Foundation.h>
-#import <mailcore/MCAsync.h>
+#import <MailCore/MCAsync.h>
using namespace mailcore;
diff --git a/src/objc/imap/MCOIMAPFetchMessagesOperation.h b/src/objc/imap/MCOIMAPFetchMessagesOperation.h
index cdf98eeb..b8c97c56 100644
--- a/src/objc/imap/MCOIMAPFetchMessagesOperation.h
+++ b/src/objc/imap/MCOIMAPFetchMessagesOperation.h
@@ -6,8 +6,8 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOConstants.h>
#ifndef __MAILCORE_MCOIMAPFETCHMESSAGESOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPFetchNamespaceOperation.h b/src/objc/imap/MCOIMAPFetchNamespaceOperation.h
index c7aacb04..0c20e90a 100644
--- a/src/objc/imap/MCOIMAPFetchNamespaceOperation.h
+++ b/src/objc/imap/MCOIMAPFetchNamespaceOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
#ifndef __MAILCORE_MCOIMAPFETCHNAMESPACEOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPFolder.h b/src/objc/imap/MCOIMAPFolder.h
index ca41f543..2771bc0f 100644
--- a/src/objc/imap/MCOIMAPFolder.h
+++ b/src/objc/imap/MCOIMAPFolder.h
@@ -7,7 +7,7 @@
//
#import <Foundation/Foundation.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOConstants.h>
#ifndef __MAILCORE_MCOIMAPFOLDER_H_
diff --git a/src/objc/imap/MCOIMAPFolderInfoOperation.h b/src/objc/imap/MCOIMAPFolderInfoOperation.h
index ed11da95..a41d43c7 100644
--- a/src/objc/imap/MCOIMAPFolderInfoOperation.h
+++ b/src/objc/imap/MCOIMAPFolderInfoOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
#ifndef __MAILCORE_MCOIMAPFOLDERINFOOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPIdentityOperation.h b/src/objc/imap/MCOIMAPIdentityOperation.h
index eeb11d5f..42be05a7 100644
--- a/src/objc/imap/MCOIMAPIdentityOperation.h
+++ b/src/objc/imap/MCOIMAPIdentityOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
#ifndef __MAILCORE_MCOIMAPIDENTITYOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPIdleOperation.h b/src/objc/imap/MCOIMAPIdleOperation.h
index 9928cc43..aabe2fbd 100644
--- a/src/objc/imap/MCOIMAPIdleOperation.h
+++ b/src/objc/imap/MCOIMAPIdleOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
#ifndef __MAILCORE_MCOIMAPIDLEOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPMessage.h b/src/objc/imap/MCOIMAPMessage.h
index 87a0f797..5a5276ef 100644
--- a/src/objc/imap/MCOIMAPMessage.h
+++ b/src/objc/imap/MCOIMAPMessage.h
@@ -6,8 +6,8 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOAbstractMessage.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOAbstractMessage.h>
+#import <MailCore/MCOConstants.h>
#ifndef __MAILCORE_MCOIMAPMESSAGE_H_
diff --git a/src/objc/imap/MCOIMAPMessagePart.h b/src/objc/imap/MCOIMAPMessagePart.h
index 1ad51d95..bb0e7578 100644
--- a/src/objc/imap/MCOIMAPMessagePart.h
+++ b/src/objc/imap/MCOIMAPMessagePart.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOAbstractMessagePart.h>
+#import <MailCore/MCOAbstractMessagePart.h>
#ifndef __MAILCORE_MCOIMAPMESSAGEPART_H_
diff --git a/src/objc/imap/MCOIMAPMultipart.h b/src/objc/imap/MCOIMAPMultipart.h
index 9a67ff82..96ab11f6 100644
--- a/src/objc/imap/MCOIMAPMultipart.h
+++ b/src/objc/imap/MCOIMAPMultipart.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOAbstractMultipart.h>
+#import <MailCore/MCOAbstractMultipart.h>
#ifndef __MAILCORE_MCOIMAPMULTIPART_H_
diff --git a/src/objc/imap/MCOIMAPOperation.h b/src/objc/imap/MCOIMAPOperation.h
index 7382f2ef..50a6d3dc 100644
--- a/src/objc/imap/MCOIMAPOperation.h
+++ b/src/objc/imap/MCOIMAPOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOOperation.h>
+#import <MailCore/MCOOperation.h>
#ifndef __MAILCORE_MCOIMAPOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPPart.h b/src/objc/imap/MCOIMAPPart.h
index ea31e8a8..18e5b367 100644
--- a/src/objc/imap/MCOIMAPPart.h
+++ b/src/objc/imap/MCOIMAPPart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOAbstractPart.h>
+#import <MailCore/MCOAbstractPart.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOConstants.h>
#ifndef __MAILCORE_MCOIMAPABSTRACTPART_H_
diff --git a/src/objc/imap/MCOIMAPSearchExpression.h b/src/objc/imap/MCOIMAPSearchExpression.h
index 8c903627..9bd518ed 100644
--- a/src/objc/imap/MCOIMAPSearchExpression.h
+++ b/src/objc/imap/MCOIMAPSearchExpression.h
@@ -7,7 +7,7 @@
//
#import <Foundation/Foundation.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOConstants.h>
#ifndef __MAILCORE_MCOIMAPSEARCHEXPRESSION_H_
diff --git a/src/objc/imap/MCOIMAPSearchOperation.h b/src/objc/imap/MCOIMAPSearchOperation.h
index c61239b9..2d85043e 100644
--- a/src/objc/imap/MCOIMAPSearchOperation.h
+++ b/src/objc/imap/MCOIMAPSearchOperation.h
@@ -6,7 +6,7 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import <mailcore/MCOIMAPBaseOperation.h>
+#import <MailCore/MCOIMAPBaseOperation.h>
#ifndef __MAILCORE_MCOSEARCHOPERATION_H_
diff --git a/src/objc/imap/MCOIMAPSession.h b/src/objc/imap/MCOIMAPSession.h
index eaf7df49..187cce37 100644
--- a/src/objc/imap/MCOIMAPSession.h
+++ b/src/objc/imap/MCOIMAPSession.h
@@ -11,7 +11,7 @@
#define __MAILCORE_MCOIMAPSESSION_H_
#import <Foundation/Foundation.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOConstants.h>
@class MCOIMAPFetchFoldersOperation;
@class MCOIMAPOperation;
diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm
index 54b9e398..e075ba0f 100644
--- a/src/objc/imap/MCOIMAPSession.mm
+++ b/src/objc/imap/MCOIMAPSession.mm
@@ -16,7 +16,7 @@
#import "MCOUtils.h"
-#import <mailcore/MCAsync.h>
+#import <MailCore/MCAsync.h>
using namespace mailcore;
diff --git a/src/objc/pop/MCOPOP.h b/src/objc/pop/MCOPOP.h
index e06022e5..6544021d 100644
--- a/src/objc/pop/MCOPOP.h
+++ b/src/objc/pop/MCOPOP.h
@@ -9,11 +9,11 @@
#ifndef mailcore2_MCOPOP_h
#define mailcore2_MCOPOP_h
-#import <mailcore/MCOPOPSession.h>
-#import <mailcore/MCOPOPOperation.h>
-#import <mailcore/MCOPOPFetchHeaderOperation.h>
-#import <mailcore/MCOPOPFetchMessageOperation.h>
-#import <mailcore/MCOPOPFetchMessagesOperation.h>
-#import <mailcore/MCOPOPMessageInfo.h>
+#import <MailCore/MCOPOPSession.h>
+#import <MailCore/MCOPOPOperation.h>
+#import <MailCore/MCOPOPFetchHeaderOperation.h>
+#import <MailCore/MCOPOPFetchMessageOperation.h>
+#import <MailCore/MCOPOPFetchMessagesOperation.h>
+#import <MailCore/MCOPOPMessageInfo.h>
#endif
diff --git a/src/objc/pop/MCOPOPFetchHeaderOperation.h b/src/objc/pop/MCOPOPFetchHeaderOperation.h
index 74ed96ef..f9dba7f5 100644
--- a/src/objc/pop/MCOPOPFetchHeaderOperation.h
+++ b/src/objc/pop/MCOPOPFetchHeaderOperation.h
@@ -11,7 +11,7 @@
#define __MAILCORE_MCOPOPFETCHHEADEROPERATION_H_
#import <Foundation/Foundation.h>
-#import <mailcore/MCOPOPOperation.h>
+#import <MailCore/MCOPOPOperation.h>
@class MCOMessageHeader;
diff --git a/src/objc/pop/MCOPOPFetchMessageOperation.h b/src/objc/pop/MCOPOPFetchMessageOperation.h
index 231a5cb8..f833a1cc 100644
--- a/src/objc/pop/MCOPOPFetchMessageOperation.h
+++ b/src/objc/pop/MCOPOPFetchMessageOperation.h
@@ -11,7 +11,7 @@
#define __MAILCORE_MCOPOPFETCHMESSAGEOPERATION_H_
#import <Foundation/Foundation.h>
-#import <mailcore/MCOPOPOperation.h>
+#import <MailCore/MCOPOPOperation.h>
typedef void (^MCOPOPOperationProgressBlock)(unsigned int current, unsigned int maximum);
diff --git a/src/objc/pop/MCOPOPFetchMessagesOperation.h b/src/objc/pop/MCOPOPFetchMessagesOperation.h
index d6d33965..40cc175c 100644
--- a/src/objc/pop/MCOPOPFetchMessagesOperation.h
+++ b/src/objc/pop/MCOPOPFetchMessagesOperation.h
@@ -11,7 +11,7 @@
#define __MAILCORE_MCOPOPFETCHMESSAGESOPERATION_H_
#import <Foundation/Foundation.h>
-#import <mailcore/MCOPOPOperation.h>
+#import <MailCore/MCOPOPOperation.h>
@interface MCOPOPFetchMessagesOperation : MCOPOPOperation
diff --git a/src/objc/pop/MCOPOPOperation.h b/src/objc/pop/MCOPOPOperation.h
index 774ff4ac..3b482fdf 100644
--- a/src/objc/pop/MCOPOPOperation.h
+++ b/src/objc/pop/MCOPOPOperation.h
@@ -11,7 +11,7 @@
#define __MAILCORE_MCOPOPOPERATION_H_
#import <Foundation/Foundation.h>
-#import <mailcore/MCOOperation.h>
+#import <MailCore/MCOOperation.h>
@interface MCOPOPOperation : MCOOperation
- (void)start:(void (^)(NSError *error))completionBlock;
diff --git a/src/objc/pop/MCOPOPSession.h b/src/objc/pop/MCOPOPSession.h
index ae9bf1d9..81ae2e86 100644
--- a/src/objc/pop/MCOPOPSession.h
+++ b/src/objc/pop/MCOPOPSession.h
@@ -12,7 +12,7 @@
#import <Foundation/Foundation.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOConstants.h>
@class MCOPOPFetchMessagesOperation;
@class MCOPOPFetchHeaderOperation;
diff --git a/src/objc/rfc822/MCOAttachment.h b/src/objc/rfc822/MCOAttachment.h
index 1f054848..95f60321 100644
--- a/src/objc/rfc822/MCOAttachment.h
+++ b/src/objc/rfc822/MCOAttachment.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOATTACHMENT_H_
-#import <mailcore/MCOAbstractPart.h>
+#import <MailCore/MCOAbstractPart.h>
@interface MCOAttachment : MCOAbstractPart <NSCopying>
diff --git a/src/objc/rfc822/MCOMessageBuilder.h b/src/objc/rfc822/MCOMessageBuilder.h
index 4fa23e0b..a74b3e6f 100644
--- a/src/objc/rfc822/MCOMessageBuilder.h
+++ b/src/objc/rfc822/MCOMessageBuilder.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOMESSAGEBUILDER_H_
-#import <mailcore/MCOAbstractMessage.h>
+#import <MailCore/MCOAbstractMessage.h>
@class MCOAttachment;
@protocol MCOHTMLRendererDelegate;
diff --git a/src/objc/rfc822/MCOMessageParser.h b/src/objc/rfc822/MCOMessageParser.h
index 0d239511..a22b657e 100644
--- a/src/objc/rfc822/MCOMessageParser.h
+++ b/src/objc/rfc822/MCOMessageParser.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOMESSAGEPARSER_H_
-#import <mailcore/MCOAbstractMessage.h>
+#import <MailCore/MCOAbstractMessage.h>
@protocol MCOHTMLRendererDelegate;
diff --git a/src/objc/rfc822/MCOMessagePart.h b/src/objc/rfc822/MCOMessagePart.h
index b41fbf0b..dc31fdfb 100644
--- a/src/objc/rfc822/MCOMessagePart.h
+++ b/src/objc/rfc822/MCOMessagePart.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOMESSAGEPART_H_
-#import <mailcore/MCOAbstractMessagePart.h>
+#import <MailCore/MCOAbstractMessagePart.h>
@interface MCOMessagePart : MCOAbstractMessagePart <NSCopying>
diff --git a/src/objc/rfc822/MCOMultipart.h b/src/objc/rfc822/MCOMultipart.h
index d38fef85..b5722e72 100644
--- a/src/objc/rfc822/MCOMultipart.h
+++ b/src/objc/rfc822/MCOMultipart.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOMULTIPART_H_
-#import <mailcore/MCOAbstractMultipart.h>
+#import <MailCore/MCOAbstractMultipart.h>
@interface MCOMultipart : MCOAbstractMultipart <NSCopying>
diff --git a/src/objc/rfc822/MCORFC822.h b/src/objc/rfc822/MCORFC822.h
index b85c8e53..fa9b8242 100644
--- a/src/objc/rfc822/MCORFC822.h
+++ b/src/objc/rfc822/MCORFC822.h
@@ -10,10 +10,10 @@
#define __MAILCORE_MCORFC822_H_
-#import <mailcore/MCOAttachment.h>
-#import <mailcore/MCOMessageBuilder.h>
-#import <mailcore/MCOMessageParser.h>
-#import <mailcore/MCOMessagePart.h>
-#import <mailcore/MCOMultipart.h>
+#import <MailCore/MCOAttachment.h>
+#import <MailCore/MCOMessageBuilder.h>
+#import <MailCore/MCOMessageParser.h>
+#import <MailCore/MCOMessagePart.h>
+#import <MailCore/MCOMultipart.h>
#endif
diff --git a/src/objc/smtp/MCOSMTP.h b/src/objc/smtp/MCOSMTP.h
index df8cec4d..70759600 100644
--- a/src/objc/smtp/MCOSMTP.h
+++ b/src/objc/smtp/MCOSMTP.h
@@ -9,8 +9,8 @@
#ifndef mailcore2_MCOSMTP_h
#define mailcore2_MCOSMTP_h
-#import <mailcore/MCOSMTPSession.h>
-#import <mailcore/MCOSMTPSendOperation.h>
-#import <mailcore/MCOSMTPOperation.h>
+#import <MailCore/MCOSMTPSession.h>
+#import <MailCore/MCOSMTPSendOperation.h>
+#import <MailCore/MCOSMTPOperation.h>
#endif
diff --git a/src/objc/smtp/MCOSMTPOperation.h b/src/objc/smtp/MCOSMTPOperation.h
index 28b91857..a833353c 100644
--- a/src/objc/smtp/MCOSMTPOperation.h
+++ b/src/objc/smtp/MCOSMTPOperation.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOSMTPOPERATION_H_
-#import <mailcore/MCOOperation.h>
+#import <MailCore/MCOOperation.h>
@interface MCOSMTPOperation : MCOOperation
- (void)start:(void (^)(NSError *error))completionBlock;
diff --git a/src/objc/smtp/MCOSMTPSendOperation.h b/src/objc/smtp/MCOSMTPSendOperation.h
index e0ce3a05..02c220d5 100644
--- a/src/objc/smtp/MCOSMTPSendOperation.h
+++ b/src/objc/smtp/MCOSMTPSendOperation.h
@@ -10,7 +10,7 @@
#define __MAILCORE_MCOSMTPSENDOPERATION_H_
-#import <mailcore/MCOSMTPOperation.h>
+#import <MailCore/MCOSMTPOperation.h>
typedef void (^MCOSMTPOperationProgressBlock)(unsigned int current, unsigned int maximum);
diff --git a/src/objc/smtp/MCOSMTPSession.h b/src/objc/smtp/MCOSMTPSession.h
index d5c940b9..60eefa18 100644
--- a/src/objc/smtp/MCOSMTPSession.h
+++ b/src/objc/smtp/MCOSMTPSession.h
@@ -12,7 +12,7 @@
#import <Foundation/Foundation.h>
-#import <mailcore/MCOConstants.h>
+#import <MailCore/MCOConstants.h>
@class MCOSMTPSendOperation;
@class MCOSMTPOperation;
diff --git a/src/objc/utils/MCOIndexSet.h b/src/objc/utils/MCOIndexSet.h
index 2f2932ee..83e6f169 100644
--- a/src/objc/utils/MCOIndexSet.h
+++ b/src/objc/utils/MCOIndexSet.h
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
-#import <mailcore/MCORange.h>
+#import <MailCore/MCORange.h>
#ifndef __MAILCORE_MCOINDEXSET_H_
diff --git a/src/objc/utils/MCOIndexSet.mm b/src/objc/utils/MCOIndexSet.mm
index 45a00ccc..1827af67 100644
--- a/src/objc/utils/MCOIndexSet.mm
+++ b/src/objc/utils/MCOIndexSet.mm
@@ -8,7 +8,7 @@
#import "MCOIndexSet.h"
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#import "NSObject+MCO.h"
diff --git a/src/objc/utils/MCORange.h b/src/objc/utils/MCORange.h
index 1f2f9715..a42e0928 100644
--- a/src/objc/utils/MCORange.h
+++ b/src/objc/utils/MCORange.h
@@ -12,7 +12,7 @@
#import <Foundation/Foundation.h>
#ifdef __cplusplus
-#include <mailcore/MCBaseTypes.h>
+#include <MailCore/MCBaseTypes.h>
#endif
#ifdef __cplusplus
diff --git a/src/objc/utils/MCOUtils.h b/src/objc/utils/MCOUtils.h
index 60f4f2a1..bc4f716c 100644
--- a/src/objc/utils/MCOUtils.h
+++ b/src/objc/utils/MCOUtils.h
@@ -9,18 +9,18 @@
#ifndef mailcore2_MCOUtils_h
#define mailcore2_MCOUtils_h
-#import <mailcore/MCOObjectWrapper.h>
-#import <mailcore/NSData+MCO.h>
-#import <mailcore/NSString+MCO.h>
-#import <mailcore/NSDictionary+MCO.h>
-#import <mailcore/NSArray+MCO.h>
-#import <mailcore/NSObject+MCO.h>
-#import <mailcore/MCOObjectWrapper.h>
-#import <mailcore/NSError+MCO.h>
-#import <mailcore/NSValue+MCO.h>
-#import <mailcore/MCOOperation.h>
-#import <mailcore/MCOConstants.h>
-#import <mailcore/MCOIndexSet.h>
-#import <mailcore/MCORange.h>
+#import <MailCore/MCOObjectWrapper.h>
+#import <MailCore/NSData+MCO.h>
+#import <MailCore/NSString+MCO.h>
+#import <MailCore/NSDictionary+MCO.h>
+#import <MailCore/NSArray+MCO.h>
+#import <MailCore/NSObject+MCO.h>
+#import <MailCore/MCOObjectWrapper.h>
+#import <MailCore/NSError+MCO.h>
+#import <MailCore/NSValue+MCO.h>
+#import <MailCore/MCOOperation.h>
+#import <MailCore/MCOConstants.h>
+#import <MailCore/MCOIndexSet.h>
+#import <MailCore/MCORange.h>
#endif
diff --git a/src/ui/mac/MCOCIDURLProtocol.h b/src/ui/mac/MCOCIDURLProtocol.h
index cf0b5335..ac4b0f2b 100644
--- a/src/ui/mac/MCOCIDURLProtocol.h
+++ b/src/ui/mac/MCOCIDURLProtocol.h
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
-#include <mailcore/mailcore.h>
+#include <MailCore/MailCore.h>
@interface MCOCIDURLProtocol : NSURLProtocol
diff --git a/src/ui/mac/MCOMessageView.h b/src/ui/mac/MCOMessageView.h
index c8ffe241..fa25184f 100644
--- a/src/ui/mac/MCOMessageView.h
+++ b/src/ui/mac/MCOMessageView.h
@@ -7,7 +7,7 @@
//
#import <Cocoa/Cocoa.h>
-#include <mailcore/mailcore.h>
+#include <MailCore/MailCore.h>
@protocol MCOMessageViewDelegate;
diff --git a/tests/test-all.h b/tests/test-all.h
index 2f020ae8..6197cf47 100644
--- a/tests/test-all.h
+++ b/tests/test-all.h
@@ -9,7 +9,7 @@
#ifndef __mailcore2__test_all__
#define __mailcore2__test_all__
-#include <mailcore/mailcore.h>
+#include <MailCore/MailCore.h>
extern void testAll();
diff --git a/tests/test-all.mm b/tests/test-all.mm
index d9ed9249..97de53fd 100644
--- a/tests/test-all.mm
+++ b/tests/test-all.mm
@@ -11,7 +11,7 @@
#include <unicode/putil.h>
#include <unicode/uclean.h>
#include <unicode/ucnv.h>
-#include <mailcore/mailcore.h>
+#include <MailCore/MailCore.h>
extern "C" {
extern int mailstream_debug;