diff --git a/src/preferences/mail/FilterConfigView.cpp b/src/preferences/mail/FilterConfigView.cpp
index ef20cc3232..dce75cdab6 100644
--- a/src/preferences/mail/FilterConfigView.cpp
+++ b/src/preferences/mail/FilterConfigView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2012, Haiku, Inc. All rights reserved.
+ * Copyright 2007-2015, Haiku, Inc. All rights reserved.
  * Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved.
  * Copyright 2011, Clemens Zeidler <haiku@clemens-zeidler.de>
  * Distributed under the terms of the MIT License.
@@ -8,6 +8,8 @@
 
 #include "FilterConfigView.h"
 
+#include <stdio.h>
+
 #include <Alert.h>
 #include <Bitmap.h>
 #include <Box.h>
diff --git a/src/preferences/mail/FilterList.cpp b/src/preferences/mail/FilterList.cpp
index 46aeaa2c31..cba4df06da 100644
--- a/src/preferences/mail/FilterList.cpp
+++ b/src/preferences/mail/FilterList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012, Haiku, Inc. All rights reserved.
+ * Copyright 2011-2015, Haiku, Inc. All rights reserved.
  * Copyright 2011, Clemens Zeidler <haiku@clemens-zeidler.de>
  * Distributed under the terms of the MIT License.
  */
@@ -8,6 +8,7 @@
 #include "FilterList.h"
 
 #include <set>
+#include <stdio.h>
 
 #include <Directory.h>
 #include <FindDirectory.h>
diff --git a/src/preferences/mail/FilterList.h b/src/preferences/mail/FilterList.h
index ac46aedff5..6e94360934 100644
--- a/src/preferences/mail/FilterList.h
+++ b/src/preferences/mail/FilterList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012, Haiku, Inc. All rights reserved.
+ * Copyright 2011-2015, Haiku, Inc. All rights reserved.
  * Copyright 2011, Clemens Zeidler <haiku@clemens-zeidler.de>
  * Distributed under the terms of the MIT License.
  */
@@ -45,10 +45,10 @@ public:
 			BString				SimpleName(const entry_ref& ref,
 									const BMailAccountSettings& settings) const;
 			BString				DescriptiveName(int32 index,
-									const BMailAccountSettings& settings,
+									const BMailAccountSettings& accountSettings,
 									const BMailAddOnSettings* settings) const;
 			BString				DescriptiveName(const entry_ref& ref,
-									const BMailAccountSettings& settings,
+									const BMailAccountSettings& accountSettings,
 									const BMailAddOnSettings* settings) const;
 
 			BMailSettingsView*	CreateSettingsView(