diff --git a/kafka/protocol/new/admin/__init__.py b/kafka/protocol/new/admin/__init__.py
index c518c33ec..4ddcbdfba 100644
--- a/kafka/protocol/new/admin/__init__.py
+++ b/kafka/protocol/new/admin/__init__.py
@@ -1,34 +1,16 @@
 from .acl import *
-from .client_quotas import *
-from .cluster import *
-from .groups import *
-from .topics import *
+from .acl import __all__ as acl_all
 
-__all__ = [
-    'CreateAclsRequest', 'CreateAclsResponse',
-    'DeleteAclsRequest', 'DeleteAclsResponse',
-    'DescribeAclsRequest', 'DescribeAclsResponse',
-    'ACLResourceType', 'ACLOperation',
-    'ACLPermissionType', 'ACLResourcePatternType',
+from .client_quotas import *
+from .client_quotas import __all__ as client_quotas_all
 
-    'AlterClientQuotasRequest', 'AlterClientQuotasResponse',
-    'DescribeClientQuotasRequest', 'DescribeClientQuotasResponse',
+from .cluster import *
+from .cluster import __all__ as cluster_all
 
-    'DescribeClusterRequest', 'DescribeClusterResponse',
-    'DescribeConfigsRequest', 'DescribeConfigsResponse',
-    'AlterConfigsRequest', 'AlterConfigsResponse',
-    'DescribeLogDirsRequest', 'DescribeLogDirsResponse',
-    'ElectLeadersRequest', 'ElectLeadersResponse', 'ElectionType',
+from .groups import *
+from .groups import __all__ as groups_all
 
-    'DescribeGroupsRequest', 'DescribeGroupsResponse',
-    'ListGroupsRequest', 'ListGroupsResponse',
-    'DeleteGroupsRequest', 'DeleteGroupsResponse',
+from .topics import *
+from .topics import __all__ as topics_all
 
-    'CreateTopicsRequest', 'CreateTopicsResponse',
-    'DeleteTopicsRequest', 'DeleteTopicsResponse',
-    'CreatePartitionsRequest', 'CreatePartitionsResponse',
-    'AlterPartitionRequest', 'AlterPartitionResponse',
-    'AlterPartitionReassignmentsRequest', 'AlterPartitionReassignmentsResponse',
-    'ListPartitionReassignmentsRequest', 'ListPartitionReassignmentsResponse',
-    'DeleteRecordsRequest', 'DeleteRecordsResponse',
-]
+__all__ = acl_all + client_quotas_all + cluster_all + groups_all + topics_all
diff --git a/kafka/protocol/new/consumer/__init__.py b/kafka/protocol/new/consumer/__init__.py
index 1566e406d..6d2c2ac52 100644
--- a/kafka/protocol/new/consumer/__init__.py
+++ b/kafka/protocol/new/consumer/__init__.py
@@ -1,18 +1,13 @@
 from .fetch import *
+from .fetch import __all__ as fetch_all
+
 from .group import *
+from .group import __all__ as group_all
+
 from .metadata import *
-from .offsets import *
+from .metadata import __all__ as metadata_all
 
+from .offsets import *
+from .offsets import __all__ as offsets_all
 
-__all__ = [
-    'FetchRequest', 'FetchResponse',
-    'UNKNOWN_OFFSET', 'OffsetResetStrategy',
-    'ListOffsetsRequest', 'ListOffsetsResponse',
-    'JoinGroupRequest', 'JoinGroupResponse',
-    'SyncGroupRequest', 'SyncGroupResponse',
-    'LeaveGroupRequest', 'LeaveGroupResponse',
-    'HeartbeatRequest', 'HeartbeatResponse',
-    'OffsetFetchRequest', 'OffsetFetchResponse',
-    'OffsetCommitRequest', 'OffsetCommitResponse',
-    'ConsumerProtocolType', 'ConsumerProtocolSubscription', 'ConsumerProtocolAssignment',
-]
+__all__ = fetch_all + group_all + metadata_all + offsets_all
diff --git a/kafka/protocol/new/metadata/__init__.py b/kafka/protocol/new/metadata/__init__.py
index 23ccb798f..cb494c1b8 100644
--- a/kafka/protocol/new/metadata/__init__.py
+++ b/kafka/protocol/new/metadata/__init__.py
@@ -1,10 +1,10 @@
 from .api_versions import *
+from .api_versions import __all__ as api_versions_all
+
 from .find_coordinator import *
-from .metadata import *
+from .find_coordinator import __all__ as find_coordinator_all
 
+from .metadata import *
+from .metadata import __all__ as metadata_all
 
-__all__ = [
-    'ApiVersionsRequest', 'ApiVersionsResponse',
-    'FindCoordinatorRequest', 'FindCoordinatorResponse',
-    'MetadataRequest', 'MetadataResponse',
-]
+__all__ = api_versions_all + find_coordinator_all + metadata_all
diff --git a/kafka/protocol/new/producer/__init__.py b/kafka/protocol/new/producer/__init__.py
index 62e94637b..53d0488c0 100644
--- a/kafka/protocol/new/producer/__init__.py
+++ b/kafka/protocol/new/producer/__init__.py
@@ -1,12 +1,7 @@
 from .produce import *
-from .transaction import *
+from .produce import __all__ as produce_all
 
+from .transaction import *
+from .transaction import __all__ as transaction_all
 
-__all__ = [
-    'ProduceRequest', 'ProduceResponse',
-    'InitProducerIdRequest', 'InitProducerIdResponse',
-    'AddPartitionsToTxnRequest', 'AddPartitionsToTxnResponse',
-    'AddOffsetsToTxnRequest', 'AddOffsetsToTxnResponse',
-    'EndTxnRequest', 'EndTxnResponse',
-    'TxnOffsetCommitRequest', 'TxnOffsetCommitResponse',
-]
+__all__ = produce_all + transaction_all
diff --git a/kafka/protocol/new/schemas/__init__.py b/kafka/protocol/new/schemas/__init__.py
index 77425040c..5bea9985c 100644
--- a/kafka/protocol/new/schemas/__init__.py
+++ b/kafka/protocol/new/schemas/__init__.py
@@ -1,9 +1,7 @@
 from .fields import *
+from .fields import __all__ as fields_all
+
 from .load_json import load_json
 
 
-__all__ = [
-    "BaseField", "SimpleField", "StructField",
-    "ArrayField", "StructArrayField",
-    "load_json",
-]
+__all__ = fields_all + ['load_json']