Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2)
+++ kernel/generic/include/mm/as.h	(revision d2c1fd53579d1a567dfae1eae22cce29947a9f5f)
@@ -54,8 +54,4 @@
 #include <lib/elf.h>
 
-#ifdef __OBJC__
-#include <lib/objc.h>
-#endif
-
 /**
  * Defined to be true if user address space and kernel address space shadow each
@@ -85,45 +81,4 @@
 #define AS_PF_DEFER		2
 
-#ifdef __OBJC__
-@interface as_t : base_t {
-	@public
-		/** Protected by asidlock. */
-		link_t inactive_as_with_asid_link;
-		/**
-		 * Number of processors on wich is this address space active.
-		 * Protected by asidlock.
-		 */
-		count_t cpu_refcount;
-		/**
-		 * Address space identifier.
-		 * Constant on architectures that do not support ASIDs.
-		 * Protected by asidlock.  
-		 */
-		asid_t asid;
-		
-		/** Number of references (i.e tasks that reference this as). */
-		atomic_t refcount;
-
-		mutex_t lock;
-		
-		/** B+tree of address space areas. */
-		btree_t as_area_btree;
-		
-		/** Non-generic content. */
-		as_genarch_t genarch;
-		
-		/** Architecture specific content. */
-		as_arch_t arch;
-}
-
-+ (pte_t *) page_table_create: (int) flags;
-+ (void) page_table_destroy: (pte_t *) page_table;
-- (void) page_table_lock: (bool) _lock;
-- (void) page_table_unlock: (bool) unlock;
-
-@end
-
-#else
-
 /** Address space structure.
  *
@@ -169,5 +124,4 @@
 	void (* page_table_unlock)(as_t *as, bool unlock);
 } as_operations_t;
-#endif
 
 /**
@@ -250,8 +204,5 @@
 extern as_t *AS_KERNEL;
 
-#ifndef __OBJC__
 extern as_operations_t *as_operations;
-#endif
-
 extern link_t inactive_as_with_asid_head;