diff --git a/include/arch/arm/arch/object/structures.bf b/include/arch/arm/arch/object/structures.bf
index d85bcd88d..d19cc7e78 100644
--- a/include/arch/arm/arch/object/structures.bf
+++ b/include/arch/arm/arch/object/structures.bf
@@ -18,18 +18,6 @@ base 32
 
 ---- Arch-independent caps
 
-block endpoint_cap(capEPBadge, capCanGrant, capCanSend, capCanReceive,
-                   capEPPtr, capType) {
-    field_high capEPPtr 28
-    padding 1
-    field capCanGrant 1
-    field capCanReceive 1
-    field capCanSend 1
-
-    field capEPBadge 28
-    field capType 4
-}
-
 block async_endpoint_cap {
     field capAEPBadge 28
     padding 2
diff --git a/include/arch/ia32/arch/object/structures.bf b/include/arch/ia32/arch/object/structures.bf
index 62e831d24..4bf5d8302 100644
--- a/include/arch/ia32/arch/object/structures.bf
+++ b/include/arch/ia32/arch/object/structures.bf
@@ -20,16 +20,6 @@ base 32
 
 ---- Arch-independent caps
 
-block endpoint_cap {
-    field capEPBadge 29
-    field capCanGrant 1
-    field capCanSend 1
-    field capCanReceive 1
-
-    field_high capEPPtr 28
-    field capType 4
-}
-
 block async_endpoint_cap {
     field capAEPBadge 29
     padding 1
diff --git a/include/object/structures.bf b/include/object/structures.bf
index 7f001a491..40acb01ea 100644
--- a/include/object/structures.bf
+++ b/include/object/structures.bf
@@ -26,6 +26,18 @@ block untyped_cap {
     field capType     4
 }
 
+block endpoint_cap(capEPBadge, capCanGrant, capCanSend, capCanReceive,
+                   capEPPtr, capType) {
+    field_high capEPPtr 28
+    padding 1
+    field capCanGrant 1
+    field capCanReceive 1
+    field capCanSend 1
+
+    field capEPBadge 28
+    field capType 4
+}
+
 block thread_cap {
     padding              32