Fixed win32 exports

122 files changed, 158 insertions, 239 deletions

diff --git a/src/async/imap/MCIMAPAppendMessageOperation.h b/src/async/imap/MCIMAPAppendMessageOperation.h
index aba167a7..ca3033a6 100644
--- a/src/async/imap/MCIMAPAppendMessageOperation.h
+++ b/src/async/imap/MCIMAPAppendMessageOperation.h
@@ -17,8 +17,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPAppendMessageOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPAppendMessageOperation : public IMAPOperation {
     public:
         IMAPAppendMessageOperation();
         virtual ~IMAPAppendMessageOperation();
diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h
index 79486829..40b11b90 100755
--- a/src/async/imap/MCIMAPAsyncConnection.h
+++ b/src/async/imap/MCIMAPAsyncConnection.h
@@ -34,8 +34,7 @@ namespace mailcore {
     class IMAPMessage;
     class IMAPIdentity;
     
-    MAILCORE_EXPORT
-    class IMAPAsyncConnection : public Object {
+    class MAILCORE_EXPORT IMAPAsyncConnection : public Object {
     public:
         IMAPAsyncConnection();
         virtual ~IMAPAsyncConnection();
diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h
index d9253113..4a61393f 100755
--- a/src/async/imap/MCIMAPAsyncSession.h
+++ b/src/async/imap/MCIMAPAsyncSession.h
@@ -41,8 +41,7 @@ namespace mailcore {
     class IMAPIdentity;
     class OperationQueueCallback;
     
-    MAILCORE_EXPORT
-    class IMAPAsyncSession : public Object {
+    class MAILCORE_EXPORT IMAPAsyncSession : public Object {
     public:
         IMAPAsyncSession();
         virtual ~IMAPAsyncSession();
diff --git a/src/async/imap/MCIMAPCapabilityOperation.h b/src/async/imap/MCIMAPCapabilityOperation.h
index e691f169..486d54cf 100644
--- a/src/async/imap/MCIMAPCapabilityOperation.h
+++ b/src/async/imap/MCIMAPCapabilityOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPCapabilityOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPCapabilityOperation : public IMAPOperation {
     public:
         IMAPCapabilityOperation();
         virtual ~IMAPCapabilityOperation();
diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h
index 27a78c19..9c81f00e 100644
--- a/src/async/imap/MCIMAPCheckAccountOperation.h
+++ b/src/async/imap/MCIMAPCheckAccountOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPCheckAccountOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPCheckAccountOperation : public IMAPOperation {
     public: // subclass behavior
         virtual void main();
     };
diff --git a/src/async/imap/MCIMAPConnectOperation.h b/src/async/imap/MCIMAPConnectOperation.h
index 639dd947..7678ccdd 100644
--- a/src/async/imap/MCIMAPConnectOperation.h
+++ b/src/async/imap/MCIMAPConnectOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPConnectOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPConnectOperation : public IMAPOperation {
     public: // subclass behavior
         virtual void main();
     };
diff --git a/src/async/imap/MCIMAPCopyMessagesOperation.h b/src/async/imap/MCIMAPCopyMessagesOperation.h
index f08e99d3..c6d75447 100644
--- a/src/async/imap/MCIMAPCopyMessagesOperation.h
+++ b/src/async/imap/MCIMAPCopyMessagesOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPCopyMessagesOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPCopyMessagesOperation : public IMAPOperation {
     public:
         IMAPCopyMessagesOperation();
         virtual ~IMAPCopyMessagesOperation();
diff --git a/src/async/imap/MCIMAPCreateFolderOperation.h b/src/async/imap/MCIMAPCreateFolderOperation.h
index e93aeb0c..c95352ea 100644
--- a/src/async/imap/MCIMAPCreateFolderOperation.h
+++ b/src/async/imap/MCIMAPCreateFolderOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPCreateFolderOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPCreateFolderOperation : public IMAPOperation {
     public:
         IMAPCreateFolderOperation();
         virtual ~IMAPCreateFolderOperation();
diff --git a/src/async/imap/MCIMAPDeleteFolderOperation.h b/src/async/imap/MCIMAPDeleteFolderOperation.h
index b7614710..d22f0a79 100644
--- a/src/async/imap/MCIMAPDeleteFolderOperation.h
+++ b/src/async/imap/MCIMAPDeleteFolderOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPDeleteFolderOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPDeleteFolderOperation : public IMAPOperation {
     public:
         IMAPDeleteFolderOperation();
         virtual ~IMAPDeleteFolderOperation();
diff --git a/src/async/imap/MCIMAPDisconnectOperation.h b/src/async/imap/MCIMAPDisconnectOperation.h
index 00c4abf0..683a0e77 100644
--- a/src/async/imap/MCIMAPDisconnectOperation.h
+++ b/src/async/imap/MCIMAPDisconnectOperation.h
@@ -18,8 +18,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPDisconnectOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPDisconnectOperation : public IMAPOperation {
     public:
         IMAPDisconnectOperation();
         virtual ~IMAPDisconnectOperation();
diff --git a/src/async/imap/MCIMAPExpungeOperation.h b/src/async/imap/MCIMAPExpungeOperation.h
index 76832429..617af7b1 100644
--- a/src/async/imap/MCIMAPExpungeOperation.h
+++ b/src/async/imap/MCIMAPExpungeOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPExpungeOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPExpungeOperation : public IMAPOperation {
     public:
         IMAPExpungeOperation();
         virtual ~IMAPExpungeOperation();
diff --git a/src/async/imap/MCIMAPFetchContentOperation.h b/src/async/imap/MCIMAPFetchContentOperation.h
index 0ce8e67d..0b5b70f2 100644
--- a/src/async/imap/MCIMAPFetchContentOperation.h
+++ b/src/async/imap/MCIMAPFetchContentOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPFetchContentOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPFetchContentOperation : public IMAPOperation {
     public:
         IMAPFetchContentOperation();
         virtual ~IMAPFetchContentOperation();
diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h
index d451db71..f6456a36 100644
--- a/src/async/imap/MCIMAPFetchFoldersOperation.h
+++ b/src/async/imap/MCIMAPFetchFoldersOperation.h
@@ -17,8 +17,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPFetchFoldersOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPFetchFoldersOperation : public IMAPOperation {
     public:
         IMAPFetchFoldersOperation();
         virtual ~IMAPFetchFoldersOperation();
diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h
index 65ce95ad..620aead6 100644
--- a/src/async/imap/MCIMAPFetchMessagesOperation.h
+++ b/src/async/imap/MCIMAPFetchMessagesOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPFetchMessagesOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPFetchMessagesOperation : public IMAPOperation {
     public:
         IMAPFetchMessagesOperation();
         virtual ~IMAPFetchMessagesOperation();
diff --git a/src/async/imap/MCIMAPFetchNamespaceOperation.h b/src/async/imap/MCIMAPFetchNamespaceOperation.h
index 41d24021..35b6ca2b 100644
--- a/src/async/imap/MCIMAPFetchNamespaceOperation.h
+++ b/src/async/imap/MCIMAPFetchNamespaceOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPFetchNamespaceOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPFetchNamespaceOperation : public IMAPOperation {
     public:
         IMAPFetchNamespaceOperation();
         virtual ~IMAPFetchNamespaceOperation();
diff --git a/src/async/imap/MCIMAPFetchParsedContentOperation.h b/src/async/imap/MCIMAPFetchParsedContentOperation.h
index f33f0acb..ec0485a9 100644
--- a/src/async/imap/MCIMAPFetchParsedContentOperation.h
+++ b/src/async/imap/MCIMAPFetchParsedContentOperation.h
@@ -18,8 +18,7 @@
 
 namespace mailcore {
 
-    MAILCORE_EXPORT
-    class IMAPFetchParsedContentOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPFetchParsedContentOperation : public IMAPOperation {
     public:
         IMAPFetchParsedContentOperation();
         virtual ~IMAPFetchParsedContentOperation();
diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h
index 50092915..b29f40a2 100644
--- a/src/async/imap/MCIMAPFolderInfoOperation.h
+++ b/src/async/imap/MCIMAPFolderInfoOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPFolderInfoOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPFolderInfoOperation : public IMAPOperation {
     public:
         IMAPFolderInfoOperation();
         virtual ~IMAPFolderInfoOperation();
diff --git a/src/async/imap/MCIMAPFolderStatusOperation.h b/src/async/imap/MCIMAPFolderStatusOperation.h
index 7fb9197a..53e3025b 100644
--- a/src/async/imap/MCIMAPFolderStatusOperation.h
+++ b/src/async/imap/MCIMAPFolderStatusOperation.h
@@ -19,8 +19,7 @@ namespace mailcore {
     
     class IMAPFolderStatus;
     
-    MAILCORE_EXPORT
-    class IMAPFolderStatusOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPFolderStatusOperation : public IMAPOperation {
     public:
         IMAPFolderStatusOperation();
         virtual ~IMAPFolderStatusOperation();
diff --git a/src/async/imap/MCIMAPIdentityOperation.h b/src/async/imap/MCIMAPIdentityOperation.h
index e1b86283..70cc7d52 100644
--- a/src/async/imap/MCIMAPIdentityOperation.h
+++ b/src/async/imap/MCIMAPIdentityOperation.h
@@ -18,8 +18,7 @@ namespace mailcore {
     
     class IMAPIdentity;
     
-    MAILCORE_EXPORT
-    class IMAPIdentityOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPIdentityOperation : public IMAPOperation {
     public:
         IMAPIdentityOperation();
         virtual ~IMAPIdentityOperation();
diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h
index 5df0aecd..5a383bfd 100644
--- a/src/async/imap/MCIMAPIdleOperation.h
+++ b/src/async/imap/MCIMAPIdleOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPIdleOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPIdleOperation : public IMAPOperation {
     public:
         IMAPIdleOperation();
         virtual ~IMAPIdleOperation();
diff --git a/src/async/imap/MCIMAPMessageRenderingOperation.h b/src/async/imap/MCIMAPMessageRenderingOperation.h
index 7e1c7b1b..7a02b4ae 100644
--- a/src/async/imap/MCIMAPMessageRenderingOperation.h
+++ b/src/async/imap/MCIMAPMessageRenderingOperation.h
@@ -17,8 +17,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPMessageRenderingOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPMessageRenderingOperation : public IMAPOperation {
     public:
         IMAPMessageRenderingOperation();
         virtual ~IMAPMessageRenderingOperation();
diff --git a/src/async/imap/MCIMAPMultiDisconnectOperation.h b/src/async/imap/MCIMAPMultiDisconnectOperation.h
index d40e07cb..78c36ed8 100644
--- a/src/async/imap/MCIMAPMultiDisconnectOperation.h
+++ b/src/async/imap/MCIMAPMultiDisconnectOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPMultiDisconnectOperation : public IMAPOperation, public OperationCallback {
+    class MAILCORE_EXPORT IMAPMultiDisconnectOperation : public IMAPOperation, public OperationCallback {
     public:
         IMAPMultiDisconnectOperation();
         virtual ~IMAPMultiDisconnectOperation();
diff --git a/src/async/imap/MCIMAPNoopOperation.h b/src/async/imap/MCIMAPNoopOperation.h
index 0f0f7fdb..515f563a 100644
--- a/src/async/imap/MCIMAPNoopOperation.h
+++ b/src/async/imap/MCIMAPNoopOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPNoopOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPNoopOperation : public IMAPOperation {
     public:
         IMAPNoopOperation();
         virtual ~IMAPNoopOperation();
diff --git a/src/async/imap/MCIMAPOperation.h b/src/async/imap/MCIMAPOperation.h
index 84967b00..a57d7489 100644
--- a/src/async/imap/MCIMAPOperation.h
+++ b/src/async/imap/MCIMAPOperation.h
@@ -21,8 +21,7 @@ namespace mailcore {
     class IMAPAsyncSession;
     class IMAPOperationCallback;
     
-    MAILCORE_EXPORT
-    class IMAPOperation : public Operation, public IMAPProgressCallback {
+    class MAILCORE_EXPORT IMAPOperation : public Operation, public IMAPProgressCallback {
     public:
         IMAPOperation();
         virtual ~IMAPOperation();
diff --git a/src/async/imap/MCIMAPOperationCallback.h b/src/async/imap/MCIMAPOperationCallback.h
index 2bc656d1..c5e14ffb 100644
--- a/src/async/imap/MCIMAPOperationCallback.h
+++ b/src/async/imap/MCIMAPOperationCallback.h
@@ -10,14 +10,15 @@
 
 #define MAILCORE_MCIMAPOPERATIONCALLBACK_H
 
+#include <MailCore/MCUtils.h>
+
 #ifdef __cplusplus
 
 namespace mailcore {
     
     class IMAPOperation;
     
-    MAILCORE_EXPORT
-    class IMAPOperationCallback {
+    class MAILCORE_EXPORT IMAPOperationCallback {
     public:
         virtual void bodyProgress(IMAPOperation * session, unsigned int current, unsigned int maximum) {};
         virtual void itemProgress(IMAPOperation * session, unsigned int current, unsigned int maximum) {};
diff --git a/src/async/imap/MCIMAPQuotaOperation.h b/src/async/imap/MCIMAPQuotaOperation.h
index df46a1a2..15a1c676 100644
--- a/src/async/imap/MCIMAPQuotaOperation.h
+++ b/src/async/imap/MCIMAPQuotaOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPQuotaOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPQuotaOperation : public IMAPOperation {
     public:
         IMAPQuotaOperation();
         virtual ~IMAPQuotaOperation();
diff --git a/src/async/imap/MCIMAPRenameFolderOperation.h b/src/async/imap/MCIMAPRenameFolderOperation.h
index 38e0969a..63282564 100644
--- a/src/async/imap/MCIMAPRenameFolderOperation.h
+++ b/src/async/imap/MCIMAPRenameFolderOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPRenameFolderOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPRenameFolderOperation : public IMAPOperation {
     public:
         IMAPRenameFolderOperation();
         ~IMAPRenameFolderOperation();
diff --git a/src/async/imap/MCIMAPSearchOperation.h b/src/async/imap/MCIMAPSearchOperation.h
index 95454db9..bb9cef08 100644
--- a/src/async/imap/MCIMAPSearchOperation.h
+++ b/src/async/imap/MCIMAPSearchOperation.h
@@ -19,8 +19,7 @@ namespace mailcore {
     
     class IMAPSearchExpression;
     
-    MAILCORE_EXPORT
-    class IMAPSearchOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPSearchOperation : public IMAPOperation {
     public:
         IMAPSearchOperation();
         virtual ~IMAPSearchOperation();
diff --git a/src/async/imap/MCIMAPStoreFlagsOperation.h b/src/async/imap/MCIMAPStoreFlagsOperation.h
index 5458bcb0..1325f8bc 100644
--- a/src/async/imap/MCIMAPStoreFlagsOperation.h
+++ b/src/async/imap/MCIMAPStoreFlagsOperation.h
@@ -15,9 +15,8 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-    
-    MAILCORE_EXPORT
-    class IMAPStoreFlagsOperation : public IMAPOperation {
+
+    class MAILCORE_EXPORT IMAPStoreFlagsOperation : public IMAPOperation {
     public:
         IMAPStoreFlagsOperation();
         virtual ~IMAPStoreFlagsOperation();
diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h
index 963a5a8a..7ccae85b 100644
--- a/src/async/imap/MCIMAPStoreLabelsOperation.h
+++ b/src/async/imap/MCIMAPStoreLabelsOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPStoreLabelsOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPStoreLabelsOperation : public IMAPOperation {
     public:
         IMAPStoreLabelsOperation();
         virtual ~IMAPStoreLabelsOperation();
diff --git a/src/async/imap/MCIMAPSubscribeFolderOperation.h b/src/async/imap/MCIMAPSubscribeFolderOperation.h
index 45d864b1..00db56fa 100644
--- a/src/async/imap/MCIMAPSubscribeFolderOperation.h
+++ b/src/async/imap/MCIMAPSubscribeFolderOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IMAPSubscribeFolderOperation : public IMAPOperation {
+    class MAILCORE_EXPORT IMAPSubscribeFolderOperation : public IMAPOperation {
     public:
         IMAPSubscribeFolderOperation();
         virtual ~IMAPSubscribeFolderOperation();
diff --git a/src/async/nntp/MCNNTPAsyncSession.h b/src/async/nntp/MCNNTPAsyncSession.h
index e0434fb9..7b9c8a4c 100644
--- a/src/async/nntp/MCNNTPAsyncSession.h
+++ b/src/async/nntp/MCNNTPAsyncSession.h
@@ -19,8 +19,7 @@ namespace mailcore {
     class NNTPOperationQueueCallback;
     class NNTPConnectionLogger;
     
-    MAILCORE_EXPORT
-    class NNTPAsyncSession : public Object {
+    class MAILCORE_EXPORT NNTPAsyncSession : public Object {
     public:
         NNTPAsyncSession();
         virtual ~NNTPAsyncSession();
diff --git a/src/async/nntp/MCNNTPCheckAccountOperation.h b/src/async/nntp/MCNNTPCheckAccountOperation.h
index b9bec07b..395178a0 100644
--- a/src/async/nntp/MCNNTPCheckAccountOperation.h
+++ b/src/async/nntp/MCNNTPCheckAccountOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class NNTPCheckAccountOperation : public NNTPOperation {
+    class MAILCORE_EXPORT NNTPCheckAccountOperation : public NNTPOperation {
     public:
         NNTPCheckAccountOperation();
         virtual ~NNTPCheckAccountOperation();
diff --git a/src/async/nntp/MCNNTPDisconnectOperation.h b/src/async/nntp/MCNNTPDisconnectOperation.h
index aa5c12a7..cb4a057a 100644
--- a/src/async/nntp/MCNNTPDisconnectOperation.h
+++ b/src/async/nntp/MCNNTPDisconnectOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class NNTPDisconnectOperation : public NNTPOperation {
+    class MAILCORE_EXPORT NNTPDisconnectOperation : public NNTPOperation {
     public:
         NNTPDisconnectOperation();
         virtual ~NNTPDisconnectOperation();
diff --git a/src/async/nntp/MCNNTPFetchAllArticlesOperation.h b/src/async/nntp/MCNNTPFetchAllArticlesOperation.h
index b40c9720..0fa532c8 100644
--- a/src/async/nntp/MCNNTPFetchAllArticlesOperation.h
+++ b/src/async/nntp/MCNNTPFetchAllArticlesOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class NNTPFetchAllArticlesOperation : public NNTPOperation {
+    class MAILCORE_EXPORT NNTPFetchAllArticlesOperation : public NNTPOperation {
     public:
         NNTPFetchAllArticlesOperation();
         virtual ~NNTPFetchAllArticlesOperation();
diff --git a/src/async/nntp/MCNNTPFetchArticleOperation.h b/src/async/nntp/MCNNTPFetchArticleOperation.h
index e715ddf6..3e066b7b 100644
--- a/src/async/nntp/MCNNTPFetchArticleOperation.h
+++ b/src/async/nntp/MCNNTPFetchArticleOperation.h
@@ -15,8 +15,7 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-    MAILCORE_EXPORT
-    class NNTPFetchArticleOperation : public NNTPOperation {
+    class MAILCORE_EXPORT NNTPFetchArticleOperation : public NNTPOperation {
     public:
         NNTPFetchArticleOperation();
         virtual ~NNTPFetchArticleOperation();
diff --git a/src/async/nntp/MCNNTPFetchHeaderOperation.h b/src/async/nntp/MCNNTPFetchHeaderOperation.h
index d12e9f57..93b9d380 100644
--- a/src/async/nntp/MCNNTPFetchHeaderOperation.h
+++ b/src/async/nntp/MCNNTPFetchHeaderOperation.h
@@ -18,8 +18,7 @@ namespace mailcore {
     
     class MessageHeader;
     
-    MAILCORE_EXPORT
-    class NNTPFetchHeaderOperation : public NNTPOperation {
+    class MAILCORE_EXPORT NNTPFetchHeaderOperation : public NNTPOperation {
     public:
         NNTPFetchHeaderOperation();
         virtual ~NNTPFetchHeaderOperation();
diff --git a/src/async/nntp/MCNNTPFetchOverviewOperation.h b/src/async/nntp/MCNNTPFetchOverviewOperation.h
index 4b48366b..bf8db26f 100644
--- a/src/async/nntp/MCNNTPFetchOverviewOperation.h
+++ b/src/async/nntp/MCNNTPFetchOverviewOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class NNTPFetchOverviewOperation : public NNTPOperation {
+    class MAILCORE_EXPORT NNTPFetchOverviewOperation : public NNTPOperation {
     public:
         NNTPFetchOverviewOperation();
         virtual ~NNTPFetchOverviewOperation();
diff --git a/src/async/nntp/MCNNTPFetchServerTimeOperation.h b/src/async/nntp/MCNNTPFetchServerTimeOperation.h
index 765862bc..b01a1599 100644
--- a/src/async/nntp/MCNNTPFetchServerTimeOperation.h
+++ b/src/async/nntp/MCNNTPFetchServerTimeOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class NNTPFetchServerTimeOperation : public NNTPOperation {
+    class MAILCORE_EXPORT NNTPFetchServerTimeOperation : public NNTPOperation {
     public:
         NNTPFetchServerTimeOperation();
         virtual ~NNTPFetchServerTimeOperation();
diff --git a/src/async/nntp/MCNNTPListNewsgroupsOperation.h b/src/async/nntp/MCNNTPListNewsgroupsOperation.h
index 3450ef3b..d2c68038 100644
--- a/src/async/nntp/MCNNTPListNewsgroupsOperation.h
+++ b/src/async/nntp/MCNNTPListNewsgroupsOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class NNTPListNewsgroupsOperation : public NNTPOperation {
+    class MAILCORE_EXPORT NNTPListNewsgroupsOperation : public NNTPOperation {
     public:
         NNTPListNewsgroupsOperation();
         virtual ~NNTPListNewsgroupsOperation();
diff --git a/src/async/nntp/MCNNTPOperation.h b/src/async/nntp/MCNNTPOperation.h
index a0b49ca2..52205e9f 100644
--- a/src/async/nntp/MCNNTPOperation.h
+++ b/src/async/nntp/MCNNTPOperation.h
@@ -20,8 +20,7 @@ namespace mailcore {
     class NNTPAsyncSession;
     class NNTPOperationCallback;
     
-    MAILCORE_EXPORT
-    class NNTPOperation : public Operation, public NNTPProgressCallback {
+    class MAILCORE_EXPORT NNTPOperation : public Operation, public NNTPProgressCallback {
     public:
         NNTPOperation();
         virtual ~NNTPOperation();
diff --git a/src/async/nntp/MCNNTPOperationCallback.h b/src/async/nntp/MCNNTPOperationCallback.h
index 1d455016..e12a1b75 100644
--- a/src/async/nntp/MCNNTPOperationCallback.h
+++ b/src/async/nntp/MCNNTPOperationCallback.h
@@ -10,14 +10,15 @@
 
 #define MAILCORE_MCNNTPOPERATIONCALLBACK_H
 
+#include <MailCore/MCUtils.h>
+
 #ifdef __cplusplus
 
 namespace mailcore {
     
     class NNTPOperation;
     
-    MAILCORE_EXPORT
-    class NNTPOperationCallback {
+    class MAILCORE_EXPORT NNTPOperationCallback {
     public:
         virtual void bodyProgress(NNTPOperation * session, unsigned int current, unsigned int maximum) {};
     };
diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h
index eab64f60..2cc50e12 100644
--- a/src/async/pop/MCPOPAsyncSession.h
+++ b/src/async/pop/MCPOPAsyncSession.h
@@ -25,8 +25,7 @@ namespace mailcore {
     class POPOperationQueueCallback;
     class POPConnectionLogger;
     
-    MAILCORE_EXPORT
-    class POPAsyncSession : public Object {
+    class MAILCORE_EXPORT POPAsyncSession : public Object {
     public:
         POPAsyncSession();
         virtual ~POPAsyncSession();
diff --git a/src/async/pop/MCPOPCheckAccountOperation.h b/src/async/pop/MCPOPCheckAccountOperation.h
index 7978372f..2b677918 100644
--- a/src/async/pop/MCPOPCheckAccountOperation.h
+++ b/src/async/pop/MCPOPCheckAccountOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class POPCheckAccountOperation : public POPOperation {
+    class MAILCORE_EXPORT POPCheckAccountOperation : public POPOperation {
     public:
         POPCheckAccountOperation();
         virtual ~POPCheckAccountOperation();
diff --git a/src/async/pop/MCPOPDeleteMessagesOperation.h b/src/async/pop/MCPOPDeleteMessagesOperation.h
index 30332a78..e19e211c 100644
--- a/src/async/pop/MCPOPDeleteMessagesOperation.h
+++ b/src/async/pop/MCPOPDeleteMessagesOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class POPDeleteMessagesOperation : public POPOperation {
+    class MAILCORE_EXPORT POPDeleteMessagesOperation : public POPOperation {
     public:
         POPDeleteMessagesOperation();
         virtual ~POPDeleteMessagesOperation();
diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h
index f124dfe9..c2c3dee8 100644
--- a/src/async/pop/MCPOPFetchHeaderOperation.h
+++ b/src/async/pop/MCPOPFetchHeaderOperation.h
@@ -18,8 +18,7 @@ namespace mailcore {
     
     class MessageHeader;
     
-    MAILCORE_EXPORT
-    class POPFetchHeaderOperation : public POPOperation {
+    class MAILCORE_EXPORT POPFetchHeaderOperation : public POPOperation {
     public:
         POPFetchHeaderOperation();
         virtual ~POPFetchHeaderOperation();
diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h
index a03eb08f..23fa1e89 100644
--- a/src/async/pop/MCPOPFetchMessageOperation.h
+++ b/src/async/pop/MCPOPFetchMessageOperation.h
@@ -15,8 +15,7 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-    MAILCORE_EXPORT
-    class POPFetchMessageOperation : public POPOperation {
+    class MAILCORE_EXPORT POPFetchMessageOperation : public POPOperation {
     public:
         POPFetchMessageOperation();
         virtual ~POPFetchMessageOperation();
diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h
index 81a6759e..7eb797b0 100644
--- a/src/async/pop/MCPOPFetchMessagesOperation.h
+++ b/src/async/pop/MCPOPFetchMessagesOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class POPFetchMessagesOperation : public POPOperation {
+    class MAILCORE_EXPORT POPFetchMessagesOperation : public POPOperation {
     public:
         POPFetchMessagesOperation();
         virtual ~POPFetchMessagesOperation();
diff --git a/src/async/pop/MCPOPNoopOperation.h b/src/async/pop/MCPOPNoopOperation.h
index c21f48a6..cc040c08 100644
--- a/src/async/pop/MCPOPNoopOperation.h
+++ b/src/async/pop/MCPOPNoopOperation.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class POPNoopOperation : public POPOperation {
+    class MAILCORE_EXPORT POPNoopOperation : public POPOperation {
     public:
         POPNoopOperation();
         virtual ~POPNoopOperation();
diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h
index 88fb5c34..652e4a4b 100644
--- a/src/async/pop/MCPOPOperation.h
+++ b/src/async/pop/MCPOPOperation.h
@@ -20,8 +20,7 @@ namespace mailcore {
     class POPAsyncSession;
     class POPOperationCallback;
     
-    MAILCORE_EXPORT
-    class POPOperation : public Operation, public POPProgressCallback {
+    class MAILCORE_EXPORT POPOperation : public Operation, public POPProgressCallback {
     public:
         POPOperation();
         virtual ~POPOperation();
diff --git a/src/async/pop/MCPOPOperationCallback.h b/src/async/pop/MCPOPOperationCallback.h
index 7fd9cc13..60714b88 100644
--- a/src/async/pop/MCPOPOperationCallback.h
+++ b/src/async/pop/MCPOPOperationCallback.h
@@ -10,14 +10,15 @@
 
 #define MAILCORE_MCPOPOPERATIONCALLBACK_H
 
+#include <MailCore/MCUtils.h>
+
 #ifdef __cplusplus
 
 namespace mailcore {
     
     class POPOperation;
     
-    MAILCORE_EXPORT
-    class POPOperationCallback {
+    class MAILCORE_EXPORT POPOperationCallback {
     public:
         virtual void bodyProgress(POPOperation * session, unsigned int current, unsigned int maximum) {};
     };
diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h
index 663784fc..5d94163e 100644
--- a/src/async/smtp/MCSMTPAsyncSession.h
+++ b/src/async/smtp/MCSMTPAsyncSession.h
@@ -16,8 +16,7 @@ namespace mailcore {
     class SMTPOperationQueueCallback;
     class SMTPConnectionLogger;
     
-    MAILCORE_EXPORT
-    class SMTPAsyncSession : public Object {
+    class MAILCORE_EXPORT SMTPAsyncSession : public Object {
     public:
         SMTPAsyncSession();
         virtual ~SMTPAsyncSession();
diff --git a/src/async/smtp/MCSMTPCheckAccountOperation.h b/src/async/smtp/MCSMTPCheckAccountOperation.h
index ab0e7039..ad45d38b 100644
--- a/src/async/smtp/MCSMTPCheckAccountOperation.h
+++ b/src/async/smtp/MCSMTPCheckAccountOperation.h
@@ -17,8 +17,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class SMTPCheckAccountOperation : public SMTPOperation {
+    class MAILCORE_EXPORT SMTPCheckAccountOperation : public SMTPOperation {
     public:
         SMTPCheckAccountOperation();
         virtual ~SMTPCheckAccountOperation();
diff --git a/src/async/smtp/MCSMTPDisconnectOperation.h b/src/async/smtp/MCSMTPDisconnectOperation.h
index d75c5bc6..668e3c41 100644
--- a/src/async/smtp/MCSMTPDisconnectOperation.h
+++ b/src/async/smtp/MCSMTPDisconnectOperation.h
@@ -18,8 +18,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class SMTPDisconnectOperation : public SMTPOperation {
+    class MAILCORE_EXPORT SMTPDisconnectOperation : public SMTPOperation {
     public:
         SMTPDisconnectOperation();
         virtual ~SMTPDisconnectOperation();
diff --git a/src/async/smtp/MCSMTPLoginOperation.h b/src/async/smtp/MCSMTPLoginOperation.h
index 9e68dc05..fd993459 100644
--- a/src/async/smtp/MCSMTPLoginOperation.h
+++ b/src/async/smtp/MCSMTPLoginOperation.h
@@ -18,8 +18,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class SMTPLoginOperation : public SMTPOperation {
+    class MAILCORE_EXPORT SMTPLoginOperation : public SMTPOperation {
     public:
         SMTPLoginOperation();
         virtual ~SMTPLoginOperation();
diff --git a/src/async/smtp/MCSMTPNoopOperation.h b/src/async/smtp/MCSMTPNoopOperation.h
index 46c955cf..ad194367 100644
--- a/src/async/smtp/MCSMTPNoopOperation.h
+++ b/src/async/smtp/MCSMTPNoopOperation.h
@@ -18,8 +18,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class SMTPNoopOperation : public SMTPOperation {
+    class MAILCORE_EXPORT SMTPNoopOperation : public SMTPOperation {
     public:
         SMTPNoopOperation();
         virtual ~SMTPNoopOperation();
diff --git a/src/async/smtp/MCSMTPOperation.h b/src/async/smtp/MCSMTPOperation.h
index 7530ea8b..5978d3d6 100644
--- a/src/async/smtp/MCSMTPOperation.h
+++ b/src/async/smtp/MCSMTPOperation.h
@@ -20,8 +20,7 @@ namespace mailcore {
     class SMTPAsyncSession;
     class SMTPOperationCallback;
     
-    MAILCORE_EXPORT
-    class SMTPOperation : public Operation, public SMTPProgressCallback {
+    class MAILCORE_EXPORT SMTPOperation : public Operation, public SMTPProgressCallback {
     public:
         SMTPOperation();
         virtual ~SMTPOperation();
diff --git a/src/async/smtp/MCSMTPOperationCallback.h b/src/async/smtp/MCSMTPOperationCallback.h
index 9d576cf7..a5cfdd84 100644
--- a/src/async/smtp/MCSMTPOperationCallback.h
+++ b/src/async/smtp/MCSMTPOperationCallback.h
@@ -10,14 +10,15 @@
 
 #define MAILCORE_MCSMTPOPERATIONCALLBACK_H
 
+#include <MailCore/MCUtils.h>
+
 #ifdef __cplusplus
 
 namespace mailcore {
     
     class SMTPOperation;
     
-    MAILCORE_EXPORT
-    class SMTPOperationCallback {
+    class MAILCORE_EXPORT SMTPOperationCallback {
     public:
         virtual void bodyProgress(SMTPOperation * session, unsigned int current, unsigned int maximum) {};
     };
diff --git a/src/async/smtp/MCSMTPSendWithDataOperation.h b/src/async/smtp/MCSMTPSendWithDataOperation.h
index 8a548498..a8ee2515 100644
--- a/src/async/smtp/MCSMTPSendWithDataOperation.h
+++ b/src/async/smtp/MCSMTPSendWithDataOperation.h
@@ -18,8 +18,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class SMTPSendWithDataOperation : public SMTPOperation {
+    class MAILCORE_EXPORT SMTPSendWithDataOperation : public SMTPOperation {
     public:
         SMTPSendWithDataOperation();
         virtual ~SMTPSendWithDataOperation();
diff --git a/src/core/abstract/MCAbstractMessage.h b/src/core/abstract/MCAbstractMessage.h
index bd93f44c..6e7e2431 100644
--- a/src/core/abstract/MCAbstractMessage.h
+++ b/src/core/abstract/MCAbstractMessage.h
@@ -11,8 +11,7 @@ namespace mailcore {
     class AbstractPart;
     class MessageHeader;
     
-    MAILCORE_EXPORT
-    class AbstractMessage : public Object {
+    class MAILCORE_EXPORT AbstractMessage : public Object {
     public:
         AbstractMessage();
         virtual ~AbstractMessage();
diff --git a/src/core/abstract/MCAbstractMessagePart.h b/src/core/abstract/MCAbstractMessagePart.h
index 93ccd361..74be7579 100644
--- a/src/core/abstract/MCAbstractMessagePart.h
+++ b/src/core/abstract/MCAbstractMessagePart.h
@@ -11,8 +11,7 @@ namespace mailcore {
     
     class MessageHeader;
     
-    MAILCORE_EXPORT
-    class AbstractMessagePart : public AbstractPart {
+    class MAILCORE_EXPORT AbstractMessagePart : public AbstractPart {
     public:
         AbstractMessagePart();
         virtual ~AbstractMessagePart();
diff --git a/src/core/abstract/MCAbstractMultipart.h b/src/core/abstract/MCAbstractMultipart.h
index ce36acbc..814ee6df 100644
--- a/src/core/abstract/MCAbstractMultipart.h
+++ b/src/core/abstract/MCAbstractMultipart.h
@@ -9,8 +9,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class AbstractMultipart : public AbstractPart {
+    class MAILCORE_EXPORT AbstractMultipart : public AbstractPart {
     public:
         AbstractMultipart();
         virtual ~AbstractMultipart();
diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h
index 3e6d627e..7a743e1d 100644
--- a/src/core/abstract/MCAbstractPart.h
+++ b/src/core/abstract/MCAbstractPart.h
@@ -11,8 +11,7 @@ namespace mailcore {
     
     class AbstractMessage;
     
-    MAILCORE_EXPORT
-    class AbstractPart : public Object {
+    class MAILCORE_EXPORT AbstractPart : public Object {
     public:
         AbstractPart();
         virtual ~AbstractPart();
diff --git a/src/core/abstract/MCAddress.h b/src/core/abstract/MCAddress.h
index 04a42cdf..e6644576 100644
--- a/src/core/abstract/MCAddress.h
+++ b/src/core/abstract/MCAddress.h
@@ -8,8 +8,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class Address : public Object {
+    class MAILCORE_EXPORT Address : public Object {
     public:
         Address();
         virtual ~Address();
diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h
index a9161cf7..439e0d44 100644
--- a/src/core/abstract/MCMessageHeader.h
+++ b/src/core/abstract/MCMessageHeader.h
@@ -11,8 +11,7 @@ namespace mailcore {
     
     class Address;
     
-    MAILCORE_EXPORT
-    class MessageHeader : public Object {
+    class MAILCORE_EXPORT MessageHeader : public Object {
     public:
         MessageHeader();
         virtual ~MessageHeader();
diff --git a/src/core/basetypes/MCArray.h b/src/core/basetypes/MCArray.h
index 7895b692..7e82ad9e 100644
--- a/src/core/basetypes/MCArray.h
+++ b/src/core/basetypes/MCArray.h
@@ -12,8 +12,7 @@ namespace mailcore {
     
     class String;
     
-    MAILCORE_EXPORT
-    class Array : public Object {
+    class MAILCORE_EXPORT Array : public Object {
     public:
         Array();
         virtual ~Array();
diff --git a/src/core/basetypes/MCAssert.h b/src/core/basetypes/MCAssert.h
index 226ea8a0..4022e285 100644
--- a/src/core/basetypes/MCAssert.h
+++ b/src/core/basetypes/MCAssert.h
@@ -2,6 +2,8 @@
 
 #define MAILCORE_MCASSERT_H
 
+#include <MailCore/MCUtils.h>
+
 #define MCAssert(cond) MCAssertInternal(__FILE__, __LINE__, cond, #cond)
 
 #ifdef __cplusplus
diff --git a/src/core/basetypes/MCAutoreleasePool.h b/src/core/basetypes/MCAutoreleasePool.h
index a84ede29..c3abf477 100644
--- a/src/core/basetypes/MCAutoreleasePool.h
+++ b/src/core/basetypes/MCAutoreleasePool.h
@@ -11,8 +11,7 @@ typedef struct carray_s carray;
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class AutoreleasePool : public Object {
+    class MAILCORE_EXPORT AutoreleasePool : public Object {
     public:
         AutoreleasePool();
         virtual ~AutoreleasePool();
diff --git a/src/core/basetypes/MCConnectionLogger.h b/src/core/basetypes/MCConnectionLogger.h
index d0a44713..d5282db4 100644
--- a/src/core/basetypes/MCConnectionLogger.h
+++ b/src/core/basetypes/MCConnectionLogger.h
@@ -12,6 +12,8 @@
 
 #include <stdlib.h>
 
+#include <MailCore/MCUtils.h>
+
 #ifdef __cplusplus
 
 namespace mailcore {
@@ -33,8 +35,7 @@ namespace mailcore {
         ConnectionLogTypeErrorSent,
     };
     
-    MAILCORE_EXPORT
-    class ConnectionLogger {
+    class MAILCORE_EXPORT ConnectionLogger {
     public:
         virtual void log(void * sender, ConnectionLogType logType, Data * buffer) {}
     };
diff --git a/src/core/basetypes/MCData.h b/src/core/basetypes/MCData.h
index db3af1e6..bec75008 100644
--- a/src/core/basetypes/MCData.h
+++ b/src/core/basetypes/MCData.h
@@ -17,8 +17,7 @@ namespace mailcore {
     
     class String;
     
-    MAILCORE_EXPORT
-    class Data : public Object {
+    class MAILCORE_EXPORT Data : public Object {
     public:
         Data();
         Data(int capacity);
diff --git a/src/core/basetypes/MCHTMLCleaner.h b/src/core/basetypes/MCHTMLCleaner.h
index bf692e5c..33e65767 100644
--- a/src/core/basetypes/MCHTMLCleaner.h
+++ b/src/core/basetypes/MCHTMLCleaner.h
@@ -11,10 +11,11 @@
 #define MAILCORE_HTMLCLEANER_H
 
 #include <MailCore/MCString.h>
+#include <MailCore/MCUtils.h>
 
 namespace mailcore {
     
-    class HTMLCleaner {
+    class MAILCORE_EXPORT HTMLCleaner {
     public:
         static String * cleanHTML(String * input);
     };
diff --git a/src/core/basetypes/MCHashMap.h b/src/core/basetypes/MCHashMap.h
index ec7dea59..93938383 100644
--- a/src/core/basetypes/MCHashMap.h
+++ b/src/core/basetypes/MCHashMap.h
@@ -13,8 +13,7 @@ namespace mailcore {
     struct HashMapCell;
     typedef HashMapCell HashMapIter;
     
-    MAILCORE_EXPORT
-    class HashMap : public Object {
+    class MAILCORE_EXPORT HashMap : public Object {
     public:
         HashMap();
         virtual ~HashMap();
diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h
index 1e8d3853..e76517db 100644
--- a/src/core/basetypes/MCIndexSet.h
+++ b/src/core/basetypes/MCIndexSet.h
@@ -18,8 +18,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class IndexSet : public Object {
+    class MAILCORE_EXPORT IndexSet : public Object {
     public:
         IndexSet();
         IndexSet(IndexSet * o);
diff --git a/src/core/basetypes/MCJSON.h b/src/core/basetypes/MCJSON.h
index 4999d0fd..f000dc2d 100644
--- a/src/core/basetypes/MCJSON.h
+++ b/src/core/basetypes/MCJSON.h
@@ -23,8 +23,7 @@ namespace mailcore {
     
     class Null;
     
-    MAILCORE_EXPORT
-    class JSON {
+    class MAILCORE_EXPORT JSON {
     public:
         static String * objectToJSONString(Object * object);
         static Data * objectToJSONData(Object * object);
diff --git a/src/core/basetypes/MCJSONParser.h b/src/core/basetypes/MCJSONParser.h
index 16a40c92..dbc0fc90 100644
--- a/src/core/basetypes/MCJSONParser.h
+++ b/src/core/basetypes/MCJSONParser.h
@@ -12,13 +12,14 @@
 
 #include <MailCore/MCObject.h>
 #include <MailCore/MCICUTypes.h>
+#include <MailCore/MCUtils.h>
 
 namespace mailcore {
     
     class Data;
     class String;
     
-    class JSONParser : public Object {
+    class MAILCORE_EXPORT JSONParser : public Object {
     public:
         JSONParser();
         virtual ~JSONParser();
diff --git a/src/core/basetypes/MCNull.h b/src/core/basetypes/MCNull.h
index 0ee9e532..dc271e04 100644
--- a/src/core/basetypes/MCNull.h
+++ b/src/core/basetypes/MCNull.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class Null : public Object {
+    class MAILCORE_EXPORT Null : public Object {
     public:
         static Null * null();
     };
diff --git a/src/core/basetypes/MCObject.h b/src/core/basetypes/MCObject.h
index 9ca144f0..95446f61 100644
--- a/src/core/basetypes/MCObject.h
+++ b/src/core/basetypes/MCObject.h
@@ -18,8 +18,7 @@ namespace mailcore {
     class String;
     class HashMap;
     
-    MAILCORE_EXPORT
-    class Object {
+    class MAILCORE_EXPORT Object {
     public:
         Object();
         virtual ~Object();
diff --git a/src/core/basetypes/MCOperation.h b/src/core/basetypes/MCOperation.h
index b9d5f95e..5ee8b2f4 100644
--- a/src/core/basetypes/MCOperation.h
+++ b/src/core/basetypes/MCOperation.h
@@ -11,7 +11,7 @@ namespace mailcore {
     
     class OperationCallback;
     
-    class Operation : public Object {
+    class MAILCORE_EXPORT Operation : public Object {
     public:
         Operation();
         virtual ~Operation();
diff --git a/src/core/basetypes/MCOperationCallback.h b/src/core/basetypes/MCOperationCallback.h
index 54a89f9a..425b1e99 100644
--- a/src/core/basetypes/MCOperationCallback.h
+++ b/src/core/basetypes/MCOperationCallback.h
@@ -2,14 +2,15 @@
 
 #define MAILCORE_MCOPERATIONCALLBACK_H
 
+#include <MailCore/MCUtils.h>
+
 #ifdef __cplusplus
 
 namespace mailcore {
     
     class Operation;
     
-    MAILCORE_EXPORT
-    class OperationCallback {
+    class MAILCORE_EXPORT OperationCallback {
     public:
         virtual void operationFinished(Operation * op) {}
     };
diff --git a/src/core/basetypes/MCOperationQueue.h b/src/core/basetypes/MCOperationQueue.h
index 3c15e09a..1e8e4844 100644
--- a/src/core/basetypes/MCOperationQueue.h
+++ b/src/core/basetypes/MCOperationQueue.h
@@ -15,8 +15,7 @@ namespace mailcore {
     class OperationQueueCallback;
     class Array;
     
-    MAILCORE_EXPORT
-    class OperationQueue : public Object {
+    class MAILCORE_EXPORT OperationQueue : public Object {
     public:
         OperationQueue();
         virtual ~OperationQueue();
diff --git a/src/core/basetypes/MCOperationQueueCallback.h b/src/core/basetypes/MCOperationQueueCallback.h
index 7004e4eb..482f5541 100644
--- a/src/core/basetypes/MCOperationQueueCallback.h
+++ b/src/core/basetypes/MCOperationQueueCallback.h
@@ -9,12 +9,15 @@
 #ifndef MAILCORE_OPERATIONQUEUECALLBACK_H
 #define MAILCORE_OPERATIONQUEUECALLBACK_H
 
+#include <MailCore/MCUtils.h>
+
+#ifdef __cplusplus
+
 namespace mailcore {
     
     class OperationQueue;
     
-    MAILCORE_EXPORT
-    class OperationQueueCallback {
+    class MAILCORE_EXPORT OperationQueueCallback {
     public:
         virtual void queueStartRunning() {}
         virtual void queueStoppedRunning() {}
@@ -23,3 +26,5 @@ namespace mailcore {
 }
 
 #endif
+
+#endif
diff --git a/src/core/basetypes/MCRange.h b/src/core/basetypes/MCRange.h
index 5dd5ecf2..9ec4f568 100644
--- a/src/core/basetypes/MCRange.h
+++ b/src/core/basetypes/MCRange.h
@@ -6,6 +6,8 @@
 
 #include <inttypes.h>
 
+#include <MailCore/MCUtils.h>
+
 #ifndef UINT64_MAX
 # define UINT64_MAX 18446744073709551615ULL
 #endif
diff --git a/src/core/basetypes/MCSet.h b/src/core/basetypes/MCSet.h
index e3153c9f..8b477cc1 100644
--- a/src/core/basetypes/MCSet.h
+++ b/src/core/basetypes/MCSet.h
@@ -12,8 +12,7 @@ namespace mailcore {
     class Array;
     class HashMap;
     
-    MAILCORE_EXPORT
-    class Set : public Object {
+    class MAILCORE_EXPORT Set : public Object {
     public:
         Set();
         Set(Set * o);
diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h
index 0edd2982..0735d321 100644
--- a/src/core/basetypes/MCString.h
+++ b/src/core/basetypes/MCString.h
@@ -16,8 +16,7 @@ namespace mailcore {
     class Data;
     class Array;
     
-    MAILCORE_EXPORT
-    class String : public Object {
+    class MAILCORE_EXPORT String : public Object {
     public:
         String(const UChar * unicodeChars = NULL);
         String(const UChar * unicodeChars, unsigned int length);
diff --git a/src/core/basetypes/MCUtils.h b/src/core/basetypes/MCUtils.h
index 2461b540..3892350f 100644
--- a/src/core/basetypes/MCUtils.h
+++ b/src/core/basetypes/MCUtils.h
@@ -36,6 +36,8 @@
 
 #define MCISKINDOFCLASS(instance, class) (dynamic_cast<class *>(instance) != NULL)
 
+#endif
+
 #ifdef _MSC_VER
 #	ifdef MAILCORE_DLL
 #		define MAILCORE_EXPORT __declspec(dllexport)
@@ -47,5 +49,3 @@
 #endif
 
 #endif
-
-#endif
diff --git a/src/core/basetypes/MCValue.h b/src/core/basetypes/MCValue.h
index 3f0a7b75..41fb6918 100644
--- a/src/core/basetypes/MCValue.h
+++ b/src/core/basetypes/MCValue.h
@@ -29,8 +29,7 @@ namespace mailcore {
         ValueTypeData,
     };
     
-    MAILCORE_EXPORT
-    class Value : public Object {
+    class MAILCORE_EXPORT Value : public Object {
     public:
         virtual ~Value();
         
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();
diff --git a/src/core/nntp/MCNNTPGroupInfo.h b/src/core/nntp/MCNNTPGroupInfo.h
index 7aab5e17..75a6675c 100644
--- a/src/core/nntp/MCNNTPGroupInfo.h
+++ b/src/core/nntp/MCNNTPGroupInfo.h
@@ -8,8 +8,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class NNTPGroupInfo : public Object {
+    class MAILCORE_EXPORT NNTPGroupInfo : public Object {
     public:
         NNTPGroupInfo();
         virtual ~NNTPGroupInfo();
diff --git a/src/core/nntp/MCNNTPProgressCallback.h b/src/core/nntp/MCNNTPProgressCallback.h
index 46cfbe72..dd615d04 100644
--- a/src/core/nntp/MCNNTPProgressCallback.h
+++ b/src/core/nntp/MCNNTPProgressCallback.h
@@ -4,12 +4,13 @@
 
 #ifdef __cplusplus
 
+#include <MailCore/MCUtils.h>
+
 namespace mailcore {
     
     class NNTPSession;
     
-    MAILCORE_EXPORT
-    class NNTPProgressCallback {
+    class MAILCORE_EXPORT NNTPProgressCallback {
     public:
         virtual void bodyProgress(NNTPSession * session, unsigned int current, unsigned int maximum) {};
     };
diff --git a/src/core/nntp/MCNNTPSession.h b/src/core/nntp/MCNNTPSession.h
index 1d896192..dc2316ff 100644
--- a/src/core/nntp/MCNNTPSession.h
+++ b/src/core/nntp/MCNNTPSession.h
@@ -11,8 +11,7 @@ namespace mailcore {
     class NNTPProgressCallback;
     class MessageHeader;
     
-    MAILCORE_EXPORT
-    class NNTPSession : public Object {
+    class MAILCORE_EXPORT NNTPSession : public Object {
     public:
         NNTPSession();
         virtual ~NNTPSession();
diff --git a/src/core/pop/MCPOPMessageInfo.h b/src/core/pop/MCPOPMessageInfo.h
index 3a906668..6d70fe30 100644
--- a/src/core/pop/MCPOPMessageInfo.h
+++ b/src/core/pop/MCPOPMessageInfo.h
@@ -8,8 +8,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class POPMessageInfo : public Object {
+    class MAILCORE_EXPORT POPMessageInfo : public Object {
     public:
         POPMessageInfo();
         virtual ~POPMessageInfo();
diff --git a/src/core/pop/MCPOPProgressCallback.h b/src/core/pop/MCPOPProgressCallback.h
index a4f32732..cdee9332 100644
--- a/src/core/pop/MCPOPProgressCallback.h
+++ b/src/core/pop/MCPOPProgressCallback.h
@@ -4,12 +4,13 @@
 
 #ifdef __cplusplus
 
+#include <MailCore/MCUtils.h>
+
 namespace mailcore {
     
     class POPSession;
     
-    MAILCORE_EXPORT
-    class POPProgressCallback {
+    class MAILCORE_EXPORT POPProgressCallback {
     public:
         virtual void bodyProgress(POPSession * session, unsigned int current, unsigned int maximum) {};
     };
diff --git a/src/core/pop/MCPOPSession.h b/src/core/pop/MCPOPSession.h
index 262cfe41..eda323c0 100644
--- a/src/core/pop/MCPOPSession.h
+++ b/src/core/pop/MCPOPSession.h
@@ -13,8 +13,7 @@ namespace mailcore {
     class POPProgressCallback;
     class MessageHeader;
     
-    MAILCORE_EXPORT
-    class POPSession : public Object {
+    class MAILCORE_EXPORT POPSession : public Object {
     public:
         POPSession();
         virtual ~POPSession();
diff --git a/src/core/provider/MCMailProvider.h b/src/core/provider/MCMailProvider.h
index 20589a74..e0801da5 100644
--- a/src/core/provider/MCMailProvider.h
+++ b/src/core/provider/MCMailProvider.h
@@ -18,8 +18,7 @@ namespace mailcore {
     
     class NetService;
     
-    MAILCORE_EXPORT
-    class MailProvider : public Object {
+    class MAILCORE_EXPORT MailProvider : public Object {
     public:
         static MailProvider * providerWithInfo(HashMap * info);
         
diff --git a/src/core/provider/MCMailProvidersManager.h b/src/core/provider/MCMailProvidersManager.h
index 92ae59af..42d1d3bc 100644
--- a/src/core/provider/MCMailProvidersManager.h
+++ b/src/core/provider/MCMailProvidersManager.h
@@ -18,8 +18,7 @@ namespace mailcore {
     
     class MailProvider;
     
-    MAILCORE_EXPORT
-    class MailProvidersManager : public Object {
+    class MAILCORE_EXPORT MailProvidersManager : public Object {
     public:
         static MailProvidersManager * sharedManager();
         
diff --git a/src/core/provider/MCNetService.h b/src/core/provider/MCNetService.h
index efc6c19c..bc1edf81 100644
--- a/src/core/provider/MCNetService.h
+++ b/src/core/provider/MCNetService.h
@@ -17,8 +17,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class NetService : public Object {
+    class MAILCORE_EXPORT NetService : public Object {
     
     public:
         NetService();
diff --git a/src/core/renderer/MCAddressDisplay.h b/src/core/renderer/MCAddressDisplay.h
index 72fcff41..6dd1faf8 100644
--- a/src/core/renderer/MCAddressDisplay.h
+++ b/src/core/renderer/MCAddressDisplay.h
@@ -16,8 +16,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class AddressDisplay {
+    class MAILCORE_EXPORT AddressDisplay {
     public:
         static String * displayStringForAddress(Address * address);
         static String * shortDisplayStringForAddress(Address * address);
diff --git a/src/core/renderer/MCDateFormatter.h b/src/core/renderer/MCDateFormatter.h
index ea93b4fc..d2198d04 100644
--- a/src/core/renderer/MCDateFormatter.h
+++ b/src/core/renderer/MCDateFormatter.h
@@ -31,8 +31,7 @@ namespace mailcore {
         DateFormatStyleNone = -1 /* UDAT_NONE */,
     };
     
-    MAILCORE_EXPORT
-    class DateFormatter : public Object {
+    class MAILCORE_EXPORT DateFormatter : public Object {
     public:
         DateFormatter();
         virtual ~DateFormatter();
diff --git a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
index 6cd86d1b..c3c19741 100644
--- a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
+++ b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
@@ -11,13 +11,13 @@
 #define MAILCORE_MCHTMLBODYRENDERERTEMPLATECALLBACK_H
 
 #include <MailCore/MCHTMLRendererCallback.h>
+#include <MailCore/MCUtils.h>
 
 #ifdef __cplusplus
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class HTMLBodyRendererTemplateCallback : public Object, public HTMLRendererTemplateCallback {
+    class MAILCORE_EXPORT HTMLBodyRendererTemplateCallback : public Object, public HTMLRendererTemplateCallback {
     public:
         virtual String * templateForMainHeader(MessageHeader * header);
     };
diff --git a/src/core/renderer/MCHTMLRenderer.h b/src/core/renderer/MCHTMLRenderer.h
index 6d59cb67..dc527b2f 100644
--- a/src/core/renderer/MCHTMLRenderer.h
+++ b/src/core/renderer/MCHTMLRenderer.h
@@ -22,7 +22,7 @@ namespace mailcore {
     class HTMLRendererTemplateCallback;
     class HTMLRendererIMAPCallback;
     
-    class HTMLRenderer {
+    class MAILCORE_EXPORT HTMLRenderer {
     public:
         static String * htmlForRFC822Message(MessageParser * message,
                                              HTMLRendererTemplateCallback * htmlCallback);
diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h
index f67763e5..7c20f18a 100644
--- a/src/core/renderer/MCHTMLRendererCallback.h
+++ b/src/core/renderer/MCHTMLRendererCallback.h
@@ -12,6 +12,7 @@
 
 #include <MailCore/MCAbstract.h>
 #include <MailCore/MCIMAP.h>
+#include <MailCore/MCUtils.h>
 
 #ifdef __cplusplus
 
@@ -19,8 +20,7 @@ namespace mailcore {
     
     class MessageParser;
     
-    MAILCORE_EXPORT
-    class HTMLRendererIMAPCallback {
+    class MAILCORE_EXPORT HTMLRendererIMAPCallback {
     public:
         HTMLRendererIMAPCallback() {}
         virtual ~HTMLRendererIMAPCallback() {}
@@ -30,8 +30,7 @@ namespace mailcore {
         virtual void prefetchImageIMAPPart(String * folder, IMAPPart * part) {}
     };
     
-    MAILCORE_EXPORT
-    class HTMLRendererTemplateCallback {
+    class MAILCORE_EXPORT HTMLRendererTemplateCallback {
     public:
         virtual bool canPreviewPart(AbstractPart * part);
         virtual bool shouldShowPart(AbstractPart * part);
diff --git a/src/core/renderer/MCHTMLRendererIMAPDataCallback.h b/src/core/renderer/MCHTMLRendererIMAPDataCallback.h
index acba9f9f..7981b114 100644
--- a/src/core/renderer/MCHTMLRendererIMAPDataCallback.h
+++ b/src/core/renderer/MCHTMLRendererIMAPDataCallback.h
@@ -11,13 +11,13 @@
 #define MAILCORE_MCHTMLRENDERERIMAPDATACALLBACK_H
 
 #include "MCHTMLRendererCallback.h"
+#include <MailCore/MCUtils.h>
 
 #ifdef __cplusplus
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class HTMLRendererIMAPDataCallback : public Object, public HTMLRendererIMAPCallback {
+    class MAILCORE_EXPORT HTMLRendererIMAPDataCallback : public Object, public HTMLRendererIMAPCallback {
     public:
         HTMLRendererIMAPDataCallback(IMAPSession * session, uint32_t uid);
         
diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h
index 22ae2f67..cfc8090f 100644
--- a/src/core/renderer/MCSizeFormatter.h
+++ b/src/core/renderer/MCSizeFormatter.h
@@ -18,8 +18,7 @@ namespace mailcore {
     
     class String;
     
-    MAILCORE_EXPORT
-    class SizeFormatter : public Object {
+    class MAILCORE_EXPORT SizeFormatter : public Object {
     public:
         static String * stringWithSize(unsigned int size);
     };
diff --git a/src/core/rfc822/MCAttachment.h b/src/core/rfc822/MCAttachment.h
index 573366ed..deacf75e 100644
--- a/src/core/rfc822/MCAttachment.h
+++ b/src/core/rfc822/MCAttachment.h
@@ -13,8 +13,7 @@ namespace mailcore {
     
     class MessagePart;
     
-    MAILCORE_EXPORT
-    class Attachment : public AbstractPart {
+    class MAILCORE_EXPORT Attachment : public AbstractPart {
     public:
         static String * mimeTypeForFilename(String * filename);
         static Attachment * attachmentWithContentsOfFile(String * filename);
diff --git a/src/core/rfc822/MCMessageBuilder.h b/src/core/rfc822/MCMessageBuilder.h
index 5336d4dc..f03bd09a 100644
--- a/src/core/rfc822/MCMessageBuilder.h
+++ b/src/core/rfc822/MCMessageBuilder.h
@@ -12,8 +12,7 @@ namespace mailcore {
     class Attachment;
     class HTMLRendererTemplateCallback;
     
-    MAILCORE_EXPORT
-    class MessageBuilder : public AbstractMessage {
+    class MAILCORE_EXPORT MessageBuilder : public AbstractMessage {
     public:
         MessageBuilder();
         virtual ~MessageBuilder();
diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h
index aed322df..8d2fe4a6 100644
--- a/src/core/rfc822/MCMessageParser.h
+++ b/src/core/rfc822/MCMessageParser.h
@@ -15,8 +15,7 @@ namespace mailcore {
     
     class HTMLRendererTemplateCallback;
     
-    MAILCORE_EXPORT
-    class MessageParser : public AbstractMessage {
+    class MAILCORE_EXPORT MessageParser : public AbstractMessage {
     public:
         static MessageParser * messageParserWithData(Data * data);
         static MessageParser * messageParserWithContentsOfFile(String * filename);
diff --git a/src/core/rfc822/MCMessagePart.h b/src/core/rfc822/MCMessagePart.h
index ef649661..894cd3e5 100644
--- a/src/core/rfc822/MCMessagePart.h
+++ b/src/core/rfc822/MCMessagePart.h
@@ -9,8 +9,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class MessagePart : public AbstractMessagePart {
+    class MAILCORE_EXPORT MessagePart : public AbstractMessagePart {
     public:
         MessagePart();
         virtual ~MessagePart();
diff --git a/src/core/rfc822/MCMultipart.h b/src/core/rfc822/MCMultipart.h
index b68718f2..40b0a48b 100644
--- a/src/core/rfc822/MCMultipart.h
+++ b/src/core/rfc822/MCMultipart.h
@@ -9,8 +9,7 @@
 
 namespace mailcore {
     
-    MAILCORE_EXPORT
-    class Multipart : public AbstractMultipart {
+    class MAILCORE_EXPORT Multipart : public AbstractMultipart {
     public:
         Multipart();
         virtual ~Multipart();
diff --git a/src/core/smtp/MCSMTPProgressCallback.h b/src/core/smtp/MCSMTPProgressCallback.h
index d3844a82..7cc524a2 100644
--- a/src/core/smtp/MCSMTPProgressCallback.h
+++ b/src/core/smtp/MCSMTPProgressCallback.h
@@ -4,12 +4,13 @@
 
 #ifdef __cplusplus
 
+#include <MailCore/MCUtils.h>
+
 namespace mailcore {
     
     class SMTPSession;
     
-    MAILCORE_EXPORT
-    class SMTPProgressCallback {
+    class MAILCORE_EXPORT SMTPProgressCallback {
     public:
         virtual void bodyProgress(SMTPSession * session, unsigned int current, unsigned int maximum) {};
     };
diff --git a/src/core/smtp/MCSMTPSession.h b/src/core/smtp/MCSMTPSession.h
index 0db1acc8..05571bfb 100644
--- a/src/core/smtp/MCSMTPSession.h
+++ b/src/core/smtp/MCSMTPSession.h
@@ -13,8 +13,7 @@ namespace mailcore {
     class SMTPProgressCallback;
     class MessageBuilder;
     
-    MAILCORE_EXPORT
-    class SMTPSession : public Object {
+    class MAILCORE_EXPORT SMTPSession : public Object {
     public:
         SMTPSession();
         virtual ~SMTPSession();