diff --git a/UI/MailPartViewers/MailPartViewersProduct.m b/UI/MailPartViewers/MailPartViewersProduct.m
index 7cc5d1768..ac836649d 100644
--- a/UI/MailPartViewers/MailPartViewersProduct.m
+++ b/UI/MailPartViewers/MailPartViewersProduct.m
@@ -22,12 +22,7 @@
 #import <Foundation/NSObject.h>
 
 @interface MailPartViewersProduct : NSObject
-{
-}
-
 @end
 
-#include "common.h"
-
 @implementation MailPartViewersProduct
 @end /* MailPartViewersProduct */
diff --git a/UI/MailPartViewers/UIxMailPartTextViewer.m b/UI/MailPartViewers/UIxMailPartTextViewer.m
index e6d7e66a2..450c14217 100644
--- a/UI/MailPartViewers/UIxMailPartTextViewer.m
+++ b/UI/MailPartViewers/UIxMailPartTextViewer.m
@@ -28,9 +28,9 @@
   TODO: add contained link detection.
 */
 
-#import <SoObjects/SOGo/NSString+Utilities.h>
+#import <NGExtensions/NSString+misc.h>
 
-#import "common.h"
+#import <SoObjects/SOGo/NSString+Utilities.h>
 
 #import "UIxMailPartTextViewer.h"
 
diff --git a/UI/MailPartViewers/UIxMailSizeFormatter.m b/UI/MailPartViewers/UIxMailSizeFormatter.m
index 002de6f7a..c4fdbe09e 100644
--- a/UI/MailPartViewers/UIxMailSizeFormatter.m
+++ b/UI/MailPartViewers/UIxMailSizeFormatter.m
@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "UIxMailSizeFormatter.h"
-#include "common.h"
+#import <Foundation/NSValue.h>
+
+#import "UIxMailSizeFormatter.h"
 
 @implementation UIxMailSizeFormatter