diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
index 7828de0119..f699b9889a 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
@@ -45,6 +45,8 @@ struct mailbox_info {
 	BString server_mb_name;
 };
 
+class NoopWorker;
+
 class IMAP4Client : public BRemoteMailStorageProtocol {
 	public:
 		IMAP4Client(BMessage *settings, BMailChainRunner *run);
diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp b/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
index fb8c6f7557..2cabc26b47 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
@@ -51,6 +51,8 @@
 #	define D(x) ;
 #endif
 
+using namespace std;
+
 /*
 ** Function: md5_hmac
 ** taken from the file rfc2104.txt