aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-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
83 files changed, 188 insertions, 165 deletions
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