13 files changed, 15 insertions, 26 deletions
diff --git a/src/core/imap/MCIMAPFolder.h b/src/core/imap/MCIMAPFolder.h
index 10497ef7..5d9c111f 100644
--- a/src/core/imap/MCIMAPFolder.h
+++ b/src/core/imap/MCIMAPFolder.h
@@ -9,8 +9,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPFolder : public Object {
+    class MAILCORE_EXPORT IMAPFolder : public Object {
     public:
         IMAPFolder();
         virtual ~IMAPFolder();
diff --git a/src/core/imap/MCIMAPFolderStatus.h b/src/core/imap/MCIMAPFolderStatus.h
index fb4410e7..8bfac59f 100644
--- a/src/core/imap/MCIMAPFolderStatus.h
+++ b/src/core/imap/MCIMAPFolderStatus.h
@@ -17,8 +17,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPFolderStatus : public Object {
+    class MAILCORE_EXPORT IMAPFolderStatus : public Object {
     public:
         IMAPFolderStatus();
         virtual ~IMAPFolderStatus();
diff --git a/src/core/imap/MCIMAPIdentity.h b/src/core/imap/MCIMAPIdentity.h
index 176693f9..4f85744d 100644
--- a/src/core/imap/MCIMAPIdentity.h
+++ b/src/core/imap/MCIMAPIdentity.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPIdentity : public Object {
+    class MAILCORE_EXPORT IMAPIdentity : public Object {
     public:
         
         IMAPIdentity();
diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h
index 15abcbd4..c36a9ad1 100644
--- a/src/core/imap/MCIMAPMessage.h
+++ b/src/core/imap/MCIMAPMessage.h
@@ -15,8 +15,7 @@ namespace mailcore {
     class HTMLRendererIMAPCallback;
     class HTMLRendererTemplateCallback;
     
-    MAILCORE_EXPORT
-    class IMAPMessage : public AbstractMessage {
+    class MAILCORE_EXPORT IMAPMessage : public AbstractMessage {
     public:
         IMAPMessage();
         virtual ~IMAPMessage();
diff --git a/src/core/imap/MCIMAPMessagePart.h b/src/core/imap/MCIMAPMessagePart.h
index 2cb4c975..76317201 100644
--- a/src/core/imap/MCIMAPMessagePart.h
+++ b/src/core/imap/MCIMAPMessagePart.h
@@ -8,8 +8,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPMessagePart : public AbstractMessagePart {
+    class MAILCORE_EXPORT IMAPMessagePart : public AbstractMessagePart {
     public:
         IMAPMessagePart();
         virtual ~IMAPMessagePart();
diff --git a/src/core/imap/MCIMAPMultipart.h b/src/core/imap/MCIMAPMultipart.h
index 741f4123..91396624 100644
--- a/src/core/imap/MCIMAPMultipart.h
+++ b/src/core/imap/MCIMAPMultipart.h
@@ -8,8 +8,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPMultipart : public AbstractMultipart {
+    class MAILCORE_EXPORT IMAPMultipart : public AbstractMultipart {
     public:
         IMAPMultipart();
         virtual ~IMAPMultipart();
diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h
index 4214fc7f..e57cecba 100644
--- a/src/core/imap/MCIMAPNamespace.h
+++ b/src/core/imap/MCIMAPNamespace.h
@@ -10,8 +10,7 @@ namespace mailcore {
     
     class IMAPNamespaceItem;
     
-    MAILCORE_EXPORT
-    class IMAPNamespace : public Object {
+    class MAILCORE_EXPORT IMAPNamespace : public Object {
     public:
         IMAPNamespace();
         virtual ~IMAPNamespace();
diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h
index 43a28a52..3ca8e485 100644
--- a/src/core/imap/MCIMAPNamespaceItem.h
+++ b/src/core/imap/MCIMAPNamespaceItem.h
@@ -8,8 +8,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPNamespaceItem : public Object {
+    class MAILCORE_EXPORT IMAPNamespaceItem : public Object {
     public:
         IMAPNamespaceItem();
         virtual ~IMAPNamespaceItem();
diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h
index 9cb1a1c6..1a34da21 100644
--- a/src/core/imap/MCIMAPPart.h
+++ b/src/core/imap/MCIMAPPart.h
@@ -12,8 +12,7 @@ namespace mailcore {
     class IMAPMessagePart;
     class IMAPMultipart;
     
-    MAILCORE_EXPORT
-    class IMAPPart : public AbstractPart {
+    class MAILCORE_EXPORT IMAPPart : public AbstractPart {
     public:
         IMAPPart();
         virtual ~IMAPPart();
diff --git a/src/core/imap/MCIMAPProgressCallback.h b/src/core/imap/MCIMAPProgressCallback.h
index 2570dc81..b461eefd 100644
--- a/src/core/imap/MCIMAPProgressCallback.h
+++ b/src/core/imap/MCIMAPProgressCallback.h
@@ -4,12 +4,13 @@
 
 #ifdef __cplusplus
 
+#include <MailCore/MCUtils.h>
+
 namespace mailcore {
     
     class IMAPSession;
     
-    MAILCORE_EXPORT
-    class IMAPProgressCallback {
+    class MAILCORE_EXPORT IMAPProgressCallback {
     public:
         virtual void bodyProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {};
         virtual void itemsProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {};
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index 0d53e0b3..6f1f4ea0 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -9,8 +9,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPSearchExpression : public Object {
+    class MAILCORE_EXPORT IMAPSearchExpression : public Object {
     public:
         IMAPSearchExpression();
         virtual ~IMAPSearchExpression();
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index 456895d2..e96b8fec 100755
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -22,8 +22,7 @@ namespace mailcore {
     class IMAPFolderStatus;
     class IMAPIdentity;
     
-    MAILCORE_EXPORT
-    class IMAPSession : public Object {
+    class MAILCORE_EXPORT IMAPSession : public Object {
     public:
         IMAPSession();
         virtual ~IMAPSession();
diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h
index f2ff311b..683ca6cc 100644
--- a/src/core/imap/MCIMAPSyncResult.h
+++ b/src/core/imap/MCIMAPSyncResult.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPSyncResult : public Object {
+    class MAILCORE_EXPORT IMAPSyncResult : public Object {
     public:
         IMAPSyncResult();
         virtual ~IMAPSyncResult();