diff --git a/UI/Common/UIxAppNavView.m b/UI/Common/UIxAppNavView.m
index b30a5b649..2c35b6d8a 100644
--- a/UI/Common/UIxAppNavView.m
+++ b/UI/Common/UIxAppNavView.m
@@ -20,43 +20,41 @@
 */
 // $Id: UIxAppNavView.m 281 2004-08-27 03:51:08Z helge $
 
-#include <SOGoUI/UIxComponent.h>
+#import <NGObjWeb/SoObject+SoDAV.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxAppNavView : UIxComponent
 {
-    id element;
-    id lastElement;
+  id element;
+  id lastElement;
 }
 
 @end
 
-#include <NGObjWeb/NGObjWeb.h>
-#include <NGObjWeb/SoObject+SoDAV.h>
-#include <NGObjWeb/WOContext+SoObjects.h>
-#include "common.h"
-
 @implementation UIxAppNavView
 
 - (void)dealloc {
-  [self->element     release];
-  [self->lastElement release];
+  [element     release];
+  [lastElement release];
   [super dealloc];
 }
 
 /* accessors */
 
 - (void)setElement:(id)_element {
-  ASSIGN(self->element, _element);
+  ASSIGN(element, _element);
 }
 - (id)element {
-  return self->element;
+  return element;
 }
 
 - (void)setLastElement:(id)_element {
-  ASSIGN(self->lastElement, _element);
+  ASSIGN(lastElement, _element);
 }
 - (id)lastElement {
-  return self->lastElement;
+  return lastElement;
 }
 
 /* navigation */
diff --git a/UI/Common/UIxPrintPageFrame.m b/UI/Common/UIxPrintPageFrame.m
index d1aaf0e40..48bb2da7b 100644
--- a/UI/Common/UIxPrintPageFrame.m
+++ b/UI/Common/UIxPrintPageFrame.m
@@ -19,31 +19,35 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/SoComponent.h>
+#import <NGObjWeb/SoComponent.h>
+
+@class NSString;
 
 @interface UIxPrintPageFrame : SoComponent
 {
-    NSString *title;
+  NSString *title;
 }
 
 @end
 
-#include "common.h"
-
 @implementation UIxPrintPageFrame
 
-- (void)dealloc {
-  [self->title release];
+- (void) dealloc
+{
+  [title release];
   [super dealloc];
 }
 
 /* accessors */
 
-- (void)setTitle:(NSString *)_value {
-  ASSIGNCOPY(self->title, _value);
+- (void)setTitle: (NSString *) _value
+{
+  ASSIGNCOPY (title, _value);
 }
-- (NSString *)title {
-  return self->title;
+
+- (NSString *) title
+{
+  return title;
 }
 
 @end /* UIxPrintPageFrame */
diff --git a/UI/Common/common.h b/UI/Common/common.h
index 803270d7a..9c2549483 100644
--- a/UI/Common/common.h
+++ b/UI/Common/common.h
@@ -18,22 +18,14 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: common.h,v 1.1 2003/11/24 01:24:40 helge Exp $
 
-#import <Foundation/Foundation.h>
-
-#warning importing common.h is baaad
-
-#if LIB_FOUNDATION_LIBRARY
-#  include <Foundation/exceptions/GeneralExceptions.h>
-#elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  include <NGExtensions/NGObjectMacros.h>
-#  include <NGExtensions/NSString+Ext.h>
-#endif
-
-#include <NGExtensions/NGExtensions.h>
-#include <NGObjWeb/NGObjWeb.h>
-#include <NGObjWeb/SoObjects.h>
+#import <NGObjWeb/WOAssociation.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WODynamicElement.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResourceManager.h>
+#import <NGObjWeb/WOSession.h>
+#import <NGExtensions/NSObject+Logs.h>
 
 @interface WOContext(WOExtensionsPrivate)
 - (void)addActiveFormElement:(WOElement *)_element;