Fixed win32 exports

59 files changed, 68 insertions, 119 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();