diff --git a/Makefile.am b/Makefile.am
index c02490d936..665a0c5ae2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1132,12 +1132,7 @@ src_libNetworkManagerBase_la_LIBADD = \
 
 src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
 
-src_libNetworkManager_la_SOURCES_enum = \
-	src/nm-types.h \
-	$(NULL)
-
 src_libNetworkManager_la_SOURCES = \
-	$(src_libNetworkManager_la_SOURCES_enum) \
 	\
 	src/nm-checkpoint-manager.c \
 	src/nm-checkpoint-manager.h \
@@ -1303,8 +1298,6 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-dhcp6-config.h \
 	src/nm-dispatcher.c \
 	src/nm-dispatcher.h \
-	src/nm-src-enum-types.c \
-	src/nm-src-enum-types.h \
 	src/nm-exported-object.c \
 	src/nm-exported-object.h \
 	src/nm-firewall-manager.c \
@@ -1335,6 +1328,7 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-session-monitor.c \
 	src/nm-sleep-monitor.c \
 	src/nm-sleep-monitor.h \
+	src/nm-types.h \
 	src/NetworkManagerUtils.c \
 	src/NetworkManagerUtils.h \
 	$(NULL)
@@ -1447,8 +1441,6 @@ src_nm_iface_helper_SOURCES = \
 	src/nm-ip6-config.c \
 	src/nm-ip6-config.h \
 	\
-	src/nm-src-enum-types.c \
-	src/nm-src-enum-types.h \
 	src/nm-multi-index.c \
 	src/nm-multi-index.h \
 	src/NetworkManagerUtils.c \
@@ -1481,15 +1473,6 @@ src_nm_iface_helper_LDFLAGS = \
 
 ###############################################################################
 
-GLIB_GENERATED += \
-	src/nm-src-enum-types.h \
-	src/nm-src-enum-types.c
-nm_src_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
-nm_src_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
-nm_src_enum_types_sources = $(src_libNetworkManager_la_SOURCES_enum)
-
-###############################################################################
-
 EXTRA_DIST += \
 	src/org.freedesktop.NetworkManager.conf \
 	src/nm-test-utils-core.h \
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index ae42a87b2e..97552950b4 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include "nm-device-private.h"
-#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 #include "ppp-manager/nm-ppp-manager.h"
 #include "ppp-manager/nm-ppp-status.h"
diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index 69045e6ddd..e70b1ba0f4 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -28,7 +28,6 @@
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-platform.h"
-#include "nm-src-enum-types.h"
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 #include "nm-ip4-config.h"
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index f727f5c34a..326cafd6bf 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -26,7 +26,6 @@
 
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
-#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 0c23b3dc07..b99271afdd 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -40,7 +40,6 @@
 #include "nm-supplicant-config.h"
 #include "ppp-manager/nm-ppp-manager.h"
 #include "ppp-manager/nm-ppp-status.h"
-#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 #include "nm-platform-utils.h"
 #include "nm-dcb.h"
diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c
index 457b92aeac..8116d9edd7 100644
--- a/src/devices/nm-device-generic.c
+++ b/src/devices/nm-device-generic.c
@@ -23,7 +23,6 @@
 #include "nm-device-generic.h"
 
 #include "nm-device-private.h"
-#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 #include "nm-core-internal.h"
 
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index c8805729c9..fa0d591754 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -26,7 +26,6 @@
 
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
-#include "nm-src-enum-types.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index de580ed988..71364658e6 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -28,7 +28,6 @@
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
-#include "nm-src-enum-types.h"
 #include "nm-settings.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 3d7768058d..0d4813e2e6 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -53,7 +53,6 @@
 #include "nm-dhcp6-config.h"
 #include "nm-rfkill-manager.h"
 #include "nm-firewall-manager.h"
-#include "nm-src-enum-types.h"
 #include "nm-settings-connection.h"
 #include "nm-settings.h"
 #include "nm-auth-utils.h"
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index ff3a6f0b26..c2654b7bf9 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -32,7 +32,6 @@
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-platform.h"
-#include "nm-src-enum-types.h"
 #include "nm-core-internal.h"
 #include "nm-ip4-config.h"
 #include "nm-dbus-compat.h"
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index 95d6dd8d95..78bb4ca678 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -46,7 +46,6 @@
 #include "nm-setting-connection.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-manager.h"
-#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 
 /* This is a bug; but we can't really change API now... */
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 38b4501fe2..320d3a1c55 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -48,7 +48,6 @@
 #include "nm-auth-utils.h"
 #include "nm-settings-connection.h"
 #include "nm-settings.h"
-#include "nm-src-enum-types.h"
 #include "nm-core-internal.h"
 #include "nm-config.h"
 
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index ee23471e7a..9819ca700c 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 
 #include "nm-bus-manager.h"
-#include "nm-src-enum-types.h"
 #include "NetworkManagerUtils.h"
 
 enum {
diff --git a/src/nm-config.c b/src/nm-config.c
index 2d7237faa8..46fce99820 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -29,7 +29,6 @@
 #include "nm-utils.h"
 #include "nm-device.h"
 #include "NetworkManagerUtils.h"
-#include "nm-src-enum-types.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-internal.h"
 
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 12646b73e1..93fd29b5a7 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -43,7 +43,6 @@
 #include "nm-auth-manager.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-factory.h"
-#include "nm-src-enum-types.h"
 #include "nm-sleep-monitor.h"
 #include "nm-connectivity.h"
 #include "nm-policy.h"
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 6da8c76f40..0b1d25d302 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -37,7 +37,6 @@
 #include "nm-core-internal.h"
 
 #include "nm-core-utils.h"
-#include "nm-src-enum-types.h"
 #include "nm-platform-utils.h"
 #include "nmp-object.h"
 #include "nmp-netns.h"
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index 24ecf07991..8e2b144a01 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -30,7 +30,6 @@
 #include "nm-secret-agent.h"
 #include "nm-auth-utils.h"
 #include "nm-setting-vpn.h"
-#include "nm-src-enum-types.h"
 #include "nm-auth-manager.h"
 #include "nm-bus-manager.h"
 #include "nm-session-monitor.h"
diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index 0b092a67a1..8e708d125c 100644
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -30,7 +30,6 @@
 #include "nm-setting-vpn.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"
-#include "nm-src-enum-types.h"
 
 typedef struct {
 	GSList *plugins;