aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar CodaFi <devteam.codafi@gmail.com>2014-02-22 13:15:27 -0700
committerGravatar CodaFi <devteam.codafi@gmail.com>2014-02-22 13:15:27 -0700
commit3bfa1104dee6dd16ba23ca18062ad8c62d73fa9c (patch)
treeccf6668a454774c7a74d5aa498fbaf672fa8a6e0
parentfb06d5133a88f80daed1a7d1bea00f558446f2ae (diff)
Conformant header guards
Fixes #606
-rw-r--r--src/MailCore.h4
-rw-r--r--src/async/MCAsync.h4
-rwxr-xr-xsrc/async/imap/MCAsyncIMAP.h4
-rw-r--r--src/async/imap/MCIMAPAppendMessageOperation.h4
-rwxr-xr-xsrc/async/imap/MCIMAPAsyncConnection.h4
-rwxr-xr-xsrc/async/imap/MCIMAPAsyncSession.h4
-rw-r--r--src/async/imap/MCIMAPCapabilityOperation.h4
-rw-r--r--src/async/imap/MCIMAPCheckAccountOperation.h4
-rw-r--r--src/async/imap/MCIMAPConnectOperation.h5
-rw-r--r--src/async/imap/MCIMAPCopyMessagesOperation.h4
-rw-r--r--src/async/imap/MCIMAPCreateFolderOperation.h5
-rw-r--r--src/async/imap/MCIMAPDeleteFolderOperation.h5
-rw-r--r--src/async/imap/MCIMAPDisconnectOperation.h5
-rw-r--r--src/async/imap/MCIMAPExpungeOperation.h4
-rw-r--r--src/async/imap/MCIMAPFetchContentOperation.h4
-rw-r--r--src/async/imap/MCIMAPFetchFoldersOperation.h4
-rw-r--r--src/async/imap/MCIMAPFetchMessagesOperation.h4
-rw-r--r--src/async/imap/MCIMAPFetchNamespaceOperation.h4
-rw-r--r--src/async/imap/MCIMAPFolderInfoOperation.h4
-rw-r--r--src/async/imap/MCIMAPFolderStatusOperation.h4
-rw-r--r--src/async/imap/MCIMAPIdentityOperation.h4
-rw-r--r--src/async/imap/MCIMAPIdleOperation.h4
-rw-r--r--src/async/imap/MCIMAPMessageRenderingOperation.h4
-rw-r--r--src/async/imap/MCIMAPMultiDisconnectOperation.h4
-rw-r--r--src/async/imap/MCIMAPNoopOperation.h4
-rw-r--r--src/async/imap/MCIMAPOperation.h4
-rw-r--r--src/async/imap/MCIMAPOperationCallback.h4
-rw-r--r--src/async/imap/MCIMAPQuotaOperation.h4
-rw-r--r--src/async/imap/MCIMAPRenameFolderOperation.h4
-rw-r--r--src/async/imap/MCIMAPSearchOperation.h4
-rw-r--r--src/async/imap/MCIMAPStoreFlagsOperation.h4
-rw-r--r--src/async/imap/MCIMAPStoreLabelsOperation.h4
-rw-r--r--src/async/imap/MCIMAPSubscribeFolderOperation.h4
-rw-r--r--src/async/pop/MCAsyncPOP.h4
-rw-r--r--src/async/pop/MCPOPAsyncSession.h4
-rw-r--r--src/async/pop/MCPOPCheckAccountOperation.h5
-rw-r--r--src/async/pop/MCPOPDeleteMessagesOperation.h4
-rw-r--r--src/async/pop/MCPOPFetchHeaderOperation.h4
-rw-r--r--src/async/pop/MCPOPFetchMessageOperation.h4
-rw-r--r--src/async/pop/MCPOPFetchMessagesOperation.h4
-rw-r--r--src/async/pop/MCPOPNoopOperation.h5
-rw-r--r--src/async/pop/MCPOPOperation.h4
-rw-r--r--src/async/pop/MCPOPOperationCallback.h4
-rw-r--r--src/async/smtp/MCAsyncSMTP.h4
-rw-r--r--src/async/smtp/MCSMTPAsyncSession.h4
-rw-r--r--src/async/smtp/MCSMTPCheckAccountOperation.h4
-rw-r--r--src/async/smtp/MCSMTPDisconnectOperation.h5
-rw-r--r--src/async/smtp/MCSMTPNoopOperation.h5
-rw-r--r--src/async/smtp/MCSMTPOperation.h4
-rw-r--r--src/async/smtp/MCSMTPOperationCallback.h4
-rw-r--r--src/async/smtp/MCSMTPSendWithDataOperation.h4
-rw-r--r--src/core/MCCore.h5
-rw-r--r--src/core/abstract/MCAbstract.h4
-rw-r--r--src/core/abstract/MCAbstractMessage.h5
-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.h4
-rw-r--r--src/core/abstract/MCMessageConstants.h5
-rw-r--r--src/core/abstract/MCMessageHeader.h4
-rw-r--r--src/core/basetypes/MCArray.h4
-rw-r--r--src/core/basetypes/MCAssert.h4
-rw-r--r--src/core/basetypes/MCAutoreleasePool.h4
-rw-r--r--src/core/basetypes/MCBase64.h5
-rw-r--r--src/core/basetypes/MCBaseTypes.h4
-rw-r--r--src/core/basetypes/MCConnectionLogger.h5
-rw-r--r--src/core/basetypes/MCConnectionLoggerUtils.h5
-rw-r--r--src/core/basetypes/MCData.h4
-rw-r--r--src/core/basetypes/MCHTMLCleaner.h4
-rw-r--r--src/core/basetypes/MCHash.h4
-rw-r--r--src/core/basetypes/MCHashMap.h4
-rw-r--r--src/core/basetypes/MCICUTypes.h5
-rw-r--r--src/core/basetypes/MCIndexSet.h4
-rw-r--r--src/core/basetypes/MCIterator.h5
-rw-r--r--src/core/basetypes/MCJSON.h5
-rw-r--r--src/core/basetypes/MCJSONParser.h5
-rw-r--r--src/core/basetypes/MCLibetpan.h5
-rw-r--r--src/core/basetypes/MCLibetpanTypes.h5
-rw-r--r--src/core/basetypes/MCLog.h4
-rw-r--r--src/core/basetypes/MCMD5.h5
-rw-r--r--src/core/basetypes/MCMainThread.h4
-rw-r--r--src/core/basetypes/MCNull.h5
-rw-r--r--src/core/basetypes/MCObject.h4
-rw-r--r--src/core/basetypes/MCOperation.h4
-rw-r--r--src/core/basetypes/MCOperationCallback.h4
-rw-r--r--src/core/basetypes/MCOperationQueue.h4
-rw-r--r--src/core/basetypes/MCOperationQueueCallback.h4
-rw-r--r--src/core/basetypes/MCRange.h4
-rw-r--r--src/core/basetypes/MCSet.h4
-rw-r--r--src/core/basetypes/MCString.h4
-rw-r--r--src/core/basetypes/MCUtils.h4
-rw-r--r--src/core/basetypes/MCValue.h4
-rw-r--r--src/core/basetypes/MCValuePrivate.h4
-rw-r--r--src/core/imap/MCIMAP.h4
-rw-r--r--src/core/imap/MCIMAPFolder.h4
-rw-r--r--src/core/imap/MCIMAPFolderStatus.h4
-rw-r--r--src/core/imap/MCIMAPIdentity.h4
-rw-r--r--src/core/imap/MCIMAPMessage.h4
-rw-r--r--src/core/imap/MCIMAPMessagePart.h4
-rw-r--r--src/core/imap/MCIMAPMultipart.h4
-rw-r--r--src/core/imap/MCIMAPNamespace.h4
-rw-r--r--src/core/imap/MCIMAPNamespaceItem.h4
-rw-r--r--src/core/imap/MCIMAPPart.h4
-rw-r--r--src/core/imap/MCIMAPProgressCallback.h4
-rw-r--r--src/core/imap/MCIMAPSearchExpression.h4
-rwxr-xr-xsrc/core/imap/MCIMAPSession.h4
-rw-r--r--src/core/imap/MCIMAPSyncResult.h4
-rw-r--r--src/core/pop/MCPOP.h4
-rw-r--r--src/core/pop/MCPOPMessageInfo.h4
-rw-r--r--src/core/pop/MCPOPProgressCallback.h4
-rw-r--r--src/core/pop/MCPOPSession.h4
-rw-r--r--src/core/provider/MCMailProvider.h5
-rw-r--r--src/core/provider/MCMailProvidersManager.h5
-rw-r--r--src/core/provider/MCNetService.h5
-rw-r--r--src/core/provider/MCProvider.h5
-rw-r--r--src/core/renderer/MCAddressDisplay.h5
-rw-r--r--src/core/renderer/MCDateFormatter.h5
-rw-r--r--src/core/renderer/MCHTMLBodyRendererTemplateCallback.h4
-rw-r--r--src/core/renderer/MCHTMLRenderer.h5
-rw-r--r--src/core/renderer/MCHTMLRendererCallback.h4
-rw-r--r--src/core/renderer/MCHTMLRendererIMAPDataCallback.h4
-rw-r--r--src/core/renderer/MCRenderer.h4
-rw-r--r--src/core/renderer/MCSizeFormatter.h5
-rw-r--r--src/core/rfc822/MCAttachment.h4
-rw-r--r--src/core/rfc822/MCMessageBuilder.h4
-rw-r--r--src/core/rfc822/MCMessageParser.h4
-rw-r--r--src/core/rfc822/MCMessagePart.h4
-rw-r--r--src/core/rfc822/MCMultipart.h4
-rw-r--r--src/core/rfc822/MCRFC822.h4
-rw-r--r--src/core/security/MCCertificateUtils.h5
-rw-r--r--src/core/smtp/MCSMTP.h4
-rw-r--r--src/core/smtp/MCSMTPProgressCallback.h4
-rw-r--r--src/core/smtp/MCSMTPSession.h4
-rw-r--r--src/core/zip/MCZip.h2
-rw-r--r--src/objc/MCObjC.h4
-rw-r--r--src/objc/abstract/MCOAbstract.h4
-rw-r--r--src/objc/abstract/MCOAbstractMessage+Private.h4
-rw-r--r--src/objc/abstract/MCOAbstractMessage.h4
-rw-r--r--src/objc/abstract/MCOAbstractMessagePart.h4
-rw-r--r--src/objc/abstract/MCOAbstractMessageRendererCallback.h4
-rw-r--r--src/objc/abstract/MCOAbstractMultipart.h4
-rw-r--r--src/objc/abstract/MCOAbstractPart+Private.h4
-rw-r--r--src/objc/abstract/MCOAbstractPart.h4
-rw-r--r--src/objc/abstract/MCOAddress+Private.h4
-rw-r--r--src/objc/abstract/MCOAddress.h4
-rw-r--r--src/objc/abstract/MCOConstants.h4
-rw-r--r--src/objc/abstract/MCOHTMLRendererDelegate.h4
-rw-r--r--src/objc/abstract/MCOHTMLRendererIMAPDelegate.h4
-rw-r--r--src/objc/abstract/MCOMessageHeader+Private.h4
-rw-r--r--src/objc/abstract/MCOMessageHeader.h4
-rwxr-xr-xsrc/objc/imap/MCOIMAP.h4
-rw-r--r--src/objc/imap/MCOIMAPAppendMessageOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPBaseOperation+Private.h5
-rw-r--r--src/objc/imap/MCOIMAPBaseOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPCapabilityOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPCopyMessagesOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPFetchContentOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPFetchFoldersOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPFetchMessagesOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPFetchNamespaceOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPFolder.h4
-rw-r--r--src/objc/imap/MCOIMAPFolderInfo.h4
-rw-r--r--src/objc/imap/MCOIMAPFolderInfoOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPFolderStatus.h4
-rw-r--r--src/objc/imap/MCOIMAPFolderStatusOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPIdentity.h4
-rw-r--r--src/objc/imap/MCOIMAPIdentityOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPIdleOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPMessage.h4
-rw-r--r--src/objc/imap/MCOIMAPMessagePart.h4
-rw-r--r--src/objc/imap/MCOIMAPMessageRenderingOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPMultipart.h4
-rw-r--r--src/objc/imap/MCOIMAPNamespace.h4
-rw-r--r--src/objc/imap/MCOIMAPNamespaceItem.h4
-rw-r--r--src/objc/imap/MCOIMAPNoopOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPOperation.h4
-rw-r--r--src/objc/imap/MCOIMAPPart.h4
-rw-r--r--src/objc/imap/MCOIMAPSearchExpression.h4
-rw-r--r--src/objc/imap/MCOIMAPSearchOperation.h4
-rwxr-xr-xsrc/objc/imap/MCOIMAPSession.h4
-rw-r--r--src/objc/pop/MCOPOP.h4
-rw-r--r--src/objc/pop/MCOPOPFetchHeaderOperation.h4
-rw-r--r--src/objc/pop/MCOPOPFetchMessageOperation.h4
-rw-r--r--src/objc/pop/MCOPOPFetchMessagesOperation.h4
-rw-r--r--src/objc/pop/MCOPOPMessageInfo.h4
-rw-r--r--src/objc/pop/MCOPOPNoopOperation.h4
-rw-r--r--src/objc/pop/MCOPOPOperation+Private.h4
-rw-r--r--src/objc/pop/MCOPOPOperation.h4
-rw-r--r--src/objc/pop/MCOPOPSession.h4
-rw-r--r--src/objc/rfc822/MCOAttachment.h4
-rw-r--r--src/objc/rfc822/MCOMessageBuilder.h4
-rw-r--r--src/objc/rfc822/MCOMessageParser.h4
-rw-r--r--src/objc/rfc822/MCOMessagePart.h4
-rw-r--r--src/objc/rfc822/MCOMultipart.h4
-rw-r--r--src/objc/rfc822/MCORFC822.h4
-rw-r--r--src/objc/smtp/MCOSMTP.h4
-rw-r--r--src/objc/smtp/MCOSMTPNoopOperation.h4
-rw-r--r--src/objc/smtp/MCOSMTPOperation+Private.h5
-rw-r--r--src/objc/smtp/MCOSMTPOperation.h4
-rw-r--r--src/objc/smtp/MCOSMTPSendOperation.h4
-rw-r--r--src/objc/smtp/MCOSMTPSession.h4
-rw-r--r--src/objc/utils/MCOIndexSet+Private.h4
-rw-r--r--src/objc/utils/MCOIndexSet.h4
-rw-r--r--src/objc/utils/MCOObjectWrapper.h4
-rw-r--r--src/objc/utils/MCOOperation+Private.h4
-rw-r--r--src/objc/utils/MCOOperation.h4
-rw-r--r--src/objc/utils/MCORange.h4
-rw-r--r--src/objc/utils/MCOUtils.h4
-rw-r--r--src/objc/utils/NSArray+MCO.h4
-rw-r--r--src/objc/utils/NSData+MCO.h4
-rw-r--r--src/objc/utils/NSDictionary+MCO.h4
-rw-r--r--src/objc/utils/NSError+MCO.h4
-rw-r--r--src/objc/utils/NSObject+MCO.h4
-rw-r--r--src/objc/utils/NSString+MCO.h4
-rw-r--r--src/objc/utils/NSValue+MCO.h4
-rw-r--r--tests/test-all.h5
216 files changed, 465 insertions, 431 deletions
diff --git a/src/MailCore.h b/src/MailCore.h
index 978b9cf7..8b0897f0 100644
--- a/src/MailCore.h
+++ b/src/MailCore.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MAILCORE_h
+#ifndef MAILCORE_MAILCORE_H
-#define __MAILCORE_MAILCORE_h
+#define MAILCORE_MAILCORE_H
#include <MailCore/MCCore.h>
#include <MailCore/MCAsync.h>
diff --git a/src/async/MCAsync.h b/src/async/MCAsync.h
index 414cb353..45284590 100644
--- a/src/async/MCAsync.h
+++ b/src/async/MCAsync.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCASYNC_H_
+#ifndef MAILCORE_MCASYNC_H
-#define __MAILCORE_MCASYNC_H_
+#define MAILCORE_MCASYNC_H
#include <MailCore/MCAsyncSMTP.h>
#include <MailCore/MCAsyncIMAP.h>
diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h
index b1184fe7..da032c73 100755
--- a/src/async/imap/MCAsyncIMAP.h
+++ b/src/async/imap/MCAsyncIMAP.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCASYNCIMAP_H_
+#ifndef MAILCORE_MCASYNCIMAP_H
-#define __MAILCORE_MCASYNCIMAP_H_
+#define MAILCORE_MCASYNCIMAP_H
#include <MailCore/MCIMAPAsyncSession.h>
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPAppendMessageOperation.h b/src/async/imap/MCIMAPAppendMessageOperation.h
index de6960de..bca461d7 100644
--- a/src/async/imap/MCIMAPAppendMessageOperation.h
+++ b/src/async/imap/MCIMAPAppendMessageOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPAPPENDMESSAGEOPERATION_H_
+#ifndef MAILCORE_MCIMAPAPPENDMESSAGEOPERATION_H
-#define __MAILCORE_MCIMAPAPPENDMESSAGEOPERATION_H_
+#define MAILCORE_MCIMAPAPPENDMESSAGEOPERATION_H
#include <MailCore/MCIMAPOperation.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h
index 0a117bea..28bac80c 100755
--- a/src/async/imap/MCIMAPAsyncConnection.h
+++ b/src/async/imap/MCIMAPAsyncConnection.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPASYNCCONNECTION_H
+#ifndef MAILCORE_MCIMAPASYNCCONNECTION_H
-#define __MAILCORE_MCIMAPASYNCCONNECTION_H
+#define MAILCORE_MCIMAPASYNCCONNECTION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h
index 0d172bb6..ddd672e0 100755
--- a/src/async/imap/MCIMAPAsyncSession.h
+++ b/src/async/imap/MCIMAPAsyncSession.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPACCOUNT_H_
+#ifndef MAILCORE_MCIMAPACCOUNT_H
-#define __MAILCORE_MCIMAPACCOUNT_H_
+#define MAILCORE_MCIMAPACCOUNT_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/async/imap/MCIMAPCapabilityOperation.h b/src/async/imap/MCIMAPCapabilityOperation.h
index 7e1e7386..b205bd89 100644
--- a/src/async/imap/MCIMAPCapabilityOperation.h
+++ b/src/async/imap/MCIMAPCapabilityOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPCAPABILITYOPERATION_H_
+#ifndef MAILCORE_MCIMAPCAPABILITYOPERATION_H
-#define __MAILCORE_MCIMAPCAPABILITYOPERATION_H_
+#define MAILCORE_MCIMAPCAPABILITYOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h
index a1525500..7f7dafcb 100644
--- a/src/async/imap/MCIMAPCheckAccountOperation.h
+++ b/src/async/imap/MCIMAPCheckAccountOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPCHECKACCOUNTOPERATION_H_
+#ifndef MAILCORE_MCIMAPCHECKACCOUNTOPERATION_H
-#define __MAILCORE_MCIMAPCHECKACCOUNTOPERATION_H_
+#define MAILCORE_MCIMAPCHECKACCOUNTOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPConnectOperation.h b/src/async/imap/MCIMAPConnectOperation.h
index e2ecebb0..f48247e2 100644
--- a/src/async/imap/MCIMAPConnectOperation.h
+++ b/src/async/imap/MCIMAPConnectOperation.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPCONNECTOPERATION_H_
-#define __MAILCORE_MCIMAPCONNECTOPERATION_H_
+#ifndef MAILCORE_MCIMAPCONNECTOPERATION_H
+
+#define MAILCORE_MCIMAPCONNECTOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPCopyMessagesOperation.h b/src/async/imap/MCIMAPCopyMessagesOperation.h
index 5d573630..a4b5d546 100644
--- a/src/async/imap/MCIMAPCopyMessagesOperation.h
+++ b/src/async/imap/MCIMAPCopyMessagesOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPCOPYMESSAGESOPERATION_H_
+#ifndef MAILCORE_MCIMAPCOPYMESSAGESOPERATION_H
-#define __MAILCORE_MCIMAPCOPYMESSAGESOPERATION_H_
+#define MAILCORE_MCIMAPCOPYMESSAGESOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPCreateFolderOperation.h b/src/async/imap/MCIMAPCreateFolderOperation.h
index 2116df08..52c8b1e7 100644
--- a/src/async/imap/MCIMAPCreateFolderOperation.h
+++ b/src/async/imap/MCIMAPCreateFolderOperation.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPCREATEFOLDEROPERATION_H_
-#define __MAILCORE_MCIMAPCREATEFOLDEROPERATION_H_
+#ifndef MAILCORE_MCIMAPCREATEFOLDEROPERATION_H
+
+#define MAILCORE_MCIMAPCREATEFOLDEROPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPDeleteFolderOperation.h b/src/async/imap/MCIMAPDeleteFolderOperation.h
index 3d350eb0..57fee2eb 100644
--- a/src/async/imap/MCIMAPDeleteFolderOperation.h
+++ b/src/async/imap/MCIMAPDeleteFolderOperation.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPDELETEFOLDEROPERATION_H_
-#define __MAILCORE_MCIMAPDELETEFOLDEROPERATION_H_
+#ifndef MAILCORE_MCIMAPDELETEFOLDEROPERATION_H
+
+#define MAILCORE_MCIMAPDELETEFOLDEROPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPDisconnectOperation.h b/src/async/imap/MCIMAPDisconnectOperation.h
index 2bd00c5e..e48c79bf 100644
--- a/src/async/imap/MCIMAPDisconnectOperation.h
+++ b/src/async/imap/MCIMAPDisconnectOperation.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPDISCONNECTOPERATION_H_
-#define __MAILCORE_MCIMAPDISCONNECTOPERATION_H_
+#ifndef MAILCORE_MCIMAPDISCONNECTOPERATION_H
+
+#define MAILCORE_MCIMAPDISCONNECTOPERATION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstract.h>
diff --git a/src/async/imap/MCIMAPExpungeOperation.h b/src/async/imap/MCIMAPExpungeOperation.h
index 7e9df62e..505b6c10 100644
--- a/src/async/imap/MCIMAPExpungeOperation.h
+++ b/src/async/imap/MCIMAPExpungeOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPEXPUNGEOPERATION_H_
+#ifndef MAILCORE_MCIMAPEXPUNGEOPERATION_H
-#define __MAILCORE_MCIMAPEXPUNGEOPERATION_H_
+#define MAILCORE_MCIMAPEXPUNGEOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPFetchContentOperation.h b/src/async/imap/MCIMAPFetchContentOperation.h
index 0e3718d4..3d4dd17d 100644
--- a/src/async/imap/MCIMAPFetchContentOperation.h
+++ b/src/async/imap/MCIMAPFetchContentOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_IMAPFETCHCONTENTOPERATION_H_
+#ifndef MAILCORE_IMAPFETCHCONTENTOPERATION_H
-#define __MAILCORE_IMAPFETCHCONTENTOPERATION_H_
+#define MAILCORE_IMAPFETCHCONTENTOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h
index 2d9ff700..83351543 100644
--- a/src/async/imap/MCIMAPFetchFoldersOperation.h
+++ b/src/async/imap/MCIMAPFetchFoldersOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPFETCHFOLDERSOPERATION_H_
+#ifndef MAILCORE_MCIMAPFETCHFOLDERSOPERATION_H
-#define __MAILCORE_MCIMAPFETCHFOLDERSOPERATION_H_
+#define MAILCORE_MCIMAPFETCHFOLDERSOPERATION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h
index ec9aa0c4..3183508b 100644
--- a/src/async/imap/MCIMAPFetchMessagesOperation.h
+++ b/src/async/imap/MCIMAPFetchMessagesOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPFETCHMESSAGESOPERATION_H_
+#ifndef MAILCORE_MCIMAPFETCHMESSAGESOPERATION_H
-#define __MAILCORE_MCIMAPFETCHMESSAGESOPERATION_H_
+#define MAILCORE_MCIMAPFETCHMESSAGESOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPFetchNamespaceOperation.h b/src/async/imap/MCIMAPFetchNamespaceOperation.h
index 1138e62f..ae85d9d2 100644
--- a/src/async/imap/MCIMAPFetchNamespaceOperation.h
+++ b/src/async/imap/MCIMAPFetchNamespaceOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPFETCHNAMESPACEOPERATION_H_
+#ifndef MAILCORE_MCIMAPFETCHNAMESPACEOPERATION_H
-#define __MAILCORE_MCIMAPFETCHNAMESPACEOPERATION_H_
+#define MAILCORE_MCIMAPFETCHNAMESPACEOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h
index cf733b32..9b0027a4 100644
--- a/src/async/imap/MCIMAPFolderInfoOperation.h
+++ b/src/async/imap/MCIMAPFolderInfoOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPFOLDERINFOOPERATION_H_
+#ifndef MAILCORE_MCIMAPFOLDERINFOOPERATION_H
-#define __MAILCORE_MCIMAPFOLDERINFOOPERATION_H_
+#define MAILCORE_MCIMAPFOLDERINFOOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPFolderStatusOperation.h b/src/async/imap/MCIMAPFolderStatusOperation.h
index d8c30fea..c1d70249 100644
--- a/src/async/imap/MCIMAPFolderStatusOperation.h
+++ b/src/async/imap/MCIMAPFolderStatusOperation.h
@@ -7,9 +7,9 @@
//
-#ifndef __MAILCORE_MCIMAPFOLDERSTATUSOPERATION_H_
+#ifndef MAILCORE_MCIMAPFOLDERSTATUSOPERATION_H
-#define __MAILCORE_MCIMAPFOLDERSTATUSOPERATION_H_
+#define MAILCORE_MCIMAPFOLDERSTATUSOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPIdentityOperation.h b/src/async/imap/MCIMAPIdentityOperation.h
index 9426e092..6caef88e 100644
--- a/src/async/imap/MCIMAPIdentityOperation.h
+++ b/src/async/imap/MCIMAPIdentityOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPIDENTITYOPERATION_H_
+#ifndef MAILCORE_MCIMAPIDENTITYOPERATION_H
-#define __MAILCORE_MCIMAPIDENTITYOPERATION_H_
+#define MAILCORE_MCIMAPIDENTITYOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h
index 37e550b5..b91e2681 100644
--- a/src/async/imap/MCIMAPIdleOperation.h
+++ b/src/async/imap/MCIMAPIdleOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPIDLEOPERATION_H_
+#ifndef MAILCORE_MCIMAPIDLEOPERATION_H
-#define __MAILCORE_MCIMAPIDLEOPERATION_H_
+#define MAILCORE_MCIMAPIDLEOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPMessageRenderingOperation.h b/src/async/imap/MCIMAPMessageRenderingOperation.h
index 6c75c373..81e1f262 100644
--- a/src/async/imap/MCIMAPMessageRenderingOperation.h
+++ b/src/async/imap/MCIMAPMessageRenderingOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPMessageRenderingOperation_H_
+#ifndef MAILCORE_MCIMAPMessageRenderingOperation_H
-#define __MAILCORE_MCIMAPMessageRenderingOperation_H_
+#define MAILCORE_MCIMAPMessageRenderingOperation_H
#include <MailCore/MCIMAPOperation.h>
#include <MailCore/MCIMAPMessage.h>
diff --git a/src/async/imap/MCIMAPMultiDisconnectOperation.h b/src/async/imap/MCIMAPMultiDisconnectOperation.h
index d2d132c0..1575efa1 100644
--- a/src/async/imap/MCIMAPMultiDisconnectOperation.h
+++ b/src/async/imap/MCIMAPMultiDisconnectOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPMULTIDISCONNECTOPERATION_H_
+#ifndef MAILCORE_MCIMAPMULTIDISCONNECTOPERATION_H
-#define __MAILCORE_MCIMAPMULTIDISCONNECTOPERATION_H_
+#define MAILCORE_MCIMAPMULTIDISCONNECTOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPNoopOperation.h b/src/async/imap/MCIMAPNoopOperation.h
index 935f977d..8ff3fdaa 100644
--- a/src/async/imap/MCIMAPNoopOperation.h
+++ b/src/async/imap/MCIMAPNoopOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPNOOPOPERATION_H_
+#ifndef MAILCORE_MCIMAPNOOPOPERATION_H
-#define __MAILCORE_MCIMAPNOOPOPERATION_H_
+#define MAILCORE_MCIMAPNOOPOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPOperation.h b/src/async/imap/MCIMAPOperation.h
index 29b0782c..7455fdeb 100644
--- a/src/async/imap/MCIMAPOperation.h
+++ b/src/async/imap/MCIMAPOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPOPERATION_H_
+#ifndef MAILCORE_MCIMAPOPERATION_H
-#define __MAILCORE_MCIMAPOPERATION_H_
+#define MAILCORE_MCIMAPOPERATION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCIMAPProgressCallback.h>
diff --git a/src/async/imap/MCIMAPOperationCallback.h b/src/async/imap/MCIMAPOperationCallback.h
index 4899e585..cae7ef99 100644
--- a/src/async/imap/MCIMAPOperationCallback.h
+++ b/src/async/imap/MCIMAPOperationCallback.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPOPERATIONCALLBACK_H_
+#ifndef MAILCORE_MCIMAPOPERATIONCALLBACK_H
-#define __MAILCORE_MCIMAPOPERATIONCALLBACK_H_
+#define MAILCORE_MCIMAPOPERATIONCALLBACK_H
#ifdef __cplusplus
diff --git a/src/async/imap/MCIMAPQuotaOperation.h b/src/async/imap/MCIMAPQuotaOperation.h
index 1c8b737a..bff30952 100644
--- a/src/async/imap/MCIMAPQuotaOperation.h
+++ b/src/async/imap/MCIMAPQuotaOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPQuotaOperation_H_
+#ifndef MAILCORE_MCIMAPQuotaOperation_H
-#define __MAILCORE_MCIMAPQuotaOperation_H_
+#define MAILCORE_MCIMAPQuotaOperation_H
#include "MCIMAPOperation.h"
diff --git a/src/async/imap/MCIMAPRenameFolderOperation.h b/src/async/imap/MCIMAPRenameFolderOperation.h
index dff944c4..e8ba6fd5 100644
--- a/src/async/imap/MCIMAPRenameFolderOperation.h
+++ b/src/async/imap/MCIMAPRenameFolderOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPRENAMEFOLDEROPERATION_H_
+#ifndef MAILCORE_MCIMAPRENAMEFOLDEROPERATION_H
-#define __MAILCORE_MCIMAPRENAMEFOLDEROPERATION_H_
+#define MAILCORE_MCIMAPRENAMEFOLDEROPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPSearchOperation.h b/src/async/imap/MCIMAPSearchOperation.h
index 4cacf576..60355ca3 100644
--- a/src/async/imap/MCIMAPSearchOperation.h
+++ b/src/async/imap/MCIMAPSearchOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPSEARCHOPERATION_H_
+#ifndef MAILCORE_MCIMAPSEARCHOPERATION_H
-#define __MAILCORE_MCIMAPSEARCHOPERATION_H_
+#define MAILCORE_MCIMAPSEARCHOPERATION_H
#include <MailCore/MCIMAPOperation.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/async/imap/MCIMAPStoreFlagsOperation.h b/src/async/imap/MCIMAPStoreFlagsOperation.h
index c1b17db5..f6219b30 100644
--- a/src/async/imap/MCIMAPStoreFlagsOperation.h
+++ b/src/async/imap/MCIMAPStoreFlagsOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPSTOREFLAGSOPERATION_H_
+#ifndef MAILCORE_MCIMAPSTOREFLAGSOPERATION_H
-#define __MAILCORE_MCIMAPSTOREFLAGSOPERATION_H_
+#define MAILCORE_MCIMAPSTOREFLAGSOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h
index 77d94cab..822cd83f 100644
--- a/src/async/imap/MCIMAPStoreLabelsOperation.h
+++ b/src/async/imap/MCIMAPStoreLabelsOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPSTORELABELSOPERATION_H_
+#ifndef MAILCORE_MCIMAPSTORELABELSOPERATION_H
-#define __MAILCORE_MCIMAPSTORELABELSOPERATION_H_
+#define MAILCORE_MCIMAPSTORELABELSOPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/imap/MCIMAPSubscribeFolderOperation.h b/src/async/imap/MCIMAPSubscribeFolderOperation.h
index 7cd79eab..8af219b6 100644
--- a/src/async/imap/MCIMAPSubscribeFolderOperation.h
+++ b/src/async/imap/MCIMAPSubscribeFolderOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPSUBSCRIBEFOLDEROPERATION_H_
+#ifndef MAILCORE_MCIMAPSUBSCRIBEFOLDEROPERATION_H
-#define __MAILCORE_MCIMAPSUBSCRIBEFOLDEROPERATION_H_
+#define MAILCORE_MCIMAPSUBSCRIBEFOLDEROPERATION_H
#include <MailCore/MCIMAPOperation.h>
diff --git a/src/async/pop/MCAsyncPOP.h b/src/async/pop/MCAsyncPOP.h
index 880e700e..79740310 100644
--- a/src/async/pop/MCAsyncPOP.h
+++ b/src/async/pop/MCAsyncPOP.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCASYNCPOP_H_
+#ifndef MAILCORE_MCASYNCPOP_H
-#define __MAILCORE_MCASYNCPOP_H_
+#define MAILCORE_MCASYNCPOP_H
#include <MailCore/MCPOPAsyncSession.h>
#include <MailCore/MCPOPOperation.h>
diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h
index ff8df853..dae0f7b7 100644
--- a/src/async/pop/MCPOPAsyncSession.h
+++ b/src/async/pop/MCPOPAsyncSession.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPASYNCSESSION_H_
+#ifndef MAILCORE_MCPOPASYNCSESSION_H
-#define __MAILCORE_MCPOPASYNCSESSION_H_
+#define MAILCORE_MCPOPASYNCSESSION_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/async/pop/MCPOPCheckAccountOperation.h b/src/async/pop/MCPOPCheckAccountOperation.h
index 50e381fd..6f00af77 100644
--- a/src/async/pop/MCPOPCheckAccountOperation.h
+++ b/src/async/pop/MCPOPCheckAccountOperation.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPCHECKACCOUNTOPERATION_H_
-#define __MAILCORE_MCPOPCHECKACCOUNTOPERATION_H_
+#ifndef MAILCORE_MCPOPCHECKACCOUNTOPERATION_H
+
+#define MAILCORE_MCPOPCHECKACCOUNTOPERATION_H
#include <MailCore/MCPOPOperation.h>
diff --git a/src/async/pop/MCPOPDeleteMessagesOperation.h b/src/async/pop/MCPOPDeleteMessagesOperation.h
index a7e02d9f..a973fa78 100644
--- a/src/async/pop/MCPOPDeleteMessagesOperation.h
+++ b/src/async/pop/MCPOPDeleteMessagesOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPDELETEMESSAGESOPERATION_H_
+#ifndef MAILCORE_MCPOPDELETEMESSAGESOPERATION_H
-#define __MAILCORE_MCPOPDELETEMESSAGESOPERATION_H_
+#define MAILCORE_MCPOPDELETEMESSAGESOPERATION_H
#include <MailCore/MCPOPOperation.h>
diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h
index 65a86849..d046654b 100644
--- a/src/async/pop/MCPOPFetchHeaderOperation.h
+++ b/src/async/pop/MCPOPFetchHeaderOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPFETCHHEADEROPERATION_H_
+#ifndef MAILCORE_MCPOPFETCHHEADEROPERATION_H
-#define __MAILCORE_MCPOPFETCHHEADEROPERATION_H_
+#define MAILCORE_MCPOPFETCHHEADEROPERATION_H
#include <MailCore/MCPOPOperation.h>
diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h
index 79f9c7f4..86d08af3 100644
--- a/src/async/pop/MCPOPFetchMessageOperation.h
+++ b/src/async/pop/MCPOPFetchMessageOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPFETCHMESSAGEOPERATION_H_
+#ifndef MAILCORE_MCPOPFETCHMESSAGEOPERATION_H
-#define __MAILCORE_MCPOPFETCHMESSAGEOPERATION_H_
+#define MAILCORE_MCPOPFETCHMESSAGEOPERATION_H
#include <MailCore/MCPOPOperation.h>
diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h
index 08ac8b59..eaee884d 100644
--- a/src/async/pop/MCPOPFetchMessagesOperation.h
+++ b/src/async/pop/MCPOPFetchMessagesOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPFETCHMESSAGESOPERATION_H_
+#ifndef MAILCORE_MCPOPFETCHMESSAGESOPERATION_H
-#define __MAILCORE_MCPOPFETCHMESSAGESOPERATION_H_
+#define MAILCORE_MCPOPFETCHMESSAGESOPERATION_H
#include <MailCore/MCPOPOperation.h>
diff --git a/src/async/pop/MCPOPNoopOperation.h b/src/async/pop/MCPOPNoopOperation.h
index d0736006..705d396b 100644
--- a/src/async/pop/MCPOPNoopOperation.h
+++ b/src/async/pop/MCPOPNoopOperation.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPNOOPOPERATION_H_
-#define __MAILCORE_MCPOPNOOPOPERATION_H_
+#ifndef MAILCORE_MCPOPNOOPOPERATION_H
+
+#define MAILCORE_MCPOPNOOPOPERATION_H
#include <MailCore/MCPOPOperation.h>
diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h
index ca791fbe..1b454e98 100644
--- a/src/async/pop/MCPOPOperation.h
+++ b/src/async/pop/MCPOPOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPOPERATION_H_
+#ifndef MAILCORE_MCPOPOPERATION_H
-#define __MAILCORE_MCPOPOPERATION_H_
+#define MAILCORE_MCPOPOPERATION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCPOPProgressCallback.h>
diff --git a/src/async/pop/MCPOPOperationCallback.h b/src/async/pop/MCPOPOperationCallback.h
index 175afa6b..ccc21681 100644
--- a/src/async/pop/MCPOPOperationCallback.h
+++ b/src/async/pop/MCPOPOperationCallback.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPOPOPERATIONCALLBACK_H_
+#ifndef MAILCORE_MCPOPOPERATIONCALLBACK_H
-#define __MAILCORE_MCPOPOPERATIONCALLBACK_H_
+#define MAILCORE_MCPOPOPERATIONCALLBACK_H
#ifdef __cplusplus
diff --git a/src/async/smtp/MCAsyncSMTP.h b/src/async/smtp/MCAsyncSMTP.h
index 194a8fd3..d7bac9db 100644
--- a/src/async/smtp/MCAsyncSMTP.h
+++ b/src/async/smtp/MCAsyncSMTP.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCASYNCSMTP_H_
+#ifndef MAILCORE_MCASYNCSMTP_H
-#define __MAILCORE_MCASYNCSMTP_H_
+#define MAILCORE_MCASYNCSMTP_H
#include <MailCore/MCSMTPAsyncSession.h>
#include <MailCore/MCSMTPOperation.h>
diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h
index b3ef4455..fa0893d2 100644
--- a/src/async/smtp/MCSMTPAsyncSession.h
+++ b/src/async/smtp/MCSMTPAsyncSession.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCSMTPASYNCSESSION_H
+#ifndef MAILCORE_MCSMTPASYNCSESSION_H
-#define __MAILCORE_MCSMTPASYNCSESSION_H
+#define MAILCORE_MCSMTPASYNCSESSION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/async/smtp/MCSMTPCheckAccountOperation.h b/src/async/smtp/MCSMTPCheckAccountOperation.h
index af9862c4..e1fd373f 100644
--- a/src/async/smtp/MCSMTPCheckAccountOperation.h
+++ b/src/async/smtp/MCSMTPCheckAccountOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCSMTPCHECKACCOUNTOPERATION_H_
+#ifndef MAILCORE_MCSMTPCHECKACCOUNTOPERATION_H
-#define __MAILCORE_MCSMTPCHECKACCOUNTOPERATION_H_
+#define MAILCORE_MCSMTPCHECKACCOUNTOPERATION_H
#include <MailCore/MCSMTPOperation.h>
#include <MailCore/MCAbstract.h>
diff --git a/src/async/smtp/MCSMTPDisconnectOperation.h b/src/async/smtp/MCSMTPDisconnectOperation.h
index bd35674f..11853065 100644
--- a/src/async/smtp/MCSMTPDisconnectOperation.h
+++ b/src/async/smtp/MCSMTPDisconnectOperation.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCSMTPDISCONNECTOPERATION_H_
-#define __MAILCORE_MCSMTPDISCONNECTOPERATION_H_
+#ifndef MAILCORE_MCSMTPDISCONNECTOPERATION_H
+
+#define MAILCORE_MCSMTPDISCONNECTOPERATION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstract.h>
diff --git a/src/async/smtp/MCSMTPNoopOperation.h b/src/async/smtp/MCSMTPNoopOperation.h
index 53c5d864..09116758 100644
--- a/src/async/smtp/MCSMTPNoopOperation.h
+++ b/src/async/smtp/MCSMTPNoopOperation.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCSMTPNOOPOPERATION_H_
-#define __MAILCORE_MCSMTPNOOPOPERATION_H_
+#ifndef MAILCORE_MCSMTPNOOPOPERATION_H
+
+#define MAILCORE_MCSMTPNOOPOPERATION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstract.h>
diff --git a/src/async/smtp/MCSMTPOperation.h b/src/async/smtp/MCSMTPOperation.h
index 7f6c9e7b..1d24f481 100644
--- a/src/async/smtp/MCSMTPOperation.h
+++ b/src/async/smtp/MCSMTPOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCSMTPOPERATION_H_
+#ifndef MAILCORE_MCSMTPOPERATION_H
-#define __MAILCORE_MCSMTPOPERATION_H_
+#define MAILCORE_MCSMTPOPERATION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCSMTPProgressCallback.h>
diff --git a/src/async/smtp/MCSMTPOperationCallback.h b/src/async/smtp/MCSMTPOperationCallback.h
index cf5630ec..5a3d00df 100644
--- a/src/async/smtp/MCSMTPOperationCallback.h
+++ b/src/async/smtp/MCSMTPOperationCallback.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCSMTPOPERATIONCALLBACK_H_
+#ifndef MAILCORE_MCSMTPOPERATIONCALLBACK_H
-#define __MAILCORE_MCSMTPOPERATIONCALLBACK_H_
+#define MAILCORE_MCSMTPOPERATIONCALLBACK_H
#ifdef __cplusplus
diff --git a/src/async/smtp/MCSMTPSendWithDataOperation.h b/src/async/smtp/MCSMTPSendWithDataOperation.h
index ee325b54..9d2f087a 100644
--- a/src/async/smtp/MCSMTPSendWithDataOperation.h
+++ b/src/async/smtp/MCSMTPSendWithDataOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCSMTPSENDWITHDATAOPERATION_H_
+#ifndef MAILCORE_MCSMTPSENDWITHDATAOPERATION_H
-#define __MAILCORE_MCSMTPSENDWITHDATAOPERATION_H_
+#define MAILCORE_MCSMTPSENDWITHDATAOPERATION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstract.h>
diff --git a/src/core/MCCore.h b/src/core/MCCore.h
index 24351281..74c16147 100644
--- a/src/core/MCCore.h
+++ b/src/core/MCCore.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCCORE_H_
-#define __MAILCORE_MCCORE_H_
+#ifndef MAILCORE_MCCORE_H
+
+#define MAILCORE_MCCORE_H
#include <MailCore/MCAbstract.h>
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/abstract/MCAbstract.h b/src/core/abstract/MCAbstract.h
index d53a69a4..03299ec4 100644
--- a/src/core/abstract/MCAbstract.h
+++ b/src/core/abstract/MCAbstract.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCABSTRACT_H
+#ifndef MAILCORE_MCABSTRACT_H
-#define __MAILCORE_MCABSTRACT_H
+#define MAILCORE_MCABSTRACT_H
#include <MailCore/MCAbstractMessage.h>
#include <MailCore/MCAbstractMessagePart.h>
diff --git a/src/core/abstract/MCAbstractMessage.h b/src/core/abstract/MCAbstractMessage.h
index c785f181..f7edd0c9 100644
--- a/src/core/abstract/MCAbstractMessage.h
+++ b/src/core/abstract/MCAbstractMessage.h
@@ -1,5 +1,6 @@
-#ifndef __MAILCORE_MCABSTRACTMESSAGE_H_
-#define __MAILCORE_MCABSTRACTMESSAGE_H_
+#ifndef MAILCORE_MCABSTRACTMESSAGE_H
+
+#define MAILCORE_MCABSTRACTMESSAGE_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/abstract/MCAbstractMessagePart.h b/src/core/abstract/MCAbstractMessagePart.h
index 45790f4a..1df64599 100644
--- a/src/core/abstract/MCAbstractMessagePart.h
+++ b/src/core/abstract/MCAbstractMessagePart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCABSTRACTMESSAGEPART_H_
+#ifndef MAILCORE_MCABSTRACTMESSAGEPART_H
-#define __MAILCORE_MCABSTRACTMESSAGEPART_H_
+#define MAILCORE_MCABSTRACTMESSAGEPART_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractPart.h>
diff --git a/src/core/abstract/MCAbstractMultipart.h b/src/core/abstract/MCAbstractMultipart.h
index ecb514bf..c2a07bed 100644
--- a/src/core/abstract/MCAbstractMultipart.h
+++ b/src/core/abstract/MCAbstractMultipart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCABSTRACTMULTIPART_H
+#ifndef MAILCORE_MCABSTRACTMULTIPART_H
-#define __MAILCORE_MCABSTRACTMULTIPART_H
+#define MAILCORE_MCABSTRACTMULTIPART_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractPart.h>
diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h
index d1224c16..7f641205 100644
--- a/src/core/abstract/MCAbstractPart.h
+++ b/src/core/abstract/MCAbstractPart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCABSTRACTPART_H_
+#ifndef MAILCORE_MCABSTRACTPART_H
-#define __MAILCORE_MCABSTRACTPART_H_
+#define MAILCORE_MCABSTRACTPART_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/abstract/MCAddress.h b/src/core/abstract/MCAddress.h
index 4c38ff4c..c55efe5f 100644
--- a/src/core/abstract/MCAddress.h
+++ b/src/core/abstract/MCAddress.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCADDRESS_H_
+#ifndef MAILCORE_MCADDRESS_H
-#define __MAILCORE_MCADDRESS_H_
+#define MAILCORE_MCADDRESS_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index 1381b5e6..c2f77c89 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -1,5 +1,6 @@
-#ifndef __MAILCORE_MCMESSAGECONSTANTS_H_
-#define __MAILCORE_MCMESSAGECONSTANTS_H_
+#ifndef MAILCORE_MCMESSAGECONSTANTS_H
+
+#define MAILCORE_MCMESSAGECONSTANTS_H
#ifdef __cplusplus
diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h
index 3e4af198..c6f1fbef 100644
--- a/src/core/abstract/MCMessageHeader.h
+++ b/src/core/abstract/MCMessageHeader.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCMESSAGEHEADER_H_
+#ifndef MAILCORE_MCMESSAGEHEADER_H
-#define __MAILCORE_MCMESSAGEHEADER_H_
+#define MAILCORE_MCMESSAGEHEADER_H
#include <MailCore/MCBaseTypes.h>
#include <time.h>
diff --git a/src/core/basetypes/MCArray.h b/src/core/basetypes/MCArray.h
index a26e34d8..6ee64792 100644
--- a/src/core/basetypes/MCArray.h
+++ b/src/core/basetypes/MCArray.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCARRAY_H_
+#ifndef MAILCORE_MCARRAY_H
-#define __MAILCORE_MCARRAY_H_
+#define MAILCORE_MCARRAY_H
#include <MailCore/MCObject.h>
diff --git a/src/core/basetypes/MCAssert.h b/src/core/basetypes/MCAssert.h
index 54979d64..4584aa0a 100644
--- a/src/core/basetypes/MCAssert.h
+++ b/src/core/basetypes/MCAssert.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCASSERT_H_
+#ifndef MAILCORE_MCASSERT_H
-#define __MAILCORE_MCASSERT_H_
+#define MAILCORE_MCASSERT_H
#define MCAssert(cond) MCAssertInternal(__FILE__, __LINE__, cond, #cond)
diff --git a/src/core/basetypes/MCAutoreleasePool.h b/src/core/basetypes/MCAutoreleasePool.h
index 7feb52f5..f987fd08 100644
--- a/src/core/basetypes/MCAutoreleasePool.h
+++ b/src/core/basetypes/MCAutoreleasePool.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCAUTORELEASEPOOL_H_
+#ifndef MAILCORE_MCAUTORELEASEPOOL_H
-#define __MAILCORE_MCAUTORELEASEPOOL_H_
+#define MAILCORE_MCAUTORELEASEPOOL_H
#include <MailCore/MCObject.h>
#include <pthread.h>
diff --git a/src/core/basetypes/MCBase64.h b/src/core/basetypes/MCBase64.h
index ff61188b..7aa64f2a 100644
--- a/src/core/basetypes/MCBase64.h
+++ b/src/core/basetypes/MCBase64.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCBASE64_H_
-#define __MAILCORE_MCBASE64_H_
+#ifndef MAILCORE_MCBASE64_H
+
+#define MAILCORE_MCBASE64_H
#ifdef __cplusplus
extern "C" {
diff --git a/src/core/basetypes/MCBaseTypes.h b/src/core/basetypes/MCBaseTypes.h
index 96fa23fd..ce3e1153 100644
--- a/src/core/basetypes/MCBaseTypes.h
+++ b/src/core/basetypes/MCBaseTypes.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCBASETYPES_H_
+#ifndef MAILCORE_MCBASETYPES_H
-#define __MAILCORE_MCBASETYPES_H_
+#define MAILCORE_MCBASETYPES_H
#include <MailCore/MCAutoreleasePool.h>
#include <MailCore/MCObject.h>
diff --git a/src/core/basetypes/MCConnectionLogger.h b/src/core/basetypes/MCConnectionLogger.h
index bdb588bc..4e2249ff 100644
--- a/src/core/basetypes/MCConnectionLogger.h
+++ b/src/core/basetypes/MCConnectionLogger.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_CONNECTION_LOGGER_H_
-#define __MAILCORE_CONNECTION_LOGGER_H_
+#ifndef MAILCORE_CONNECTION_LOGGER_H
+
+#define MAILCORE_CONNECTION_LOGGER_H
#include <stdlib.h>
diff --git a/src/core/basetypes/MCConnectionLoggerUtils.h b/src/core/basetypes/MCConnectionLoggerUtils.h
index a48c8a07..055b8c9d 100644
--- a/src/core/basetypes/MCConnectionLoggerUtils.h
+++ b/src/core/basetypes/MCConnectionLoggerUtils.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCCONNECTIONLOGGERUTILS_H_
-#define __MAILCORE_MCCONNECTIONLOGGERUTILS_H_
+#ifndef MAILCORE_MCCONNECTIONLOGGERUTILS_H
+
+#define MAILCORE_MCCONNECTIONLOGGERUTILS_H
#include <MailCore/MCConnectionLogger.h>
diff --git a/src/core/basetypes/MCData.h b/src/core/basetypes/MCData.h
index 245ac0c4..6ba056e7 100644
--- a/src/core/basetypes/MCData.h
+++ b/src/core/basetypes/MCData.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCDATA_H_
+#ifndef MAILCORE_MCDATA_H
-#define __MAILCORE_MCDATA_H_
+#define MAILCORE_MCDATA_H
#include <MailCore/MCObject.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/basetypes/MCHTMLCleaner.h b/src/core/basetypes/MCHTMLCleaner.h
index a7c54eff..bf692e5c 100644
--- a/src/core/basetypes/MCHTMLCleaner.h
+++ b/src/core/basetypes/MCHTMLCleaner.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_HTMLCLEANER_H_
+#ifndef MAILCORE_HTMLCLEANER_H
-#define __MAILCORE_HTMLCLEANER_H_
+#define MAILCORE_HTMLCLEANER_H
#include <MailCore/MCString.h>
diff --git a/src/core/basetypes/MCHash.h b/src/core/basetypes/MCHash.h
index bce93bfc..5ef0c291 100644
--- a/src/core/basetypes/MCHash.h
+++ b/src/core/basetypes/MCHash.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCHASH_H_
+#ifndef MAILCORE_MCHASH_H
-#define __MAILCORE_MCHASH_H_
+#define MAILCORE_MCHASH_H
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCHashMap.h b/src/core/basetypes/MCHashMap.h
index d367a43d..ea533dfe 100644
--- a/src/core/basetypes/MCHashMap.h
+++ b/src/core/basetypes/MCHashMap.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCHASHMAP_H_
+#ifndef MAILCORE_MCHASHMAP_H
-#define __MAILCORE_MCHASHMAP_H_
+#define MAILCORE_MCHASHMAP_H
#include <MailCore/MCObject.h>
diff --git a/src/core/basetypes/MCICUTypes.h b/src/core/basetypes/MCICUTypes.h
index e1cff6d6..5b43c5dc 100644
--- a/src/core/basetypes/MCICUTypes.h
+++ b/src/core/basetypes/MCICUTypes.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCICUTYPES_H_
-#define __MAILCORE_MCICUTYPES_H_
+#ifndef MAILCORE_MCICUTYPES_H
+
+#define MAILCORE_MCICUTYPES_H
#if defined(__CHAR16_TYPE__)
typedef __CHAR16_TYPE__ UChar;
diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h
index 57fcd538..525cdda8 100644
--- a/src/core/basetypes/MCIndexSet.h
+++ b/src/core/basetypes/MCIndexSet.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCINDEXSET_H_
+#ifndef MAILCORE_MCINDEXSET_H
-#define __MAILCORE_MCINDEXSET_H_
+#define MAILCORE_MCINDEXSET_H
#include <MailCore/MCObject.h>
#include <MailCore/MCRange.h>
diff --git a/src/core/basetypes/MCIterator.h b/src/core/basetypes/MCIterator.h
index 22c264ad..08a3b256 100644
--- a/src/core/basetypes/MCIterator.h
+++ b/src/core/basetypes/MCIterator.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_ITERATOR_H_
-#define __MAILCORE_ITERATOR_H_
+#ifndef MAILCORE_ITERATOR_H
+
+#define MAILCORE_ITERATOR_H
#include <MailCore/MCArray.h>
#include <MailCore/MCHashMap.h>
diff --git a/src/core/basetypes/MCJSON.h b/src/core/basetypes/MCJSON.h
index 2049de16..d10f7d77 100644
--- a/src/core/basetypes/MCJSON.h
+++ b/src/core/basetypes/MCJSON.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCJSON_H_
-#define __MAILCORE_MCJSON_H_
+#ifndef MAILCORE_MCJSON_H
+
+#define MAILCORE_MCJSON_H
#include <MailCore/MCObject.h>
#include <MailCore/MCHashMap.h>
diff --git a/src/core/basetypes/MCJSONParser.h b/src/core/basetypes/MCJSONParser.h
index 4f759708..16a40c92 100644
--- a/src/core/basetypes/MCJSONParser.h
+++ b/src/core/basetypes/MCJSONParser.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCJSONPARSER_H_
-#define __MAILCORE_MCJSONPARSER_H_
+#ifndef MAILCORE_MCJSONPARSER_H
+
+#define MAILCORE_MCJSONPARSER_H
#include <MailCore/MCObject.h>
#include <MailCore/MCICUTypes.h>
diff --git a/src/core/basetypes/MCLibetpan.h b/src/core/basetypes/MCLibetpan.h
index ef7db1f8..9670a47b 100644
--- a/src/core/basetypes/MCLibetpan.h
+++ b/src/core/basetypes/MCLibetpan.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCLIBETPAN_H_
-#define __MAILCORE_MCLIBETPAN_H_
+#ifndef MAILCORE_MCLIBETPAN_H
+
+#define MAILCORE_MCLIBETPAN_H
// No API in this file.
diff --git a/src/core/basetypes/MCLibetpanTypes.h b/src/core/basetypes/MCLibetpanTypes.h
index 33dac195..e2027804 100644
--- a/src/core/basetypes/MCLibetpanTypes.h
+++ b/src/core/basetypes/MCLibetpanTypes.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCLIBETPANTYPES_H_
-#define __MAILCORE_MCLIBETPANTYPES_H_
+#ifndef MAILCORE_MCLIBETPANTYPES_H
+
+#define MAILCORE_MCLIBETPANTYPES_H
#ifdef __cplusplus
extern "C" {
diff --git a/src/core/basetypes/MCLog.h b/src/core/basetypes/MCLog.h
index 6911ab02..21a24509 100644
--- a/src/core/basetypes/MCLog.h
+++ b/src/core/basetypes/MCLog.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCLOG_H_
+#ifndef MAILCORE_MCLOG_H
-#define __MAILCORE_MCLOG_H_
+#define MAILCORE_MCLOG_H
#include <stdio.h>
diff --git a/src/core/basetypes/MCMD5.h b/src/core/basetypes/MCMD5.h
index 1d2f76b1..a7522318 100644
--- a/src/core/basetypes/MCMD5.h
+++ b/src/core/basetypes/MCMD5.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCMD5_H_
-#define __MAILCORE_MCMD5_H_
+#ifndef MAILCORE_MCMD5_H
+
+#define MAILCORE_MCMD5_H
#include <MailCore/MCData.h>
#include <MailCore/MCString.h>
diff --git a/src/core/basetypes/MCMainThread.h b/src/core/basetypes/MCMainThread.h
index c9fe4e8d..df246665 100644
--- a/src/core/basetypes/MCMainThread.h
+++ b/src/core/basetypes/MCMainThread.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCMAINTHREAD_H
+#ifndef MAILCORE_MCMAINTHREAD_H
-#define __MAILCORE_MCMAINTHREAD_H
+#define MAILCORE_MCMAINTHREAD_H
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCNull.h b/src/core/basetypes/MCNull.h
index 9a8f994d..d17eb108 100644
--- a/src/core/basetypes/MCNull.h
+++ b/src/core/basetypes/MCNull.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCNULL_H_
-#define __MAILCORE_MCNULL_H_
+#ifndef MAILCORE_MCNULL_H
+
+#define MAILCORE_MCNULL_H
#include <MailCore/MCObject.h>
diff --git a/src/core/basetypes/MCObject.h b/src/core/basetypes/MCObject.h
index e3d74f52..4300d914 100644
--- a/src/core/basetypes/MCObject.h
+++ b/src/core/basetypes/MCObject.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCOBJECT_H_
+#ifndef MAILCORE_MCOBJECT_H
-#define __MAILCORE_MCOBJECT_H_
+#define MAILCORE_MCOBJECT_H
#include <pthread.h>
#if __APPLE__
diff --git a/src/core/basetypes/MCOperation.h b/src/core/basetypes/MCOperation.h
index 9e59b11e..6916caa3 100644
--- a/src/core/basetypes/MCOperation.h
+++ b/src/core/basetypes/MCOperation.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCOPERATION_H_
+#ifndef MAILCORE_MCOPERATION_H
-#define __MAILCORE_MCOPERATION_H_
+#define MAILCORE_MCOPERATION_H
#include <pthread.h>
#include <MailCore/MCObject.h>
diff --git a/src/core/basetypes/MCOperationCallback.h b/src/core/basetypes/MCOperationCallback.h
index 66a50524..b8bea4d9 100644
--- a/src/core/basetypes/MCOperationCallback.h
+++ b/src/core/basetypes/MCOperationCallback.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCOPERATIONCALLBACK_H_
+#ifndef MAILCORE_MCOPERATIONCALLBACK_H
-#define __MAILCORE_MCOPERATIONCALLBACK_H_
+#define MAILCORE_MCOPERATIONCALLBACK_H
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCOperationQueue.h b/src/core/basetypes/MCOperationQueue.h
index f343c603..202dec40 100644
--- a/src/core/basetypes/MCOperationQueue.h
+++ b/src/core/basetypes/MCOperationQueue.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCOPERATIONQUEUE_H_
+#ifndef MAILCORE_MCOPERATIONQUEUE_H
-#define __MAILCORE_MCOPERATIONQUEUE_H_
+#define MAILCORE_MCOPERATIONQUEUE_H
#include <pthread.h>
#include <semaphore.h>
diff --git a/src/core/basetypes/MCOperationQueueCallback.h b/src/core/basetypes/MCOperationQueueCallback.h
index d849a441..182085a9 100644
--- a/src/core/basetypes/MCOperationQueueCallback.h
+++ b/src/core/basetypes/MCOperationQueueCallback.h
@@ -6,8 +6,8 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_OPERATIONQUEUECALLBACK_H_
-#define __MAILCORE_OPERATIONQUEUECALLBACK_H_
+#ifndef MAILCORE_OPERATIONQUEUECALLBACK_H
+#define MAILCORE_OPERATIONQUEUECALLBACK_H
namespace mailcore {
diff --git a/src/core/basetypes/MCRange.h b/src/core/basetypes/MCRange.h
index 582a8407..12e1a9c0 100644
--- a/src/core/basetypes/MCRange.h
+++ b/src/core/basetypes/MCRange.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCRANGE_H_
+#ifndef MAILCORE_MCRANGE_H
-#define __MAILCORE_MCRANGE_H_
+#define MAILCORE_MCRANGE_H
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCSet.h b/src/core/basetypes/MCSet.h
index 39793d80..334310a7 100644
--- a/src/core/basetypes/MCSet.h
+++ b/src/core/basetypes/MCSet.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_CSET_H_
+#ifndef MAILCORE_CSET_H
-#define __MAILCORE_CSET_H_
+#define MAILCORE_CSET_H
#include <MailCore/MCObject.h>
diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h
index 49e0a5ac..7fd07570 100644
--- a/src/core/basetypes/MCString.h
+++ b/src/core/basetypes/MCString.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCSTR_H_
+#ifndef MAILCORE_MCSTR_H
-#define __MAILCORE_MCSTR_H_
+#define MAILCORE_MCSTR_H
#include <MailCore/MCObject.h>
#include <MailCore/MCRange.h>
diff --git a/src/core/basetypes/MCUtils.h b/src/core/basetypes/MCUtils.h
index 7fecfc90..e1bef841 100644
--- a/src/core/basetypes/MCUtils.h
+++ b/src/core/basetypes/MCUtils.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCUTILS_H
+#ifndef MAILCORE_MCUTILS_H
-#define __MAILCORE_MCUTILS_H
+#define MAILCORE_MCUTILS_H
#ifdef __cplusplus
diff --git a/src/core/basetypes/MCValue.h b/src/core/basetypes/MCValue.h
index f4ea6a6e..7de1a0d4 100644
--- a/src/core/basetypes/MCValue.h
+++ b/src/core/basetypes/MCValue.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCVALUE_H_
+#ifndef MAILCORE_MCVALUE_H
-#define __MAILCORE_MCVALUE_H_
+#define MAILCORE_MCVALUE_H
#include <MailCore/MCObject.h>
diff --git a/src/core/basetypes/MCValuePrivate.h b/src/core/basetypes/MCValuePrivate.h
index 873071f9..67516ad6 100644
--- a/src/core/basetypes/MCValuePrivate.h
+++ b/src/core/basetypes/MCValuePrivate.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCVALUEPRIVATE_H_
+#ifndef MAILCORE_MCVALUEPRIVATE_H
-#define __MAILCORE_MCVALUEPRIVATE_H_
+#define MAILCORE_MCVALUEPRIVATE_H
enum {
VALUE_TYPE_NONE = mailcore::ValueTypeNone,
diff --git a/src/core/imap/MCIMAP.h b/src/core/imap/MCIMAP.h
index 3faddea1..6e80995f 100644
--- a/src/core/imap/MCIMAP.h
+++ b/src/core/imap/MCIMAP.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAP_H_
+#ifndef MAILCORE_MCIMAP_H
-#define __MAILCORE_MCIMAP_H_
+#define MAILCORE_MCIMAP_H
#include <MailCore/MCIMAPFolder.h>
#include <MailCore/MCIMAPMessage.h>
diff --git a/src/core/imap/MCIMAPFolder.h b/src/core/imap/MCIMAPFolder.h
index 85bfd69f..3bc20589 100644
--- a/src/core/imap/MCIMAPFolder.h
+++ b/src/core/imap/MCIMAPFolder.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPFOLDER_H
+#ifndef MAILCORE_MCIMAPFOLDER_H
-#define __MAILCORE_MCIMAPFOLDER_H
+#define MAILCORE_MCIMAPFOLDER_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/imap/MCIMAPFolderStatus.h b/src/core/imap/MCIMAPFolderStatus.h
index a4c9ede9..db3243fe 100644
--- a/src/core/imap/MCIMAPFolderStatus.h
+++ b/src/core/imap/MCIMAPFolderStatus.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPFOLDERSTATUS_H
+#ifndef MAILCORE_MCIMAPFOLDERSTATUS_H
-#define __MAILCORE_MCIMAPFOLDERSTATUS_H
+#define MAILCORE_MCIMAPFOLDERSTATUS_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/imap/MCIMAPIdentity.h b/src/core/imap/MCIMAPIdentity.h
index 83bd3273..ab96abb3 100644
--- a/src/core/imap/MCIMAPIdentity.h
+++ b/src/core/imap/MCIMAPIdentity.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPIDENTITY_H
+#ifndef MAILCORE_MCIMAPIDENTITY_H
-#define __MAILCORE_MCIMAPIDENTITY_H
+#define MAILCORE_MCIMAPIDENTITY_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h
index e072d131..a78a04d6 100644
--- a/src/core/imap/MCIMAPMessage.h
+++ b/src/core/imap/MCIMAPMessage.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_IMAP_MESSAGE_H_
+#ifndef MAILCORE_IMAP_MESSAGE_H
-#define __MAILCORE_IMAP_MESSAGE_H_
+#define MAILCORE_IMAP_MESSAGE_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractMessage.h>
diff --git a/src/core/imap/MCIMAPMessagePart.h b/src/core/imap/MCIMAPMessagePart.h
index a355ed8f..0a65284e 100644
--- a/src/core/imap/MCIMAPMessagePart.h
+++ b/src/core/imap/MCIMAPMessagePart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_IMAPMESSAGEPART_H_
+#ifndef MAILCORE_IMAPMESSAGEPART_H
-#define __MAILCORE_IMAPMESSAGEPART_H_
+#define MAILCORE_IMAPMESSAGEPART_H
#include <MailCore/MCAbstractMessagePart.h>
diff --git a/src/core/imap/MCIMAPMultipart.h b/src/core/imap/MCIMAPMultipart.h
index 9d03bd78..e420b228 100644
--- a/src/core/imap/MCIMAPMultipart.h
+++ b/src/core/imap/MCIMAPMultipart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPMULTIPART_H
+#ifndef MAILCORE_MCIMAPMULTIPART_H
-#define __MAILCORE_MCIMAPMULTIPART_H
+#define MAILCORE_MCIMAPMULTIPART_H
#include <MailCore/MCAbstractMultipart.h>
diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h
index bcb4b185..0c7ac6a5 100644
--- a/src/core/imap/MCIMAPNamespace.h
+++ b/src/core/imap/MCIMAPNamespace.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPNAMESPACE_H_
+#ifndef MAILCORE_MCIMAPNAMESPACE_H
-#define __MAILCORE_MCIMAPNAMESPACE_H_
+#define MAILCORE_MCIMAPNAMESPACE_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h
index a4cc605b..a78d6918 100644
--- a/src/core/imap/MCIMAPNamespaceItem.h
+++ b/src/core/imap/MCIMAPNamespaceItem.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPNAMESPACEITEM_H
+#ifndef MAILCORE_MCIMAPNAMESPACEITEM_H
-#define __MAILCORE_MCIMAPNAMESPACEITEM_H
+#define MAILCORE_MCIMAPNAMESPACEITEM_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h
index 039f620c..f04bb903 100644
--- a/src/core/imap/MCIMAPPart.h
+++ b/src/core/imap/MCIMAPPart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPPART_H_
+#ifndef MAILCORE_MCIMAPPART_H
-#define __MAILCORE_MCIMAPPART_H_
+#define MAILCORE_MCIMAPPART_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractPart.h>
diff --git a/src/core/imap/MCIMAPProgressCallback.h b/src/core/imap/MCIMAPProgressCallback.h
index 22427afe..2df48156 100644
--- a/src/core/imap/MCIMAPProgressCallback.h
+++ b/src/core/imap/MCIMAPProgressCallback.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPPROGRESSCALLBACK_H_
+#ifndef MAILCORE_MCIMAPPROGRESSCALLBACK_H
-#define __MAILCORE_MCIMAPPROGRESSCALLBACK_H_
+#define MAILCORE_MCIMAPPROGRESSCALLBACK_H
#ifdef __cplusplus
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index d71a3f82..c108fd2b 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPSEARCHEXPRESSION_H_
+#ifndef MAILCORE_MCIMAPSEARCHEXPRESSION_H
-#define __MAILCORE_MCIMAPSEARCHEXPRESSION_H_
+#define MAILCORE_MCIMAPSEARCHEXPRESSION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index 39e1768f..9ebe48d6 100755
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPSESSION_H
+#ifndef MAILCORE_MCIMAPSESSION_H
-#define __MAILCORE_MCIMAPSESSION_H
+#define MAILCORE_MCIMAPSESSION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h
index 186984ab..ad1b16ac 100644
--- a/src/core/imap/MCIMAPSyncResult.h
+++ b/src/core/imap/MCIMAPSyncResult.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPSYNCRESULT_H_
+#ifndef MAILCORE_MCIMAPSYNCRESULT_H
-#define __MAILCORE_MCIMAPSYNCRESULT_H_
+#define MAILCORE_MCIMAPSYNCRESULT_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/pop/MCPOP.h b/src/core/pop/MCPOP.h
index c72498f6..db17430a 100644
--- a/src/core/pop/MCPOP.h
+++ b/src/core/pop/MCPOP.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCPOP_H
+#ifndef MAILCORE_MCPOP_H
-#define __MAILCORE_MCPOP_H
+#define MAILCORE_MCPOP_H
#include <MailCore/MCPOPMessageInfo.h>
#include <MailCore/MCPOPProgressCallback.h>
diff --git a/src/core/pop/MCPOPMessageInfo.h b/src/core/pop/MCPOPMessageInfo.h
index 55ac149f..be85bc9c 100644
--- a/src/core/pop/MCPOPMessageInfo.h
+++ b/src/core/pop/MCPOPMessageInfo.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCPOPMESSAGEINFO_H_
+#ifndef MAILCORE_MCPOPMESSAGEINFO_H
-#define __MAILCORE_MCPOPMESSAGEINFO_H_
+#define MAILCORE_MCPOPMESSAGEINFO_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/pop/MCPOPProgressCallback.h b/src/core/pop/MCPOPProgressCallback.h
index 6cc205d9..c28e3966 100644
--- a/src/core/pop/MCPOPProgressCallback.h
+++ b/src/core/pop/MCPOPProgressCallback.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCPOPPROGRESSCALLBACK_H_
+#ifndef MAILCORE_MCPOPPROGRESSCALLBACK_H
-#define __MAILCORE_MCPOPPROGRESSCALLBACK_H_
+#define MAILCORE_MCPOPPROGRESSCALLBACK_H
#ifdef __cplusplus
diff --git a/src/core/pop/MCPOPSession.h b/src/core/pop/MCPOPSession.h
index 0b27a1bc..dfe67650 100644
--- a/src/core/pop/MCPOPSession.h
+++ b/src/core/pop/MCPOPSession.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCPOPSESSION_H_
+#ifndef MAILCORE_MCPOPSESSION_H
-#define __MAILCORE_MCPOPSESSION_H_
+#define MAILCORE_MCPOPSESSION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/provider/MCMailProvider.h b/src/core/provider/MCMailProvider.h
index c4eeec43..026482b3 100644
--- a/src/core/provider/MCMailProvider.h
+++ b/src/core/provider/MCMailProvider.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCMAILPROVIDER_H_
-#define __MAILCORE_MCMAILPROVIDER_H_
+#ifndef MAILCORE_MCMAILPROVIDER_H
+
+#define MAILCORE_MCMAILPROVIDER_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/provider/MCMailProvidersManager.h b/src/core/provider/MCMailProvidersManager.h
index 98f00cdd..8babaae5 100644
--- a/src/core/provider/MCMailProvidersManager.h
+++ b/src/core/provider/MCMailProvidersManager.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCMAILPROVIDERSMANAGER_H_
-#define __MAILCORE_MCMAILPROVIDERSMANAGER_H_
+#ifndef MAILCORE_MCMAILPROVIDERSMANAGER_H
+
+#define MAILCORE_MCMAILPROVIDERSMANAGER_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/provider/MCNetService.h b/src/core/provider/MCNetService.h
index 7fb4e5a7..aeb0c0f4 100644
--- a/src/core/provider/MCNetService.h
+++ b/src/core/provider/MCNetService.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCNETSERVICE_H_
-#define __MAILCORE_MCNETSERVICE_H_
+#ifndef MAILCORE_MCNETSERVICE_H
+
+#define MAILCORE_MCNETSERVICE_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/provider/MCProvider.h b/src/core/provider/MCProvider.h
index ef3c2f8c..b13bb263 100644
--- a/src/core/provider/MCProvider.h
+++ b/src/core/provider/MCProvider.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCPROVIDER_H_
-#define __MAILCORE_MCPROVIDER_H_
+#ifndef MAILCORE_MCPROVIDER_H
+
+#define MAILCORE_MCPROVIDER_H
#include <MailCore/MCMailProvidersManager.h>
#include <MailCore/MCMailProvider.h>
diff --git a/src/core/renderer/MCAddressDisplay.h b/src/core/renderer/MCAddressDisplay.h
index 0e69377a..0282a52f 100644
--- a/src/core/renderer/MCAddressDisplay.h
+++ b/src/core/renderer/MCAddressDisplay.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCADDRESSDISPLAY_H_
-#define __MAILCORE_MCADDRESSDISPLAY_H_
+#ifndef MAILCORE_MCADDRESSDISPLAY_H
+
+#define MAILCORE_MCADDRESSDISPLAY_H
#include <MailCore/MCAbstract.h>
diff --git a/src/core/renderer/MCDateFormatter.h b/src/core/renderer/MCDateFormatter.h
index e120702a..c4e21c0d 100644
--- a/src/core/renderer/MCDateFormatter.h
+++ b/src/core/renderer/MCDateFormatter.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCDATEFORMATTER_H_
-#define __MAILCORE_MCDATEFORMATTER_H_
+#ifndef MAILCORE_MCDATEFORMATTER_H
+
+#define MAILCORE_MCDATEFORMATTER_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
index 5c2115f8..ad5eec91 100644
--- a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
+++ b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCHTMLBODYRENDERERTEMPLATECALLBACK_H_
+#ifndef MAILCORE_MCHTMLBODYRENDERERTEMPLATECALLBACK_H
-#define __MAILCORE_MCHTMLBODYRENDERERTEMPLATECALLBACK_H_
+#define MAILCORE_MCHTMLBODYRENDERERTEMPLATECALLBACK_H
#include <MailCore/MCHTMLRendererCallback.h>
diff --git a/src/core/renderer/MCHTMLRenderer.h b/src/core/renderer/MCHTMLRenderer.h
index a9f49e89..47a21acc 100644
--- a/src/core/renderer/MCHTMLRenderer.h
+++ b/src/core/renderer/MCHTMLRenderer.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCHTMLRENDERER_H_
-#define __MAILCORE_MCHTMLRENDERER_H_
+#ifndef MAILCORE_MCHTMLRENDERER_H
+
+#define MAILCORE_MCHTMLRENDERER_H
#include <MailCore/MCAbstract.h>
#include <MailCore/MCIMAP.h>
diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h
index e7697a1d..5a7c28a9 100644
--- a/src/core/renderer/MCHTMLRendererCallback.h
+++ b/src/core/renderer/MCHTMLRendererCallback.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCHTMLRENDERERCALLBACK_H_
+#ifndef MAILCORE_MCHTMLRENDERERCALLBACK_H
-#define __MAILCORE_MCHTMLRENDERERCALLBACK_H_
+#define MAILCORE_MCHTMLRENDERERCALLBACK_H
#include <MailCore/MCAbstract.h>
#include <MailCore/MCIMAP.h>
diff --git a/src/core/renderer/MCHTMLRendererIMAPDataCallback.h b/src/core/renderer/MCHTMLRendererIMAPDataCallback.h
index 4638f0a0..9cc3e36e 100644
--- a/src/core/renderer/MCHTMLRendererIMAPDataCallback.h
+++ b/src/core/renderer/MCHTMLRendererIMAPDataCallback.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCHTMLRENDERERIMAPDATACALLBACK_H_
+#ifndef MAILCORE_MCHTMLRENDERERIMAPDATACALLBACK_H
-#define __MAILCORE_MCHTMLRENDERERIMAPDATACALLBACK_H_
+#define MAILCORE_MCHTMLRENDERERIMAPDATACALLBACK_H
#include "MCHTMLRendererCallback.h"
diff --git a/src/core/renderer/MCRenderer.h b/src/core/renderer/MCRenderer.h
index 8495b329..441b63b4 100644
--- a/src/core/renderer/MCRenderer.h
+++ b/src/core/renderer/MCRenderer.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCRENDERER_H_
+#ifndef MAILCORE_MCRENDERER_H
-#define __MAILCORE_MCRENDERER_H_
+#define MAILCORE_MCRENDERER_H
#include <MailCore/MCHTMLRendererCallback.h>
#include <MailCore/MCDateFormatter.h>
diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h
index 0eb40f6b..8c139f6e 100644
--- a/src/core/renderer/MCSizeFormatter.h
+++ b/src/core/renderer/MCSizeFormatter.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCSIZEFORMATTER_H_
-#define __MAILCORE_MCSIZEFORMATTER_H_
+#ifndef MAILCORE_MCSIZEFORMATTER_H
+
+#define MAILCORE_MCSIZEFORMATTER_H
#include <MailCore/MCBaseTypes.h>
diff --git a/src/core/rfc822/MCAttachment.h b/src/core/rfc822/MCAttachment.h
index 2bad2c0f..7dd15b89 100644
--- a/src/core/rfc822/MCAttachment.h
+++ b/src/core/rfc822/MCAttachment.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCATTACHMENT_H_
+#ifndef MAILCORE_MCATTACHMENT_H
-#define __MAILCORE_MCATTACHMENT_H_
+#define MAILCORE_MCATTACHMENT_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractPart.h>
diff --git a/src/core/rfc822/MCMessageBuilder.h b/src/core/rfc822/MCMessageBuilder.h
index f592a7f3..413d1a4d 100644
--- a/src/core/rfc822/MCMessageBuilder.h
+++ b/src/core/rfc822/MCMessageBuilder.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCMESSAGEBUILDER_H_
+#ifndef MAILCORE_MCMESSAGEBUILDER_H
-#define __MAILCORE_MCMESSAGEBUILDER_H_
+#define MAILCORE_MCMESSAGEBUILDER_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractMessage.h>
diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h
index 783799af..11de9b58 100644
--- a/src/core/rfc822/MCMessageParser.h
+++ b/src/core/rfc822/MCMessageParser.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCPARSEDMESSAGE_H_
+#ifndef MAILCORE_MCPARSEDMESSAGE_H
-#define __MAILCORE_MCPARSEDMESSAGE_H_
+#define MAILCORE_MCPARSEDMESSAGE_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractMessage.h>
diff --git a/src/core/rfc822/MCMessagePart.h b/src/core/rfc822/MCMessagePart.h
index 6311e5e2..4b9de96b 100644
--- a/src/core/rfc822/MCMessagePart.h
+++ b/src/core/rfc822/MCMessagePart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCMESSAGEPART_H_
+#ifndef MAILCORE_MCMESSAGEPART_H
-#define __MAILCORE_MCMESSAGEPART_H_
+#define MAILCORE_MCMESSAGEPART_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractMessagePart.h>
diff --git a/src/core/rfc822/MCMultipart.h b/src/core/rfc822/MCMultipart.h
index 1eada13d..6b00c08b 100644
--- a/src/core/rfc822/MCMultipart.h
+++ b/src/core/rfc822/MCMultipart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCMULTIPART_H
+#ifndef MAILCORE_MCMULTIPART_H
-#define __MAILCORE_MCMULTIPART_H
+#define MAILCORE_MCMULTIPART_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCAbstractMultipart.h>
diff --git a/src/core/rfc822/MCRFC822.h b/src/core/rfc822/MCRFC822.h
index 340577ae..66c4d408 100644
--- a/src/core/rfc822/MCRFC822.h
+++ b/src/core/rfc822/MCRFC822.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCRFC822_H
+#ifndef MAILCORE_MCRFC822_H
-#define __MAILCORE_MCRFC822_H
+#define MAILCORE_MCRFC822_H
#include <MailCore/MCAttachment.h>
#include <MailCore/MCMessageBuilder.h>
diff --git a/src/core/security/MCCertificateUtils.h b/src/core/security/MCCertificateUtils.h
index a62d6b6e..d5b92679 100644
--- a/src/core/security/MCCertificateUtils.h
+++ b/src/core/security/MCCertificateUtils.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCCERTIFICATEUTILS_H_
-#define __MAILCORE_MCCERTIFICATEUTILS_H_
+#ifndef MAILCORE_MCCERTIFICATEUTILS_H
+
+#define MAILCORE_MCCERTIFICATEUTILS_H
#include <libetpan/libetpan.h>
#include <MailCore/MCString.h>
diff --git a/src/core/smtp/MCSMTP.h b/src/core/smtp/MCSMTP.h
index 0b1560bd..452e024f 100644
--- a/src/core/smtp/MCSMTP.h
+++ b/src/core/smtp/MCSMTP.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCSMTP_H
+#ifndef MAILCORE_MCSMTP_H
-#define __MAILCORE_MCSMTP_H
+#define MAILCORE_MCSMTP_H
#include <MailCore/MCSMTPProgressCallback.h>
#include <MailCore/MCSMTPSession.h>
diff --git a/src/core/smtp/MCSMTPProgressCallback.h b/src/core/smtp/MCSMTPProgressCallback.h
index dd1b6ec5..7016cfcd 100644
--- a/src/core/smtp/MCSMTPProgressCallback.h
+++ b/src/core/smtp/MCSMTPProgressCallback.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCSMTPPROGRESSCALLBACK_H_
+#ifndef MAILCORE_MCSMTPPROGRESSCALLBACK_H
-#define __MAILCORE_MCSMTPPROGRESSCALLBACK_H_
+#define MAILCORE_MCSMTPPROGRESSCALLBACK_H
#ifdef __cplusplus
diff --git a/src/core/smtp/MCSMTPSession.h b/src/core/smtp/MCSMTPSession.h
index f5396ebb..844369f6 100644
--- a/src/core/smtp/MCSMTPSession.h
+++ b/src/core/smtp/MCSMTPSession.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCSMTPSESSION_H
+#ifndef MAILCORE_MCSMTPSESSION_H
-#define __MAILCORE_MCSMTPSESSION_H
+#define MAILCORE_MCSMTPSESSION_H
#include <MailCore/MCBaseTypes.h>
#include <MailCore/MCMessageConstants.h>
diff --git a/src/core/zip/MCZip.h b/src/core/zip/MCZip.h
index f51d1a98..e7326f0f 100644
--- a/src/core/zip/MCZip.h
+++ b/src/core/zip/MCZip.h
@@ -1,4 +1,4 @@
-#ifndef __MAILCORE_MCZIP_H_
+#ifndef MAILCORE_MCZIP_H
#ifdef __cplusplus
diff --git a/src/objc/MCObjC.h b/src/objc/MCObjC.h
index 9c090273..e63fc067 100644
--- a/src/objc/MCObjC.h
+++ b/src/objc/MCObjC.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOBJC_H_
+#ifndef MAILCORE_MCOBJC_H
-#define __MAILCORE_MCOBJC_H_
+#define MAILCORE_MCOBJC_H
#ifdef __OBJC__
diff --git a/src/objc/abstract/MCOAbstract.h b/src/objc/abstract/MCOAbstract.h
index f9beef27..e174b818 100644
--- a/src/objc/abstract/MCOAbstract.h
+++ b/src/objc/abstract/MCOAbstract.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOABSTRACT_H_
+#ifndef MAILCORE_MCOABSTRACT_H
-#define __MAILCORE_MCOABSTRACT_H_
+#define MAILCORE_MCOABSTRACT_H
#import <MailCore/MCOAbstractMessage.h>
#import <MailCore/MCOAbstractMessagePart.h>
diff --git a/src/objc/abstract/MCOAbstractMessage+Private.h b/src/objc/abstract/MCOAbstractMessage+Private.h
index fda4b170..e3f37128 100644
--- a/src/objc/abstract/MCOAbstractMessage+Private.h
+++ b/src/objc/abstract/MCOAbstractMessage+Private.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOABSTRACTMESSAGE_PRIVATE_H_
+#ifndef MAILCORE_MCOABSTRACTMESSAGE_PRIVATE_H
-#define __MAILCORE_MCOABSTRACTMESSAGE_PRIVATE_H_
+#define MAILCORE_MCOABSTRACTMESSAGE_PRIVATE_H
#ifdef __cplusplus
diff --git a/src/objc/abstract/MCOAbstractMessage.h b/src/objc/abstract/MCOAbstractMessage.h
index 1e6dd2e6..f15975dd 100644
--- a/src/objc/abstract/MCOAbstractMessage.h
+++ b/src/objc/abstract/MCOAbstractMessage.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOABSTRACTMESSAGE_H_
+#ifndef MAILCORE_MCOABSTRACTMESSAGE_H
-#define __MAILCORE_MCOABSTRACTMESSAGE_H_
+#define MAILCORE_MCOABSTRACTMESSAGE_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/abstract/MCOAbstractMessagePart.h b/src/objc/abstract/MCOAbstractMessagePart.h
index 69a6a8f8..b5117481 100644
--- a/src/objc/abstract/MCOAbstractMessagePart.h
+++ b/src/objc/abstract/MCOAbstractMessagePart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOABSTRACTMESSAGEPART_H_
+#ifndef MAILCORE_MCOABSTRACTMESSAGEPART_H
-#define __MAILCORE_MCOABSTRACTMESSAGEPART_H_
+#define MAILCORE_MCOABSTRACTMESSAGEPART_H
#import <Foundation/Foundation.h>
#import <MailCore/MCOAbstractPart.h>
diff --git a/src/objc/abstract/MCOAbstractMessageRendererCallback.h b/src/objc/abstract/MCOAbstractMessageRendererCallback.h
index f7bac82d..08997c84 100644
--- a/src/objc/abstract/MCOAbstractMessageRendererCallback.h
+++ b/src/objc/abstract/MCOAbstractMessageRendererCallback.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOABSTRACTMESSAGERENDERECALLBACK_H_
+#ifndef MAILCORE_MCOABSTRACTMESSAGERENDERECALLBACK_H
-#define __MAILCORE_MCOABSTRACTMESSAGERENDERECALLBACK_H_
+#define MAILCORE_MCOABSTRACTMESSAGERENDERECALLBACK_H
#include "MCIMAP.h"
#include "MCRenderer.h"
diff --git a/src/objc/abstract/MCOAbstractMultipart.h b/src/objc/abstract/MCOAbstractMultipart.h
index e43a3e41..4502319b 100644
--- a/src/objc/abstract/MCOAbstractMultipart.h
+++ b/src/objc/abstract/MCOAbstractMultipart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOABSTRACTMULTIPART_H_
+#ifndef MAILCORE_MCOABSTRACTMULTIPART_H
-#define __MAILCORE_MCOABSTRACTMULTIPART_H_
+#define MAILCORE_MCOABSTRACTMULTIPART_H
#import <Foundation/Foundation.h>
#import <MailCore/MCOAbstractPart.h>
diff --git a/src/objc/abstract/MCOAbstractPart+Private.h b/src/objc/abstract/MCOAbstractPart+Private.h
index 43349941..f64ea960 100644
--- a/src/objc/abstract/MCOAbstractPart+Private.h
+++ b/src/objc/abstract/MCOAbstractPart+Private.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOABSTRACTPART_PRIVATE_H_
+#ifndef MAILCORE_MCOABSTRACTPART_PRIVATE_H
-#define __MAILCORE_MCOABSTRACTPART_PRIVATE_H_
+#define MAILCORE_MCOABSTRACTPART_PRIVATE_H
#include <MailCore/MCOAbstractPart.h>
diff --git a/src/objc/abstract/MCOAbstractPart.h b/src/objc/abstract/MCOAbstractPart.h
index 2d11e859..4ee98de3 100644
--- a/src/objc/abstract/MCOAbstractPart.h
+++ b/src/objc/abstract/MCOAbstractPart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOABSTRACTPART_H_
+#ifndef MAILCORE_MCOABSTRACTPART_H
-#define __MAILCORE_MCOABSTRACTPART_H_
+#define MAILCORE_MCOABSTRACTPART_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/abstract/MCOAddress+Private.h b/src/objc/abstract/MCOAddress+Private.h
index ac7f7703..dd4a61c3 100644
--- a/src/objc/abstract/MCOAddress+Private.h
+++ b/src/objc/abstract/MCOAddress+Private.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOADDRESS_PRIVATE_H_
+#ifndef MAILCORE_MCOADDRESS_PRIVATE_H
-#define __MAILCORE_MCOADDRESS_PRIVATE_H_
+#define MAILCORE_MCOADDRESS_PRIVATE_H
#ifdef __cplusplus
namespace mailcore {
diff --git a/src/objc/abstract/MCOAddress.h b/src/objc/abstract/MCOAddress.h
index 8e409589..82aa5280 100644
--- a/src/objc/abstract/MCOAddress.h
+++ b/src/objc/abstract/MCOAddress.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOADDRESS_H_
+#ifndef MAILCORE_MCOADDRESS_H
-#define __MAILCORE_MCOADDRESS_H_
+#define MAILCORE_MCOADDRESS_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/abstract/MCOConstants.h b/src/objc/abstract/MCOConstants.h
index 534d118d..6b6407c0 100644
--- a/src/objc/abstract/MCOConstants.h
+++ b/src/objc/abstract/MCOConstants.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCOCONSTANTS_H_
+#ifndef MAILCORE_MCOCONSTANTS_H
-#define __MAILCORE_MCOCONSTANTS_H_
+#define MAILCORE_MCOCONSTANTS_H
/** It's the connection type.*/
typedef enum {
diff --git a/src/objc/abstract/MCOHTMLRendererDelegate.h b/src/objc/abstract/MCOHTMLRendererDelegate.h
index 2c153ffb..5a1296cf 100644
--- a/src/objc/abstract/MCOHTMLRendererDelegate.h
+++ b/src/objc/abstract/MCOHTMLRendererDelegate.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOHTMLRENDERERDELEGATE_H_
+#ifndef MAILCORE_MCOHTMLRENDERERDELEGATE_H
-#define __MAILCORE_MCOHTMLRENDERERDELEGATE_H_
+#define MAILCORE_MCOHTMLRENDERERDELEGATE_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h
index aadbb350..a127ec27 100644
--- a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h
+++ b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOHTMLRENDERERIMAPDELEGATE_H_
+#ifndef MAILCORE_MCOHTMLRENDERERIMAPDELEGATE_H
-#define __MAILCORE_MCOHTMLRENDERERIMAPDELEGATE_H_
+#define MAILCORE_MCOHTMLRENDERERIMAPDELEGATE_H
#import <MailCore/MCOHTMLRendererDelegate.h>
diff --git a/src/objc/abstract/MCOMessageHeader+Private.h b/src/objc/abstract/MCOMessageHeader+Private.h
index 1c12736d..073b1be6 100644
--- a/src/objc/abstract/MCOMessageHeader+Private.h
+++ b/src/objc/abstract/MCOMessageHeader+Private.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOMESSAGEHEADER_PRIVATE_H_
+#ifndef MAILCORE_MCOMESSAGEHEADER_PRIVATE_H
-#define __MAILCORE_MCOMESSAGEHEADER_PRIVATE_H_
+#define MAILCORE_MCOMESSAGEHEADER_PRIVATE_H
#ifdef __cplusplus
namespace mailcore {
diff --git a/src/objc/abstract/MCOMessageHeader.h b/src/objc/abstract/MCOMessageHeader.h
index 55121f45..92444d21 100644
--- a/src/objc/abstract/MCOMessageHeader.h
+++ b/src/objc/abstract/MCOMessageHeader.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOMESSAGEHEADER_H_
+#ifndef MAILCORE_MCOMESSAGEHEADER_H
-#define __MAILCORE_MCOMESSAGEHEADER_H_
+#define MAILCORE_MCOMESSAGEHEADER_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/imap/MCOIMAP.h b/src/objc/imap/MCOIMAP.h
index 538c3492..7acffcef 100755
--- a/src/objc/imap/MCOIMAP.h
+++ b/src/objc/imap/MCOIMAP.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAP_H_
+#ifndef MAILCORE_MCOIMAP_H
-#define __MAILCORE_MCOIMAP_H_
+#define MAILCORE_MCOIMAP_H
#import <MailCore/MCOIMAPSession.h>
#import <MailCore/MCOIMAPOperation.h>
diff --git a/src/objc/imap/MCOIMAPAppendMessageOperation.h b/src/objc/imap/MCOIMAPAppendMessageOperation.h
index c23d79a1..04d64594 100644
--- a/src/objc/imap/MCOIMAPAppendMessageOperation.h
+++ b/src/objc/imap/MCOIMAPAppendMessageOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPAPPENDMESSAGEOPERATION_H_
+#ifndef MAILCORE_MCOIMAPAPPENDMESSAGEOPERATION_H
-#define __MAILCORE_MCOIMAPAPPENDMESSAGEOPERATION_H_
+#define MAILCORE_MCOIMAPAPPENDMESSAGEOPERATION_H
/** This class implements an operation that adds a message to a folder. */
diff --git a/src/objc/imap/MCOIMAPBaseOperation+Private.h b/src/objc/imap/MCOIMAPBaseOperation+Private.h
index e744355a..a0d1fbf8 100644
--- a/src/objc/imap/MCOIMAPBaseOperation+Private.h
+++ b/src/objc/imap/MCOIMAPBaseOperation+Private.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPBASEOPERATION_PRIVATE_H_
-#define __MAILCORE_MCOIMAPBASEOPERATION_PRIVATE_H_
+#ifndef MAILCORE_MCOIMAPBASEOPERATION_PRIVATE_H
+
+#define MAILCORE_MCOIMAPBASEOPERATION_PRIVATE_H
@class MCOIMAPSession;
diff --git a/src/objc/imap/MCOIMAPBaseOperation.h b/src/objc/imap/MCOIMAPBaseOperation.h
index f5bf88af..31686f04 100644
--- a/src/objc/imap/MCOIMAPBaseOperation.h
+++ b/src/objc/imap/MCOIMAPBaseOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPBASEOPERATION_H_
+#ifndef MAILCORE_MCOIMAPBASEOPERATION_H
-#define __MAILCORE_MCOIMAPBASEOPERATION_H_
+#define MAILCORE_MCOIMAPBASEOPERATION_H
/** Represents a generic IMAP operation with methods that are called with progress updates */
diff --git a/src/objc/imap/MCOIMAPCapabilityOperation.h b/src/objc/imap/MCOIMAPCapabilityOperation.h
index 4e531160..96314e2a 100644
--- a/src/objc/imap/MCOIMAPCapabilityOperation.h
+++ b/src/objc/imap/MCOIMAPCapabilityOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPCAPABILITYOPERATION_H_
+#ifndef MAILCORE_MCOIMAPCAPABILITYOPERATION_H
-#define __MAILCORE_MCOIMAPCAPABILITYOPERATION_H_
+#define MAILCORE_MCOIMAPCAPABILITYOPERATION_H
/**
This class implements an operation to query for IMAP capabilities,
diff --git a/src/objc/imap/MCOIMAPCopyMessagesOperation.h b/src/objc/imap/MCOIMAPCopyMessagesOperation.h
index fb24c1f3..4c573a51 100644
--- a/src/objc/imap/MCOIMAPCopyMessagesOperation.h
+++ b/src/objc/imap/MCOIMAPCopyMessagesOperation.h
@@ -8,9 +8,9 @@
#import <MailCore/MCOIMAPBaseOperation.h>
-#ifndef __MAILCORE_MCOCOPYMESSAGESOPERATION_H_
+#ifndef MAILCORE_MCOCOPYMESSAGESOPERATION_H
-#define __MAILCORE_MCOCOPYMESSAGESOPERATION_H_
+#define MAILCORE_MCOCOPYMESSAGESOPERATION_H
/** Implements an operation for copying messages between folders */
diff --git a/src/objc/imap/MCOIMAPFetchContentOperation.h b/src/objc/imap/MCOIMAPFetchContentOperation.h
index 1886981a..254cd146 100644
--- a/src/objc/imap/MCOIMAPFetchContentOperation.h
+++ b/src/objc/imap/MCOIMAPFetchContentOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFETCHCONTENTOPERATION_H_
+#ifndef MAILCORE_MCOIMAPFETCHCONTENTOPERATION_H
-#define __MAILCORE_MCOIMAPFETCHCONTENTOPERATION_H_
+#define MAILCORE_MCOIMAPFETCHCONTENTOPERATION_H
/**
This class implements an operation to fetch the content of a message.
diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.h b/src/objc/imap/MCOIMAPFetchFoldersOperation.h
index e4352bd2..853c55fc 100644
--- a/src/objc/imap/MCOIMAPFetchFoldersOperation.h
+++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFETCHFOLDERSOPERATION_H_
+#ifndef MAILCORE_MCOIMAPFETCHFOLDERSOPERATION_H
-#define __MAILCORE_MCOIMAPFETCHFOLDERSOPERATION_H_
+#define MAILCORE_MCOIMAPFETCHFOLDERSOPERATION_H
/** This class implements an operation to fetch a list of folders. */
diff --git a/src/objc/imap/MCOIMAPFetchMessagesOperation.h b/src/objc/imap/MCOIMAPFetchMessagesOperation.h
index c232764d..13dad1b4 100644
--- a/src/objc/imap/MCOIMAPFetchMessagesOperation.h
+++ b/src/objc/imap/MCOIMAPFetchMessagesOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFETCHMESSAGESOPERATION_H_
+#ifndef MAILCORE_MCOIMAPFETCHMESSAGESOPERATION_H
-#define __MAILCORE_MCOIMAPFETCHMESSAGESOPERATION_H_
+#define MAILCORE_MCOIMAPFETCHMESSAGESOPERATION_H
#import <MailCore/MCOIMAPBaseOperation.h>
#import <MailCore/MCOConstants.h>
diff --git a/src/objc/imap/MCOIMAPFetchNamespaceOperation.h b/src/objc/imap/MCOIMAPFetchNamespaceOperation.h
index ce845f5e..5d58f052 100644
--- a/src/objc/imap/MCOIMAPFetchNamespaceOperation.h
+++ b/src/objc/imap/MCOIMAPFetchNamespaceOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFETCHNAMESPACEOPERATION_H_
+#ifndef MAILCORE_MCOIMAPFETCHNAMESPACEOPERATION_H
-#define __MAILCORE_MCOIMAPFETCHNAMESPACEOPERATION_H_
+#define MAILCORE_MCOIMAPFETCHNAMESPACEOPERATION_H
/** This class implements an operation to fetch any IMAP namespaces. */
diff --git a/src/objc/imap/MCOIMAPFolder.h b/src/objc/imap/MCOIMAPFolder.h
index 8688ef5b..048dfb55 100644
--- a/src/objc/imap/MCOIMAPFolder.h
+++ b/src/objc/imap/MCOIMAPFolder.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFOLDER_H_
+#ifndef MAILCORE_MCOIMAPFOLDER_H
-#define __MAILCORE_MCOIMAPFOLDER_H_
+#define MAILCORE_MCOIMAPFOLDER_H
/** This class represents an IMAP folder */
diff --git a/src/objc/imap/MCOIMAPFolderInfo.h b/src/objc/imap/MCOIMAPFolderInfo.h
index 949e900e..c15c5a37 100644
--- a/src/objc/imap/MCOIMAPFolderInfo.h
+++ b/src/objc/imap/MCOIMAPFolderInfo.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFOLDERINFO_H_
+#ifndef MAILCORE_MCOIMAPFOLDERINFO_H
-#define __MAILCORE_MCOIMAPFOLDERINFO_H_
+#define MAILCORE_MCOIMAPFOLDERINFO_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/imap/MCOIMAPFolderInfoOperation.h b/src/objc/imap/MCOIMAPFolderInfoOperation.h
index d26e47a8..e25016c7 100644
--- a/src/objc/imap/MCOIMAPFolderInfoOperation.h
+++ b/src/objc/imap/MCOIMAPFolderInfoOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFOLDERINFOOPERATION_H_
+#ifndef MAILCORE_MCOIMAPFOLDERINFOOPERATION_H
-#define __MAILCORE_MCOIMAPFOLDERINFOOPERATION_H_
+#define MAILCORE_MCOIMAPFOLDERINFOOPERATION_H
#import <MailCore/MCOIMAPBaseOperation.h>
diff --git a/src/objc/imap/MCOIMAPFolderStatus.h b/src/objc/imap/MCOIMAPFolderStatus.h
index d39e1fc5..fedd31a3 100644
--- a/src/objc/imap/MCOIMAPFolderStatus.h
+++ b/src/objc/imap/MCOIMAPFolderStatus.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFOLDERSTATUS_H_
+#ifndef MAILCORE_MCOIMAPFOLDERSTATUS_H
-#define __MAILCORE_MCOIMAPFOLDERSTATUS_H_
+#define MAILCORE_MCOIMAPFOLDERSTATUS_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/imap/MCOIMAPFolderStatusOperation.h b/src/objc/imap/MCOIMAPFolderStatusOperation.h
index 476b597d..2117260f 100644
--- a/src/objc/imap/MCOIMAPFolderStatusOperation.h
+++ b/src/objc/imap/MCOIMAPFolderStatusOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPFOLDERSTATUSOPERATION_H_
+#ifndef MAILCORE_MCOIMAPFOLDERSTATUSOPERATION_H
-#define __MAILCORE_MCOIMAPFOLDERSTATUSOPERATION_H_
+#define MAILCORE_MCOIMAPFOLDERSTATUSOPERATION_H
#import <MailCore/MCOIMAPBaseOperation.h>
diff --git a/src/objc/imap/MCOIMAPIdentity.h b/src/objc/imap/MCOIMAPIdentity.h
index 32ce8b5c..1690c0e3 100644
--- a/src/objc/imap/MCOIMAPIdentity.h
+++ b/src/objc/imap/MCOIMAPIdentity.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPIDENTITY_H_
+#ifndef MAILCORE_MCOIMAPIDENTITY_H
-#define __MAILCORE_MCOIMAPIDENTITY_H_
+#define MAILCORE_MCOIMAPIDENTITY_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/imap/MCOIMAPIdentityOperation.h b/src/objc/imap/MCOIMAPIdentityOperation.h
index d0d5f27b..20b9fc88 100644
--- a/src/objc/imap/MCOIMAPIdentityOperation.h
+++ b/src/objc/imap/MCOIMAPIdentityOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPIDENTITYOPERATION_H_
+#ifndef MAILCORE_MCOIMAPIDENTITYOPERATION_H
-#define __MAILCORE_MCOIMAPIDENTITYOPERATION_H_
+#define MAILCORE_MCOIMAPIDENTITYOPERATION_H
/**
This class implements an operation to get the servers identification info or
diff --git a/src/objc/imap/MCOIMAPIdleOperation.h b/src/objc/imap/MCOIMAPIdleOperation.h
index 01b4f443..672a3258 100644
--- a/src/objc/imap/MCOIMAPIdleOperation.h
+++ b/src/objc/imap/MCOIMAPIdleOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPIDLEOPERATION_H_
+#ifndef MAILCORE_MCOIMAPIDLEOPERATION_H
-#define __MAILCORE_MCOIMAPIDLEOPERATION_H_
+#define MAILCORE_MCOIMAPIDLEOPERATION_H
/**
This class implements an IMAP IDLE. IDLE is used to keep a connection
diff --git a/src/objc/imap/MCOIMAPMessage.h b/src/objc/imap/MCOIMAPMessage.h
index bcee7eaf..f4587636 100644
--- a/src/objc/imap/MCOIMAPMessage.h
+++ b/src/objc/imap/MCOIMAPMessage.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPMESSAGE_H_
+#ifndef MAILCORE_MCOIMAPMESSAGE_H
-#define __MAILCORE_MCOIMAPMESSAGE_H_
+#define MAILCORE_MCOIMAPMESSAGE_H
/**
This represents an IMAP message.
diff --git a/src/objc/imap/MCOIMAPMessagePart.h b/src/objc/imap/MCOIMAPMessagePart.h
index 1e2be559..8f4f531f 100644
--- a/src/objc/imap/MCOIMAPMessagePart.h
+++ b/src/objc/imap/MCOIMAPMessagePart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPMESSAGEPART_H_
+#ifndef MAILCORE_MCOIMAPMESSAGEPART_H
-#define __MAILCORE_MCOIMAPMESSAGEPART_H_
+#define MAILCORE_MCOIMAPMESSAGEPART_H
/** Represents a message part. */
diff --git a/src/objc/imap/MCOIMAPMessageRenderingOperation.h b/src/objc/imap/MCOIMAPMessageRenderingOperation.h
index c22909a2..2c7f56d5 100644
--- a/src/objc/imap/MCOIMAPMessageRenderingOperation.h
+++ b/src/objc/imap/MCOIMAPMessageRenderingOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPMESSAGERENDERINGOPERATION_H_
+#ifndef MAILCORE_MCOIMAPMESSAGERENDERINGOPERATION_H
-#define __MAILCORE_MCOIMAPMESSAGERENDERINGOPERATION_H_
+#define MAILCORE_MCOIMAPMESSAGERENDERINGOPERATION_H
#import <MailCore/MCOIMAPBaseOperation.h>
diff --git a/src/objc/imap/MCOIMAPMultipart.h b/src/objc/imap/MCOIMAPMultipart.h
index 408b6593..0b5997de 100644
--- a/src/objc/imap/MCOIMAPMultipart.h
+++ b/src/objc/imap/MCOIMAPMultipart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPMULTIPART_H_
+#ifndef MAILCORE_MCOIMAPMULTIPART_H
-#define __MAILCORE_MCOIMAPMULTIPART_H_
+#define MAILCORE_MCOIMAPMULTIPART_H
/** Represents the a multipart retrieved from IMAP */
diff --git a/src/objc/imap/MCOIMAPNamespace.h b/src/objc/imap/MCOIMAPNamespace.h
index 5fcda25b..3e842aad 100644
--- a/src/objc/imap/MCOIMAPNamespace.h
+++ b/src/objc/imap/MCOIMAPNamespace.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPNAMESPACE_H_
+#ifndef MAILCORE_MCOIMAPNAMESPACE_H
-#define __MAILCORE_MCOIMAPNAMESPACE_H_
+#define MAILCORE_MCOIMAPNAMESPACE_H
/** Represents an IMAP namespace */
diff --git a/src/objc/imap/MCOIMAPNamespaceItem.h b/src/objc/imap/MCOIMAPNamespaceItem.h
index 3063919b..64ae3c5f 100644
--- a/src/objc/imap/MCOIMAPNamespaceItem.h
+++ b/src/objc/imap/MCOIMAPNamespaceItem.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPNAMESPACEITEM_H_
+#ifndef MAILCORE_MCOIMAPNAMESPACEITEM_H
-#define __MAILCORE_MCOIMAPNAMESPACEITEM_H_
+#define MAILCORE_MCOIMAPNAMESPACEITEM_H
/** Represents a namespace item */
diff --git a/src/objc/imap/MCOIMAPNoopOperation.h b/src/objc/imap/MCOIMAPNoopOperation.h
index 9e876748..4b3a4b1f 100644
--- a/src/objc/imap/MCOIMAPNoopOperation.h
+++ b/src/objc/imap/MCOIMAPNoopOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPNOOPOPERATION_H_
+#ifndef MAILCORE_MCOIMAPNOOPOPERATION_H
-#define __MAILCORE_MCOIMAPNOOPOPERATION_H_
+#define MAILCORE_MCOIMAPNOOPOPERATION_H
#import <MailCore/MCOIMAPBaseOperation.h>
diff --git a/src/objc/imap/MCOIMAPOperation.h b/src/objc/imap/MCOIMAPOperation.h
index 6f286596..f8003c07 100644
--- a/src/objc/imap/MCOIMAPOperation.h
+++ b/src/objc/imap/MCOIMAPOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPOPERATION_H_
+#ifndef MAILCORE_MCOIMAPOPERATION_H
-#define __MAILCORE_MCOIMAPOPERATION_H_
+#define MAILCORE_MCOIMAPOPERATION_H
/** This class implements a generic IMAP operation */
diff --git a/src/objc/imap/MCOIMAPPart.h b/src/objc/imap/MCOIMAPPart.h
index f7bec632..814aa0a8 100644
--- a/src/objc/imap/MCOIMAPPart.h
+++ b/src/objc/imap/MCOIMAPPart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPABSTRACTPART_H_
+#ifndef MAILCORE_MCOIMAPABSTRACTPART_H
-#define __MAILCORE_MCOIMAPABSTRACTPART_H_
+#define MAILCORE_MCOIMAPABSTRACTPART_H
#import <MailCore/MCOAbstractPart.h>
diff --git a/src/objc/imap/MCOIMAPSearchExpression.h b/src/objc/imap/MCOIMAPSearchExpression.h
index 0e6dbd26..d1d2d701 100644
--- a/src/objc/imap/MCOIMAPSearchExpression.h
+++ b/src/objc/imap/MCOIMAPSearchExpression.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPSEARCHEXPRESSION_H_
+#ifndef MAILCORE_MCOIMAPSEARCHEXPRESSION_H
-#define __MAILCORE_MCOIMAPSEARCHEXPRESSION_H_
+#define MAILCORE_MCOIMAPSEARCHEXPRESSION_H
/** Used to construct an IMAP search query */
diff --git a/src/objc/imap/MCOIMAPSearchOperation.h b/src/objc/imap/MCOIMAPSearchOperation.h
index a178984d..1ec3c95c 100644
--- a/src/objc/imap/MCOIMAPSearchOperation.h
+++ b/src/objc/imap/MCOIMAPSearchOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOSEARCHOPERATION_H_
+#ifndef MAILCORE_MCOSEARCHOPERATION_H
-#define __MAILCORE_MCOSEARCHOPERATION_H_
+#define MAILCORE_MCOSEARCHOPERATION_H
/** This class runs an IMAP search operation */
diff --git a/src/objc/imap/MCOIMAPSession.h b/src/objc/imap/MCOIMAPSession.h
index b013c9c0..9edffa72 100755
--- a/src/objc/imap/MCOIMAPSession.h
+++ b/src/objc/imap/MCOIMAPSession.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOIMAPSESSION_H_
+#ifndef MAILCORE_MCOIMAPSESSION_H
-#define __MAILCORE_MCOIMAPSESSION_H_
+#define MAILCORE_MCOIMAPSESSION_H
#import <Foundation/Foundation.h>
#import <MailCore/MCOConstants.h>
diff --git a/src/objc/pop/MCOPOP.h b/src/objc/pop/MCOPOP.h
index bfb9c4f1..18074305 100644
--- a/src/objc/pop/MCOPOP.h
+++ b/src/objc/pop/MCOPOP.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOP_H_
+#ifndef MAILCORE_MCOPOP_H_
-#define __MAILCORE_MCOPOP_H_
+#define MAILCORE_MCOPOP_H
#import <MailCore/MCOPOPSession.h>
#import <MailCore/MCOPOPOperation.h>
diff --git a/src/objc/pop/MCOPOPFetchHeaderOperation.h b/src/objc/pop/MCOPOPFetchHeaderOperation.h
index 76826f56..d4735ce4 100644
--- a/src/objc/pop/MCOPOPFetchHeaderOperation.h
+++ b/src/objc/pop/MCOPOPFetchHeaderOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOPFETCHHEADEROPERATION_H_
+#ifndef MAILCORE_MCOPOPFETCHHEADEROPERATION_H
-#define __MAILCORE_MCOPOPFETCHHEADEROPERATION_H_
+#define MAILCORE_MCOPOPFETCHHEADEROPERATION_H
#import <Foundation/Foundation.h>
#import <MailCore/MCOPOPOperation.h>
diff --git a/src/objc/pop/MCOPOPFetchMessageOperation.h b/src/objc/pop/MCOPOPFetchMessageOperation.h
index d8091b25..b97825cf 100644
--- a/src/objc/pop/MCOPOPFetchMessageOperation.h
+++ b/src/objc/pop/MCOPOPFetchMessageOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOPFETCHMESSAGEOPERATION_H_
+#ifndef MAILCORE_MCOPOPFETCHMESSAGEOPERATION_H
-#define __MAILCORE_MCOPOPFETCHMESSAGEOPERATION_H_
+#define MAILCORE_MCOPOPFETCHMESSAGEOPERATION_H
#import <Foundation/Foundation.h>
#import <MailCore/MCOPOPOperation.h>
diff --git a/src/objc/pop/MCOPOPFetchMessagesOperation.h b/src/objc/pop/MCOPOPFetchMessagesOperation.h
index f63d2c5f..aef49081 100644
--- a/src/objc/pop/MCOPOPFetchMessagesOperation.h
+++ b/src/objc/pop/MCOPOPFetchMessagesOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOPFETCHMESSAGESOPERATION_H_
+#ifndef MAILCORE_MCOPOPFETCHMESSAGESOPERATION_H
-#define __MAILCORE_MCOPOPFETCHMESSAGESOPERATION_H_
+#define MAILCORE_MCOPOPFETCHMESSAGESOPERATION_H
#import <Foundation/Foundation.h>
#import <MailCore/MCOPOPOperation.h>
diff --git a/src/objc/pop/MCOPOPMessageInfo.h b/src/objc/pop/MCOPOPMessageInfo.h
index b1780a96..416747f3 100644
--- a/src/objc/pop/MCOPOPMessageInfo.h
+++ b/src/objc/pop/MCOPOPMessageInfo.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOPMESSAGEINFO_H_
+#ifndef MAILCORE_MCOPOPMESSAGEINFO_H
-#define __MAILCORE_MCOPOPMESSAGEINFO_H_
+#define MAILCORE_MCOPOPMESSAGEINFO_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/pop/MCOPOPNoopOperation.h b/src/objc/pop/MCOPOPNoopOperation.h
index 9fad4196..015a1685 100644
--- a/src/objc/pop/MCOPOPNoopOperation.h
+++ b/src/objc/pop/MCOPOPNoopOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOPNOOPOPERATION_H_
+#ifndef MAILCORE_MCOPOPNOOPOPERATION_H
-#define __MAILCORE_MCOPOPNOOPOPERATION_H_
+#define MAILCORE_MCOPOPNOOPOPERATION_H
#import <Foundation/Foundation.h>
#import <MailCore/MCOPOPOperation.h>
diff --git a/src/objc/pop/MCOPOPOperation+Private.h b/src/objc/pop/MCOPOPOperation+Private.h
index 1d888f08..dc92ee27 100644
--- a/src/objc/pop/MCOPOPOperation+Private.h
+++ b/src/objc/pop/MCOPOPOperation+Private.h
@@ -6,8 +6,8 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOPOPERATION_PRIVATE_H_
-#define __MAILCORE_MCOPOPOPERATION_PRIVATE_H_
+#ifndef MAILCORE_MCOPOPOPERATION_PRIVATE_H
+#define MAILCORE_MCOPOPOPERATION_PRIVATE_H
@class MCOPOPSession;
diff --git a/src/objc/pop/MCOPOPOperation.h b/src/objc/pop/MCOPOPOperation.h
index d2b3105e..30180ccd 100644
--- a/src/objc/pop/MCOPOPOperation.h
+++ b/src/objc/pop/MCOPOPOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOPOPERATION_H_
+#ifndef MAILCORE_MCOPOPOPERATION_H
-#define __MAILCORE_MCOPOPOPERATION_H_
+#define MAILCORE_MCOPOPOPERATION_H
#import <Foundation/Foundation.h>
#import <MailCore/MCOOperation.h>
diff --git a/src/objc/pop/MCOPOPSession.h b/src/objc/pop/MCOPOPSession.h
index 6941aa13..ebfa5ad2 100644
--- a/src/objc/pop/MCOPOPSession.h
+++ b/src/objc/pop/MCOPOPSession.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPOPSESSION_H_
+#ifndef MAILCORE_MCOPOPSESSION_H
-#define __MAILCORE_MCOPOPSESSION_H_
+#define MAILCORE_MCOPOPSESSION_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/rfc822/MCOAttachment.h b/src/objc/rfc822/MCOAttachment.h
index a308ffd3..8094d474 100644
--- a/src/objc/rfc822/MCOAttachment.h
+++ b/src/objc/rfc822/MCOAttachment.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOATTACHMENT_H_
+#ifndef MAILCORE_MCOATTACHMENT_H
-#define __MAILCORE_MCOATTACHMENT_H_
+#define MAILCORE_MCOATTACHMENT_H
#import <MailCore/MCOAbstractPart.h>
diff --git a/src/objc/rfc822/MCOMessageBuilder.h b/src/objc/rfc822/MCOMessageBuilder.h
index 0ecd2dea..a52afc0f 100644
--- a/src/objc/rfc822/MCOMessageBuilder.h
+++ b/src/objc/rfc822/MCOMessageBuilder.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOMESSAGEBUILDER_H_
+#ifndef MAILCORE_MCOMESSAGEBUILDER_H
-#define __MAILCORE_MCOMESSAGEBUILDER_H_
+#define MAILCORE_MCOMESSAGEBUILDER_H
#import <MailCore/MCOAbstractMessage.h>
diff --git a/src/objc/rfc822/MCOMessageParser.h b/src/objc/rfc822/MCOMessageParser.h
index 8a0247be..6bbed0be 100644
--- a/src/objc/rfc822/MCOMessageParser.h
+++ b/src/objc/rfc822/MCOMessageParser.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOMESSAGEPARSER_H_
+#ifndef MAILCORE_MCOMESSAGEPARSER_H
-#define __MAILCORE_MCOMESSAGEPARSER_H_
+#define MAILCORE_MCOMESSAGEPARSER_H
/**
This class implements a parsed message.
diff --git a/src/objc/rfc822/MCOMessagePart.h b/src/objc/rfc822/MCOMessagePart.h
index a7055efc..5098e35f 100644
--- a/src/objc/rfc822/MCOMessagePart.h
+++ b/src/objc/rfc822/MCOMessagePart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOMESSAGEPART_H_
+#ifndef MAILCORE_MCOMESSAGEPART_H
-#define __MAILCORE_MCOMESSAGEPART_H_
+#define MAILCORE_MCOMESSAGEPART_H
#import <MailCore/MCOAbstractMessagePart.h>
diff --git a/src/objc/rfc822/MCOMultipart.h b/src/objc/rfc822/MCOMultipart.h
index a730b8a4..1b97a13f 100644
--- a/src/objc/rfc822/MCOMultipart.h
+++ b/src/objc/rfc822/MCOMultipart.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOMULTIPART_H_
+#ifndef MAILCORE_MCOMULTIPART_H
-#define __MAILCORE_MCOMULTIPART_H_
+#define MAILCORE_MCOMULTIPART_H
#import <MailCore/MCOAbstractMultipart.h>
diff --git a/src/objc/rfc822/MCORFC822.h b/src/objc/rfc822/MCORFC822.h
index fa9b8242..ce894aa8 100644
--- a/src/objc/rfc822/MCORFC822.h
+++ b/src/objc/rfc822/MCORFC822.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCORFC822_H_
+#ifndef MAILCORE_MCORFC822_H
-#define __MAILCORE_MCORFC822_H_
+#define MAILCORE_MCORFC822_H
#import <MailCore/MCOAttachment.h>
#import <MailCore/MCOMessageBuilder.h>
diff --git a/src/objc/smtp/MCOSMTP.h b/src/objc/smtp/MCOSMTP.h
index 49caac83..49d01de3 100644
--- a/src/objc/smtp/MCOSMTP.h
+++ b/src/objc/smtp/MCOSMTP.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOSMTP_H_
+#ifndef MAILCORE_MCOSMTP_H
-#define __MAILCORE_MCOSMTP_H_
+#define MAILCORE_MCOSMTP_H
#import <MailCore/MCOSMTPSession.h>
#import <MailCore/MCOSMTPSendOperation.h>
diff --git a/src/objc/smtp/MCOSMTPNoopOperation.h b/src/objc/smtp/MCOSMTPNoopOperation.h
index 38ab386e..0b22e5d9 100644
--- a/src/objc/smtp/MCOSMTPNoopOperation.h
+++ b/src/objc/smtp/MCOSMTPNoopOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOSMTPNOOPOPERATION_H_
+#ifndef MAILCORE_MCOSMTPNOOPOPERATION_H
-#define __MAILCORE_MCOSMTPNOOPOPERATION_H_
+#define MAILCORE_MCOSMTPNOOPOPERATION_H
#import <MailCore/MCOSMTPOperation.h>
diff --git a/src/objc/smtp/MCOSMTPOperation+Private.h b/src/objc/smtp/MCOSMTPOperation+Private.h
index 5b9b5ee9..a3cb0cb5 100644
--- a/src/objc/smtp/MCOSMTPOperation+Private.h
+++ b/src/objc/smtp/MCOSMTPOperation+Private.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOSMTPOPERATION_PRIVATE_H_
-#define __MAILCORE_MCOSMTPOPERATION_PRIVATE_H_
+#ifndef MAILCORE_MCOSMTPOPERATION_PRIVATE_H
+
+#define MAILCORE_MCOSMTPOPERATION_PRIVATE_H
@class MCOSMTPSession;
diff --git a/src/objc/smtp/MCOSMTPOperation.h b/src/objc/smtp/MCOSMTPOperation.h
index 7e6fa3f8..7b92148f 100644
--- a/src/objc/smtp/MCOSMTPOperation.h
+++ b/src/objc/smtp/MCOSMTPOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOSMTPOPERATION_H_
+#ifndef MAILCORE_MCOSMTPOPERATION_H
-#define __MAILCORE_MCOSMTPOPERATION_H_
+#define MAILCORE_MCOSMTPOPERATION_H
#import <MailCore/MCOOperation.h>
diff --git a/src/objc/smtp/MCOSMTPSendOperation.h b/src/objc/smtp/MCOSMTPSendOperation.h
index 8e2dc56d..82b238c2 100644
--- a/src/objc/smtp/MCOSMTPSendOperation.h
+++ b/src/objc/smtp/MCOSMTPSendOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOSMTPSENDOPERATION_H_
+#ifndef MAILCORE_MCOSMTPSENDOPERATION_H
-#define __MAILCORE_MCOSMTPSENDOPERATION_H_
+#define MAILCORE_MCOSMTPSENDOPERATION_H
#import <MailCore/MCOSMTPOperation.h>
diff --git a/src/objc/smtp/MCOSMTPSession.h b/src/objc/smtp/MCOSMTPSession.h
index 09116508..6233e2bb 100644
--- a/src/objc/smtp/MCOSMTPSession.h
+++ b/src/objc/smtp/MCOSMTPSession.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOSMTPSESSION_H_
+#ifndef MAILCORE_MCOSMTPSESSION_H
-#define __MAILCORE_MCOSMTPSESSION_H_
+#define MAILCORE_MCOSMTPSESSION_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/MCOIndexSet+Private.h b/src/objc/utils/MCOIndexSet+Private.h
index ef9111fa..ad7cd1ba 100644
--- a/src/objc/utils/MCOIndexSet+Private.h
+++ b/src/objc/utils/MCOIndexSet+Private.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOINDEXSET_PRIVATE_H_
+#ifndef MAILCORE_MCOINDEXSET_PRIVATE_H
-#define __MAILCORE_MCOINDEXSET_PRIVATE_H_
+#define MAILCORE_MCOINDEXSET_PRIVATE_H
#ifdef __cplusplus
@interface MCOIndexSet (Private)
diff --git a/src/objc/utils/MCOIndexSet.h b/src/objc/utils/MCOIndexSet.h
index 38ec3834..9188ba65 100644
--- a/src/objc/utils/MCOIndexSet.h
+++ b/src/objc/utils/MCOIndexSet.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOINDEXSET_H_
+#ifndef MAILCORE_MCOINDEXSET_H
-#define __MAILCORE_MCOINDEXSET_H_
+#define MAILCORE_MCOINDEXSET_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/MCOObjectWrapper.h b/src/objc/utils/MCOObjectWrapper.h
index 2fd34018..67cb45e1 100644
--- a/src/objc/utils/MCOObjectWrapper.h
+++ b/src/objc/utils/MCOObjectWrapper.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOOBJECTWRAPPER_H_
+#ifndef MAILCORE_MCOOBJECTWRAPPER_H
-#define __MAILCORE_MCOOBJECTWRAPPER_H_
+#define MAILCORE_MCOOBJECTWRAPPER_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/MCOOperation+Private.h b/src/objc/utils/MCOOperation+Private.h
index 94706fdb..01ad7741 100644
--- a/src/objc/utils/MCOOperation+Private.h
+++ b/src/objc/utils/MCOOperation+Private.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOPERATION_PRIVATE_H_
+#ifndef MAILCORE_MCOPERATION_PRIVATE_H
-#define __MAILCORE_MCOPERATION_PRIVATE_H_
+#define MAILCORE_MCOPERATION_PRIVATE_H
#ifdef __cplusplus
namespace mailcore {
diff --git a/src/objc/utils/MCOOperation.h b/src/objc/utils/MCOOperation.h
index 9d313186..263d4a46 100644
--- a/src/objc/utils/MCOOperation.h
+++ b/src/objc/utils/MCOOperation.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 __MyCompanyName__. All rights reserved.
//
-#ifndef __MAILCORE_MCOOPERATION_H_
+#ifndef MAILCORE_MCOOPERATION_H
-#define __MAILCORE_MCOOPERATION_H_
+#define MAILCORE_MCOOPERATION_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/MCORange.h b/src/objc/utils/MCORange.h
index fad9a454..fa6d4ae9 100644
--- a/src/objc/utils/MCORange.h
+++ b/src/objc/utils/MCORange.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCORANGE_H_
+#ifndef MAILCORE_MCORANGE_H
-#define __MAILCORE_MCORANGE_H_
+#define MAILCORE_MCORANGE_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/MCOUtils.h b/src/objc/utils/MCOUtils.h
index e2f2e69c..30e83a7c 100644
--- a/src/objc/utils/MCOUtils.h
+++ b/src/objc/utils/MCOUtils.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCOUTILS_H_
+#ifndef MAILCORE_MCOUTILS_H
-#define __MAILCORE_MCOUTILS_H_
+#define MAILCORE_MCOUTILS_H
#import <MailCore/MCOObjectWrapper.h>
#import <MailCore/NSData+MCO.h>
diff --git a/src/objc/utils/NSArray+MCO.h b/src/objc/utils/NSArray+MCO.h
index 836ef9c0..fd0cc6ad 100644
--- a/src/objc/utils/NSArray+MCO.h
+++ b/src/objc/utils/NSArray+MCO.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_NSARRAY_MCO_H_
+#ifndef MAILCORE_NSARRAY_MCO_H
-#define __MAILCORE_NSARRAY_MCO_H_
+#define MAILCORE_NSARRAY_MCO_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/NSData+MCO.h b/src/objc/utils/NSData+MCO.h
index fb581abe..ddb09595 100644
--- a/src/objc/utils/NSData+MCO.h
+++ b/src/objc/utils/NSData+MCO.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_NSDATA_MCO_H_
+#ifndef MAILCORE_NSDATA_MCO_H
-#define __MAILCORE_NSDATA_MCO_H_
+#define MAILCORE_NSDATA_MCO_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/NSDictionary+MCO.h b/src/objc/utils/NSDictionary+MCO.h
index bdc842de..34798305 100644
--- a/src/objc/utils/NSDictionary+MCO.h
+++ b/src/objc/utils/NSDictionary+MCO.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_NSDICTIONARY_MCO_H_
+#ifndef MAILCORE_NSDICTIONARY_MCO_H
-#define __MAILCORE_NSDICTIONARY_MCO_H_
+#define MAILCORE_NSDICTIONARY_MCO_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/NSError+MCO.h b/src/objc/utils/NSError+MCO.h
index d71b3135..027796ea 100644
--- a/src/objc/utils/NSError+MCO.h
+++ b/src/objc/utils/NSError+MCO.h
@@ -2,9 +2,9 @@
// Created by mronge on 1/31/13.
//
-#ifndef __MAILCORE_NSERROR_MCO_H_
+#ifndef MAILCORE_NSERROR_MCO_H
-#define __MAILCORE_NSERROR_MCO_H_
+#define MAILCORE_NSERROR_MCO_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/NSObject+MCO.h b/src/objc/utils/NSObject+MCO.h
index 4d8d4274..923cc263 100644
--- a/src/objc/utils/NSObject+MCO.h
+++ b/src/objc/utils/NSObject+MCO.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_NSOBJECT_MCO_H_
+#ifndef MAILCORE_NSOBJECT_MCO_H
-#define __MAILCORE_NSOBJECT_MCO_H_
+#define MAILCORE_NSOBJECT_MCO_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/NSString+MCO.h b/src/objc/utils/NSString+MCO.h
index 8e6bbf6b..ac374bf7 100644
--- a/src/objc/utils/NSString+MCO.h
+++ b/src/objc/utils/NSString+MCO.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_NSSTRING_MCO_H_
+#ifndef MAILCORE_NSSTRING_MCO_H
-#define __MAILCORE_NSSTRING_MCO_H_
+#define MAILCORE_NSSTRING_MCO_H
#import <Foundation/Foundation.h>
diff --git a/src/objc/utils/NSValue+MCO.h b/src/objc/utils/NSValue+MCO.h
index 484fc205..007662b7 100644
--- a/src/objc/utils/NSValue+MCO.h
+++ b/src/objc/utils/NSValue+MCO.h
@@ -6,9 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_NSVALUE_MCO_H_
+#ifndef MAILCORE_NSVALUE_MCO_H
-#define __MAILCORE_NSVALUE_MCO_H_
+#define MAILCORE_NSVALUE_MCO_H
#import <Foundation/Foundation.h>
diff --git a/tests/test-all.h b/tests/test-all.h
index 6239f2f5..bfe6bae7 100644
--- a/tests/test-all.h
+++ b/tests/test-all.h
@@ -6,8 +6,9 @@
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_TEST_ALL_H_
-#define __MAILCORE_TEST_ALL_H_
+#ifndef MAILCORE_TEST_ALL_H
+
+#define MAILCORE_TEST_ALL_H
#include <MailCore/MailCore.h>