diff --git a/src/Modules.amd64 b/src/Modules.amd64
index 94c4de5d..bb650c63 100644
--- a/src/Modules.amd64
+++ b/src/Modules.amd64
@@ -47,14 +47,10 @@ PRIVATE_INCDIR		+= types/$(CONFIG_XARCH) types
 #
 # ABI Subsystem
 #
-ABI			:= libabi.a
-VPATH			+= abi/$(CONFIG_XARCH) abi
-INTERFACES_ABI		:= l4_fpage l4_msg_item l4_buf_desc kip l4_types \
-			   l4_error virt
-
-kip_IMPL		:= kip kip-debug kip-amd64 kip-amd64-debug
-l4_types_IMPL		:= l4_types l4_types-debug
-virt_IMPL		:= virt-ia32-amd64
+INTERFACES_ABI		+= virt
+
+kip_IMPL		+= kip-amd64-debug
+virt_IMPL		+= virt-ia32-amd64
 
 #
 # JABI Subsystem
diff --git a/src/Modules.arm b/src/Modules.arm
index d6858896..d1fdce30 100644
--- a/src/Modules.arm
+++ b/src/Modules.arm
@@ -123,23 +123,6 @@ JABI			:= libjabi.a
 VPATH			+= jabi/$(CONFIG_XARCH)/$(BITS) jabi/$(CONFIG_XARCH) jabi
 INTERFACES_JABI		:= jdb_ktrace jdb_obj_info
 
-#
-# ABI Subsystem
-#
-
-ABI 		:= libabi.a
-VPATH 		+= abi/$(CONFIG_XARCH)/$(BITS) abi/$(CONFIG_XARCH) abi
-
-INTERFACES_ABI 	:= kip l4_types l4_fpage l4_msg_item \
-                   l4_buf_desc l4_error
-
-l4_types_IMPL 	:= l4_types l4_types-debug
-
-
-# x0!=32Bit UIDs
-kip_IMPL	:= kip kip-debug kip-arm
-
-
 #
 # KERNEL subsystem
 #
diff --git a/src/Modules.generic b/src/Modules.generic
index fa101f39..e4cf3710 100644
--- a/src/Modules.generic
+++ b/src/Modules.generic
@@ -4,6 +4,18 @@
 # Include for unit tests, enable by including UTEST in SUBSYSTEMS.
 include $(srcdir)/test/utest/Modules.utest
 
+#
+# ABI Subsystem
+#
+ABI		:= libabi.a
+VPATH 		+= abi/$(CONFIG_XARCH)/$(BITS) abi/$(CONFIG_XARCH) abi
+INTERFACES_ABI 	:= kip l4_types l4_fpage l4_msg_item l4_buf_desc l4_error
+
+l4_types_IMPL 	:= l4_types l4_types-debug
+kip_IMPL	:= kip kip-debug kip-$(CONFIG_XARCH)
+
+
+
 PREPROCESS_PARTS-$(CONFIG_JDB_LOGGING)       += jdb_logging
 
 INTERFACES_KERNEL	:= cpu_mask rcupdate kobject_mapdb context_base pm \
diff --git a/src/Modules.ia32 b/src/Modules.ia32
index e5d9f2b0..fc23d2d9 100644
--- a/src/Modules.ia32
+++ b/src/Modules.ia32
@@ -40,13 +40,9 @@ PRIVATE_INCDIR		+= types/$(CONFIG_XARCH) types
 #
 # ABI Subsystem
 #
-ABI			:= libabi.a
-VPATH			+= abi/$(CONFIG_XARCH) abi
-INTERFACES_ABI		:= l4_fpage l4_msg_item l4_buf_desc kip l4_types \
-			   l4_error virt
+INTERFACES_ABI		+= virt
 
-kip_IMPL		:= kip kip-debug kip-ia32 kip-ia32-debug
-l4_types_IMPL		:= l4_types l4_types-debug
+kip_IMPL		+= kip-ia32-debug
 virt_IMPL		:= virt-ia32-amd64
 
 #
diff --git a/src/Modules.mips b/src/Modules.mips
index f9eced71..3812273d 100644
--- a/src/Modules.mips
+++ b/src/Modules.mips
@@ -95,12 +95,7 @@ INTERFACES_JABI	:= jdb_ktrace jdb_obj_info
 #
 # ABI Subsystem
 #
-ABI 		:= libabi.a
-VPATH 		+= abi/mips/$(BITS) abi/mips abi
-INTERFACES_ABI 	:= kip l4_types l4_fpage l4_msg_item l4_buf_desc l4_error
-
-kip_IMPL	:= kip kip-debug kip-mips
-l4_types_IMPL	:= l4_types l4_types-mips l4_types-debug
+l4_types_IMPL	+= l4_types-mips
 
 #
 # KERNEL subsystem
diff --git a/src/Modules.ppc32 b/src/Modules.ppc32
index 7e8d860a..d343d2be 100644
--- a/src/Modules.ppc32
+++ b/src/Modules.ppc32
@@ -85,17 +85,6 @@ JABI		:= libjabi.a
 VPATH		+= jabi/$(CONFIG_XARCH) jabi
 INTERFACES_JABI	:= jdb_ktrace jdb_obj_info
 
-
-#
-# ABI Subsystem
-#
-ABI 		:= libabi.a
-VPATH 		+= abi/$(CONFIG_XARCH) abi
-INTERFACES_ABI 	:= kip l4_types l4_fpage l4_msg_item l4_buf_desc l4_error
-
-kip_IMPL	:= kip kip-debug kip-ppc32
-l4_types_IMPL	:= l4_types l4_types-debug
-
 #
 # KERNEL subsystem
 #
diff --git a/src/Modules.riscv b/src/Modules.riscv
index fe14afba..5fffa495 100644
--- a/src/Modules.riscv
+++ b/src/Modules.riscv
@@ -90,12 +90,7 @@ INTERFACES_JABI := jdb_ktrace jdb_obj_info
 #
 # ABI Subsystem
 #
-ABI             := libabi.a
-VPATH           += abi/$(CONFIG_XARCH)/$(BITS) abi/$(CONFIG_XARCH) abi
-INTERFACES_ABI  := kip l4_types l4_fpage l4_msg_item l4_buf_desc l4_error
-
-kip_IMPL        := kip kip-debug kip-riscv
-l4_types_IMPL   := l4_types l4_types-debug l4_types-riscv
+l4_types_IMPL   += l4_types-riscv
 
 #
 # KERNEL subsystem
diff --git a/src/Modules.sparc b/src/Modules.sparc
index 5a5da4ad..d2758994 100644
--- a/src/Modules.sparc
+++ b/src/Modules.sparc
@@ -88,17 +88,6 @@ JABI		:= libjabi.a
 VPATH		+= jabi/$(CONFIG_XARCH) jabi
 INTERFACES_JABI	:= jdb_ktrace jdb_obj_info
 
-
-#
-# ABI Subsystem
-#
-ABI 		:= libabi.a
-VPATH 		+= abi/$(CONFIG_XARCH) abi
-INTERFACES_ABI 	:= kip l4_types l4_fpage l4_msg_item l4_buf_desc l4_error
-
-kip_IMPL	:= kip kip-debug kip-sparc
-l4_types_IMPL	:= l4_types l4_types-debug
-
 #
 # KERNEL subsystem
 #