diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp
index f64028c..4163879 100644
--- a/automotive/vehicle/2.0/Android.bp
+++ b/automotive/vehicle/2.0/Android.bp
@@ -14,61 +14,6 @@
     interfaces: [
         "android.hidl.base@1.0",
     ],
-    types: [
-        "DiagnosticFloatSensorIndex",
-        "DiagnosticIntegerSensorIndex",
-        "EvConnectorType",
-        "FuelType",
-        "Obd2CommonIgnitionMonitors",
-        "Obd2CompressionIgnitionMonitors",
-        "Obd2FuelSystemStatus",
-        "Obd2FuelType",
-        "Obd2IgnitionMonitorKind",
-        "Obd2SecondaryAirStatus",
-        "Obd2SparkIgnitionMonitors",
-        "PortLocationType",
-        "StatusCode",
-        "SubscribeFlags",
-        "SubscribeOptions",
-        "VehicleApPowerStateConfigFlag",
-        "VehicleApPowerStateReport",
-        "VehicleApPowerStateReq",
-        "VehicleApPowerStateReqIndex",
-        "VehicleApPowerStateShutdownParam",
-        "VehicleArea",
-        "VehicleAreaConfig",
-        "VehicleAreaDoor",
-        "VehicleAreaMirror",
-        "VehicleAreaSeat",
-        "VehicleAreaWheel",
-        "VehicleAreaWindow",
-        "VehicleDisplay",
-        "VehicleGear",
-        "VehicleHvacFanDirection",
-        "VehicleHwKeyInputAction",
-        "VehicleIgnitionState",
-        "VehicleLightState",
-        "VehicleLightSwitch",
-        "VehicleOilLevel",
-        "VehiclePropConfig",
-        "VehiclePropValue",
-        "VehicleProperty",
-        "VehiclePropertyAccess",
-        "VehiclePropertyChangeMode",
-        "VehiclePropertyGroup",
-        "VehiclePropertyStatus",
-        "VehiclePropertyType",
-        "VehicleTurnSignal",
-        "VehicleUnit",
-        "VmsAvailabilityStateIntegerValuesIndex",
-        "VmsBaseMessageIntegerValuesIndex",
-        "VmsMessageType",
-        "VmsMessageWithLayerAndPublisherIdIntegerValuesIndex",
-        "VmsMessageWithLayerIntegerValuesIndex",
-        "VmsOfferingMessageIntegerValuesIndex",
-        "VmsPublisherInformationIntegerValuesIndex",
-        "VmsSubscriptionsStateIntegerValuesIndex",
-    ],
     gen_java: true,
 }
 
diff --git a/biometrics/face/1.0/Android.bp b/biometrics/face/1.0/Android.bp
index 0f8c6e6..222a09e 100644
--- a/biometrics/face/1.0/Android.bp
+++ b/biometrics/face/1.0/Android.bp
@@ -14,15 +14,6 @@
     interfaces: [
         "android.hidl.base@1.0",
     ],
-    types: [
-        "FaceAcquiredInfo",
-        "FaceError",
-        "Feature",
-        "OptionalBool",
-        "OptionalUint64",
-        "Status",
-        "UserHandle",
-    ],
     gen_java: true,
 }
 
diff --git a/camera/device/3.5/Android.bp b/camera/device/3.5/Android.bp
index 6d18367..d51fd0e 100644
--- a/camera/device/3.5/Android.bp
+++ b/camera/device/3.5/Android.bp
@@ -20,16 +20,6 @@
         "android.hardware.graphics.common@1.0",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "BufferRequest",
-        "BufferRequestStatus",
-        "CameraBlob",
-        "CameraBlobId",
-        "StreamBufferRequestError",
-        "StreamBufferRet",
-        "StreamBuffersVal",
-        "StreamConfiguration",
-    ],
     gen_java: false,
 }
 
diff --git a/camera/metadata/3.4/Android.bp b/camera/metadata/3.4/Android.bp
index d1cba14..2b75eba 100644
--- a/camera/metadata/3.4/Android.bp
+++ b/camera/metadata/3.4/Android.bp
@@ -13,19 +13,6 @@
         "android.hardware.camera.metadata@3.2",
         "android.hardware.camera.metadata@3.3",
     ],
-    types: [
-        "CameraMetadataEnumAndroidDepthAvailableDynamicDepthStreamConfigurations",
-        "CameraMetadataEnumAndroidHeicAvailableHeicStreamConfigurations",
-        "CameraMetadataEnumAndroidHeicInfoSupported",
-        "CameraMetadataEnumAndroidInfoSupportedBufferManagementVersion",
-        "CameraMetadataEnumAndroidRequestAvailableCapabilities",
-        "CameraMetadataEnumAndroidScalerAvailableFormats",
-        "CameraMetadataEnumAndroidScalerAvailableRecommendedStreamConfigurations",
-        "CameraMetadataEnumAndroidSensorInfoColorFilterArrangement",
-        "CameraMetadataSection",
-        "CameraMetadataSectionStart",
-        "CameraMetadataTag",
-    ],
     gen_java: true,
 }
 
diff --git a/camera/provider/2.5/Android.bp b/camera/provider/2.5/Android.bp
index 3de010a..a4af07e 100644
--- a/camera/provider/2.5/Android.bp
+++ b/camera/provider/2.5/Android.bp
@@ -17,9 +17,6 @@
         "android.hardware.camera.provider@2.4",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "DeviceState",
-    ],
     gen_java: false,
 }
 
diff --git a/drm/1.2/Android.bp b/drm/1.2/Android.bp
index 4e0e8ba..2d54302 100644
--- a/drm/1.2/Android.bp
+++ b/drm/1.2/Android.bp
@@ -19,11 +19,6 @@
         "android.hardware.drm@1.1",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "HdcpLevel",
-        "OfflineLicenseState",
-        "Status",
-    ],
     gen_java: false,
 }
 
diff --git a/gnss/2.0/Android.bp b/gnss/2.0/Android.bp
index 230dd90..c01ec55 100644
--- a/gnss/2.0/Android.bp
+++ b/gnss/2.0/Android.bp
@@ -24,11 +24,6 @@
         "android.hardware.gnss@1.1",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "ElapsedRealtime",
-        "ElapsedRealtimeFlags",
-        "GnssLocation",
-    ],
     gen_java: true,
     gen_java_constants: true,
 }
diff --git a/gnss/measurement_corrections/1.0/Android.bp b/gnss/measurement_corrections/1.0/Android.bp
index 237b008..4aac7e0 100644
--- a/gnss/measurement_corrections/1.0/Android.bp
+++ b/gnss/measurement_corrections/1.0/Android.bp
@@ -14,12 +14,6 @@
         "android.hardware.gnss@1.0",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "GnssSingleSatCorrectionFlags",
-        "MeasurementCorrections",
-        "ReflectingPlane",
-        "SingleSatCorrection",
-    ],
     gen_java: true,
 }
 
diff --git a/graphics/bufferqueue/2.0/Android.bp b/graphics/bufferqueue/2.0/Android.bp
index 5385f28..97c05fa 100644
--- a/graphics/bufferqueue/2.0/Android.bp
+++ b/graphics/bufferqueue/2.0/Android.bp
@@ -17,11 +17,6 @@
         "android.hardware.graphics.common@1.2",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "ConnectionType",
-        "SlotIndex",
-        "Status",
-    ],
     gen_java: true,
 }
 
diff --git a/graphics/common/1.2/Android.bp b/graphics/common/1.2/Android.bp
index b6cd865..088bc37 100644
--- a/graphics/common/1.2/Android.bp
+++ b/graphics/common/1.2/Android.bp
@@ -14,14 +14,6 @@
         "android.hardware.graphics.common@1.0",
         "android.hardware.graphics.common@1.1",
     ],
-    types: [
-        "BufferUsage",
-        "ColorMode",
-        "Dataspace",
-        "HardwareBuffer",
-        "Hdr",
-        "PixelFormat",
-    ],
     gen_java: true,
     gen_java_constants: true,
 }
diff --git a/graphics/mapper/3.0/Android.bp b/graphics/mapper/3.0/Android.bp
index b2f0aa6..e348296 100644
--- a/graphics/mapper/3.0/Android.bp
+++ b/graphics/mapper/3.0/Android.bp
@@ -17,10 +17,6 @@
         "android.hardware.graphics.common@1.2",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "Error",
-        "YCbCrLayout",
-    ],
     gen_java: false,
 }
 
diff --git a/input/common/1.0/Android.bp b/input/common/1.0/Android.bp
index 3de18b4..07b38cf 100644
--- a/input/common/1.0/Android.bp
+++ b/input/common/1.0/Android.bp
@@ -9,23 +9,6 @@
     srcs: [
         "types.hal",
     ],
-    types: [
-        "Action",
-        "Axis",
-        "Button",
-        "Classification",
-        "EdgeFlag",
-        "Flag",
-        "Meta",
-        "MotionEvent",
-        "PointerCoords",
-        "PointerProperties",
-        "PolicyFlag",
-        "Source",
-        "SourceClass",
-        "ToolType",
-        "VideoFrame",
-    ],
     gen_java: true,
 }
 
diff --git a/media/bufferpool/2.0/Android.bp b/media/bufferpool/2.0/Android.bp
index 1f8bbdb..0faa00e 100644
--- a/media/bufferpool/2.0/Android.bp
+++ b/media/bufferpool/2.0/Android.bp
@@ -16,13 +16,6 @@
     interfaces: [
         "android.hidl.base@1.0",
     ],
-    types: [
-        "Buffer",
-        "BufferInvalidationMessage",
-        "BufferStatus",
-        "BufferStatusMessage",
-        "ResultStatus",
-    ],
     gen_java: false,
 }
 
diff --git a/media/c2/1.0/Android.bp b/media/c2/1.0/Android.bp
index 56c78b2..6c836af 100644
--- a/media/c2/1.0/Android.bp
+++ b/media/c2/1.0/Android.bp
@@ -25,28 +25,6 @@
         "android.hardware.media@1.0",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "BaseBlock",
-        "Block",
-        "Buffer",
-        "FieldDescriptor",
-        "FieldId",
-        "FieldSupportedValues",
-        "FieldSupportedValuesQuery",
-        "FieldSupportedValuesQueryResult",
-        "FrameData",
-        "InfoBuffer",
-        "ParamDescriptor",
-        "ParamField",
-        "ParamFieldValues",
-        "SettingResult",
-        "Status",
-        "StructDescriptor",
-        "Work",
-        "WorkBundle",
-        "WorkOrdinal",
-        "Worklet",
-    ],
     gen_java: false,
 }
 
diff --git a/sensors/2.0/Android.bp b/sensors/2.0/Android.bp
index 57d45ff..eead1d3 100644
--- a/sensors/2.0/Android.bp
+++ b/sensors/2.0/Android.bp
@@ -15,11 +15,6 @@
         "android.hardware.sensors@1.0",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "EventQueueFlagBits",
-        "SensorTimeout",
-        "WakeLockQueueFlagBits",
-    ],
     gen_java: false,
 }
 
diff --git a/thermal/2.0/Android.bp b/thermal/2.0/Android.bp
index c513739..af23ee3 100644
--- a/thermal/2.0/Android.bp
+++ b/thermal/2.0/Android.bp
@@ -15,14 +15,6 @@
         "android.hardware.thermal@1.0",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "CoolingDevice",
-        "CoolingType",
-        "Temperature",
-        "TemperatureThreshold",
-        "TemperatureType",
-        "ThrottlingSeverity",
-    ],
     gen_java: true,
 }
 
diff --git a/tv/cec/2.0/Android.bp b/tv/cec/2.0/Android.bp
index 998cb23..5a67fa5 100644
--- a/tv/cec/2.0/Android.bp
+++ b/tv/cec/2.0/Android.bp
@@ -15,32 +15,6 @@
         "android.hidl.base@1.0",
         "android.hidl.safe_union@1.0",
     ],
-    types: [
-        "AbortReason",
-        "CecAllDeviceTypeValue",
-        "CecDeviceFeature",
-        "CecDeviceInfo",
-        "CecDeviceType",
-        "CecLogicalAddress",
-        "CecMessage",
-        "CecMessageType",
-        "CecPowerState",
-        "CecRcProfile",
-        "CecRcProfile1",
-        "CecRcProfileId",
-        "CecRcProfileSource",
-        "CecTopologyEvent",
-        "CecTopologyEventType",
-        "CecUICommandCodes",
-        "CecVersion",
-        "HdmiPortInfo",
-        "HdmiPortType",
-        "HotplugEvent",
-        "MaxLength",
-        "OptionKey",
-        "Result",
-        "SendMessageResult",
-    ],
     gen_java: true,
 }
 
diff --git a/usb/1.2/Android.bp b/usb/1.2/Android.bp
index 55ffad0..5206754 100644
--- a/usb/1.2/Android.bp
+++ b/usb/1.2/Android.bp
@@ -16,13 +16,6 @@
         "android.hardware.usb@1.1",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "ContaminantDetectionStatus",
-        "ContaminantProtectionMode",
-        "ContaminantProtectionStatus",
-        "PortStatus",
-        "Status",
-    ],
     gen_java: true,
     gen_java_constants: true,
 }
diff --git a/wifi/1.3/Android.bp b/wifi/1.3/Android.bp
index 8af1dc4..401c7a6 100644
--- a/wifi/1.3/Android.bp
+++ b/wifi/1.3/Android.bp
@@ -18,11 +18,6 @@
         "android.hardware.wifi@1.2",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "StaLinkLayerRadioStats",
-        "StaLinkLayerStats",
-        "WifiChannelStats",
-    ],
     gen_java: true,
 }
 
diff --git a/wifi/supplicant/1.2/Android.bp b/wifi/supplicant/1.2/Android.bp
index a0fc2b1..c685022 100644
--- a/wifi/supplicant/1.2/Android.bp
+++ b/wifi/supplicant/1.2/Android.bp
@@ -19,12 +19,6 @@
         "android.hardware.wifi.supplicant@1.1",
         "android.hidl.base@1.0",
     ],
-    types: [
-        "DppAkm",
-        "DppFailureCode",
-        "DppNetRole",
-        "DppProgressCode",
-    ],
     gen_java: true,
 }