7 files changed, 25 insertions, 19 deletions
diff --git a/src/core/basetypes/MCHTMLCleaner.h b/src/core/basetypes/MCHTMLCleaner.h
index 81af69df..a7c54eff 100644
--- a/src/core/basetypes/MCHTMLCleaner.h
+++ b/src/core/basetypes/MCHTMLCleaner.h
@@ -6,8 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __mailcore2__HTMLCleaner__
-#define __mailcore2__HTMLCleaner__
+#ifndef __MAILCORE_HTMLCLEANER_H_
+
+#define __MAILCORE_HTMLCLEANER_H_
 
 #include <MailCore/MCString.h>
 
@@ -20,4 +21,4 @@ namespace mailcore {
     
 }
 
-#endif /* defined(__mailcore2__HTMLCleaner__) */
+#endif
diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h
index 461bb063..47d97341 100644
--- a/src/core/basetypes/MCIndexSet.h
+++ b/src/core/basetypes/MCIndexSet.h
@@ -6,8 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __mailcore2__MCIndexSet__
-#define __mailcore2__MCIndexSet__
+#ifndef __MAILCORE_MCINDEXSET_H_
+
+#define __MAILCORE_MCINDEXSET_H_
 
 #include <MailCore/MCObject.h>
 #include <MailCore/MCRange.h>
@@ -65,4 +66,4 @@ namespace mailcore {
 
 #endif
 
-#endif /* defined(__mailcore2__MCIndexSet__) */
+#endif
diff --git a/src/core/basetypes/MCValuePrivate.h b/src/core/basetypes/MCValuePrivate.h
index a4637f0a..9179eea3 100644
--- a/src/core/basetypes/MCValuePrivate.h
+++ b/src/core/basetypes/MCValuePrivate.h
@@ -6,8 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef mailcore2_MCValuePrivate_h
-#define mailcore2_MCValuePrivate_h
+#ifndef __MAILCORE_MCVALUEPRIVATE_H_
+
+#define __MAILCORE_MCVALUEPRIVATE_H_
 
 enum {
     VALUE_TYPE_NONE,
diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h
index 74a42355..b511b0bd 100644
--- a/src/core/imap/MCIMAPSyncResult.h
+++ b/src/core/imap/MCIMAPSyncResult.h
@@ -6,8 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __mailcore2__MCIMAPSyncResult__
-#define __mailcore2__MCIMAPSyncResult__
+#ifndef __MAILCORE_MCIMAPSYNCRESULT_H_
+
+#define __MAILCORE_MCIMAPSYNCRESULT_H_
 
 #include <MailCore/MCBaseTypes.h>
 
@@ -35,4 +36,4 @@ namespace mailcore {
 
 #endif
 
-#endif /* defined(__mailcore2__MCIMAPSyncResult__) */
+#endif
diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h
index 6c900827..0ddc3650 100644
--- a/src/core/renderer/MCHTMLRendererCallback.h
+++ b/src/core/renderer/MCHTMLRendererCallback.h
@@ -6,8 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __mailcore2__MCHTMLRendererCallback__
-#define __mailcore2__MCHTMLRendererCallback__
+#ifndef __MAILCORE_MCHTMLRENDERERCALLBACK_H_
+
+#define __MAILCORE_MCHTMLRENDERERCALLBACK_H_
 
 #include <MailCore/MCAbstract.h>
 #include <MailCore/MCIMAP.h>
@@ -51,4 +52,4 @@ namespace mailcore {
 
 #endif
 
-#endif /* defined(__mailcore2__MCHTMLRendererCallback__) */
+#endif
diff --git a/src/core/renderer/MCRenderer.h b/src/core/renderer/MCRenderer.h
index b79b160d..a7b1993a 100644
--- a/src/core/renderer/MCRenderer.h
+++ b/src/core/renderer/MCRenderer.h
@@ -6,8 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef mailcore2_MCRenderer_h
-#define mailcore2_MCRenderer_h
+#ifndef __MAILCORE_MCRENDERER_H_
+
+#define __MAILCORE_MCRENDERER_H_
 
 #include <MailCore/MCHTMLRendererCallback.h>
 
diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h
index 625c1d3d..a51373ae 100644
--- a/src/core/renderer/MCSizeFormatter.h
+++ b/src/core/renderer/MCSizeFormatter.h
@@ -6,8 +6,8 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __testUI__MCSizeFormatter__
-#define __testUI__MCSizeFormatter__
+#ifndef __MAILCORE_MCSIZEFORMATTER_H_
+#define __MAILCORE_MCSIZEFORMATTER_H_
 
 #include <MailCore/MCBaseTypes.h>
 
@@ -25,4 +25,4 @@ namespace mailcore {
 
 #endif
 
-#endif /* defined(__testUI__MCSizeFormatter__) */
+#endif