diff --git a/UI/MailerUI/UIxMailFormatter.m b/UI/MailerUI/UIxMailFormatter.m
index 0479e9539..38e4114ab 100644
--- a/UI/MailerUI/UIxMailFormatter.m
+++ b/UI/MailerUI/UIxMailFormatter.m
@@ -19,8 +19,13 @@
   02111-1307, USA.
 */
 
-#include "UIxMailFormatter.h"
-#include "common.h"
+#import <Foundation/NSCalendarDate.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <Foundation/NSTimeZone.h>
+
+#import "UIxMailFormatter.h"
 
 static Class StrClass     = Nil;
 static Class CalDateClass = Nil;