diff --git a/tools/autogenerate-config-flagmappings/ceilometer.headers b/tools/autogenerate-config-flagmappings/ceilometer.headers
index 519407a7b3..24a810d4c5 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.headers
+++ b/tools/autogenerate-config-flagmappings/ceilometer.headers
@@ -3,5 +3,4 @@ collector collector
 events events
 exchange exchange
 inspector inspector
-ipmi IPMI
 service_types service types
diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers
index 0fdd523b9e..dfa0422a38 100644
--- a/tools/autogenerate-config-flagmappings/cinder.headers
+++ b/tools/autogenerate-config-flagmappings/cinder.headers
@@ -18,7 +18,6 @@ hpmsa HP MSA Fiber Channel driver
 huawei Huawei storage driver
 ibmnas IBM NAS volume driver
 images images
-keymgr key manager
 lvm LVM
 nas NAS
 netapp_7mode_iscsi NetApp 7-Mode iSCSI driver
diff --git a/tools/autogenerate-config-flagmappings/glance.headers b/tools/autogenerate-config-flagmappings/glance.headers
index 36151f573c..d20498ee5a 100644
--- a/tools/autogenerate-config-flagmappings/glance.headers
+++ b/tools/autogenerate-config-flagmappings/glance.headers
@@ -2,8 +2,6 @@ filesystem filesystem
 gridfs GridFS
 imagecache flagmappings
 matchmaker matchmaker
-profiler profiler
 rbd RBD
 registry registry
-s3 S3
 sheepdog Sheepdog
diff --git a/tools/autogenerate-config-flagmappings/ironic.headers b/tools/autogenerate-config-flagmappings/ironic.headers
index 7cd915bdf5..7e6e666b5f 100644
--- a/tools/autogenerate-config-flagmappings/ironic.headers
+++ b/tools/autogenerate-config-flagmappings/ironic.headers
@@ -1,11 +1,6 @@
-agent agent
-conductor conductor
-console console
 dhcp DHCP
 disk_partitioner disk partitioner
 ilo ILO
-ipmi IPMI
-neutron neutron
 seamicro SeaMicro
 snmp SNMP
 ssh SSH
diff --git a/tools/autogenerate-config-flagmappings/keystone.headers b/tools/autogenerate-config-flagmappings/keystone.headers
index 2ea8820d4e..c16b6fff3c 100644
--- a/tools/autogenerate-config-flagmappings/keystone.headers
+++ b/tools/autogenerate-config-flagmappings/keystone.headers
@@ -2,11 +2,9 @@ assignment assignment
 cache cache
 catalog catalog
 credential credential
-ec2 EC2
 federation federation
 identity identity
 kvs KVS
-ldap LDAP
 mapping mapping
 memcache memcache
 oauth OAuth
diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers
index 3ea54cb989..1252920bd9 100644
--- a/tools/autogenerate-config-flagmappings/neutron.headers
+++ b/tools/autogenerate-config-flagmappings/neutron.headers
@@ -1,4 +1,3 @@
-agent agent
 bigswitch BigSwitch
 brocade Brocade
 cfg_agent cfg agent
diff --git a/tools/autogenerate-config-flagmappings/nova.headers b/tools/autogenerate-config-flagmappings/nova.headers
index 7c6f631a94..b9d3b95cb8 100644
--- a/tools/autogenerate-config-flagmappings/nova.headers
+++ b/tools/autogenerate-config-flagmappings/nova.headers
@@ -2,29 +2,20 @@ apiv3 API v3
 authentication authentication
 availabilityzones availability zones
 baremetal baremetal
-ca CA
 cells cell
-conductor conductor
 configdrive config drive
-console console
-ec2 EC2
 ephemeral_storage_encryption ephemeral storage encryption
 fping fping
 hyperv HyperV
 hypervisor hypervisor
 ironic bare metal
 ipv6 IPv6
-keymgr key manager
-ldap LDAP
 libvirt Libvirt
 livemigration live migration
-network network
-neutron neutron
 pci PCI
 periodic periodic
 rdp RDP
 rpc_all all RPC
-s3 S3
 serial_console serial console
 spice SPICE
 tilera Tilera
diff --git a/tools/autogenerate-config-flagmappings/shared.headers b/tools/autogenerate-config-flagmappings/shared.headers
index 00095ca607..acc2a39e70 100644
--- a/tools/autogenerate-config-flagmappings/shared.headers
+++ b/tools/autogenerate-config-flagmappings/shared.headers
@@ -1,3 +1,4 @@
+agent agent
 amqp AMQP
 api API
 auth authorization
@@ -7,11 +8,19 @@ cinder cinder
 clients clients
 common common
 compute Compute
+conductor conductor
+console console
 database database
 debug logging
+ec2 EC2
 glance glance
+ipmi IPMI
+keymgr key manager
+ldap LDAP
 logging logging
 metadata metadata
+network network
+neutron neutron
 notification notification
 policy policy
 profiler profiler
@@ -20,6 +29,7 @@ quota quota
 rabbitmq RabbitMQ
 redis Redis
 rpc RPC
+s3 S3
 scheduler scheduler
 swift swift
 testing testing
@@ -27,5 +37,5 @@ tripleo TripleO
 vmware VMware
 vpn VPN
 wsgi WSGI
-zeromq ZeroMQ
 xenapi XenAPI
+zeromq ZeroMQ
diff --git a/tools/autogenerate-config-flagmappings/trove.headers b/tools/autogenerate-config-flagmappings/trove.headers
index 8671a96e78..e91b3d6ce3 100644
--- a/tools/autogenerate-config-flagmappings/trove.headers
+++ b/tools/autogenerate-config-flagmappings/trove.headers
@@ -10,7 +10,6 @@ db_redis Redis database
 dns DNS
 guestagent guest agent
 heat Orchestration module
-network network
 nova nova
 taskmanager taskmanager
 volume volume