diff --git a/agent/Makefile.depend b/agent/Makefile.depend
index 93486a2..5798d11 100644
--- a/agent/Makefile.depend
+++ b/agent/Makefile.depend
@@ -4,7 +4,6 @@
 ./agent_handler.lo: ../include/net-snmp/system/linux.h
 ./agent_handler.lo: ../include/net-snmp/system/sysv.h
 ./agent_handler.lo: ../include/net-snmp/system/generic.h
-./agent_handler.lo: ../include/net-snmp/machine/generic.h
 ./agent_handler.lo: ../include/net-snmp/net-snmp-features.h
 ./agent_handler.lo: ../include/net-snmp/net-snmp-includes.h
 ./agent_handler.lo: ../include/net-snmp/definitions.h
@@ -362,12 +361,13 @@
 ./agent_read_config.lo: mibgroup/snmpv3/usmUser.h
 ./agent_read_config.lo: mibgroup/mibII/snmp_mib_5_5.h
 ./agent_read_config.lo: mibgroup/mibII/system_mib.h
-./agent_read_config.lo: mibgroup/mibII/sysORTable.h mibgroup/mibII/at.h
+./agent_read_config.lo: mibgroup/mibII/sysORTable.h
+./agent_read_config.lo: mibgroup/mibII/vacm_vars.h
+./agent_read_config.lo: mibgroup/mibII/setSerialNo.h mibgroup/mibII/at.h
 ./agent_read_config.lo: mibgroup/mibII/ip.h mibgroup/mibII/var_route.h
 ./agent_read_config.lo: mibgroup/mibII/route_write.h mibgroup/mibII/at.h
 ./agent_read_config.lo: mibgroup/mibII/tcp.h mibgroup/mibII/icmp.h
-./agent_read_config.lo: mibgroup/mibII/udp.h mibgroup/mibII/vacm_vars.h
-./agent_read_config.lo: mibgroup/mibII/setSerialNo.h mibgroup/mibII/ipv6.h
+./agent_read_config.lo: mibgroup/mibII/udp.h mibgroup/mibII/ipv6.h
 ./agent_read_config.lo: mibgroup/ucd-snmp/disk_hw.h
 ./agent_read_config.lo: ../agent/mibgroup/mibdefs.h mibgroup/ucd-snmp/proc.h
 ./agent_read_config.lo: mibgroup/ucd-snmp/versioninfo.h
@@ -418,9 +418,9 @@
 ./agent_read_config.lo: mibgroup/tlstm-mib/snmpTlstmCertToTSNTable/snmpTlstmCertToTSNTable.h
 ./agent_read_config.lo: mibgroup/tlstm-mib/snmpTlstmParamsTable/snmpTlstmParamsTable.h
 ./agent_read_config.lo: mibgroup/tsm-mib/snmpTsmStats/snmpTsmStats.h
+./agent_read_config.lo: mibgroup/mibII/vacm_context.h
 ./agent_read_config.lo: mibgroup/mibII/var_route.h mibgroup/mibII/tcpTable.h
 ./agent_read_config.lo: mibgroup/mibII/udpTable.h
-./agent_read_config.lo: mibgroup/mibII/vacm_context.h
 ./agent_read_config.lo: mibgroup/ip-mib/ip_scalars.h
 ./agent_read_config.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h
 ./agent_read_config.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_constants.h
@@ -983,11 +983,11 @@
 ./mib_modules.lo: mibgroup/snmpv3/usmStats_5_5.h mibgroup/snmpv3/snmpEngine.h
 ./mib_modules.lo: mibgroup/snmpv3/usmUser.h mibgroup/mibII/snmp_mib_5_5.h
 ./mib_modules.lo: mibgroup/mibII/system_mib.h mibgroup/mibII/sysORTable.h
+./mib_modules.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/setSerialNo.h
 ./mib_modules.lo: mibgroup/mibII/at.h mibgroup/mibII/ip.h
 ./mib_modules.lo: mibgroup/mibII/var_route.h mibgroup/mibII/route_write.h
 ./mib_modules.lo: mibgroup/mibII/at.h mibgroup/mibII/tcp.h
 ./mib_modules.lo: mibgroup/mibII/icmp.h mibgroup/mibII/udp.h
-./mib_modules.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/setSerialNo.h
 ./mib_modules.lo: mibgroup/mibII/ipv6.h mibgroup/ucd-snmp/disk_hw.h
 ./mib_modules.lo: ../agent/mibgroup/mibdefs.h mibgroup/ucd-snmp/proc.h
 ./mib_modules.lo: mibgroup/ucd-snmp/versioninfo.h mibgroup/ucd-snmp/pass.h
@@ -1036,8 +1036,8 @@
 ./mib_modules.lo: mibgroup/tlstm-mib/snmpTlstmCertToTSNTable/snmpTlstmCertToTSNTable.h
 ./mib_modules.lo: mibgroup/tlstm-mib/snmpTlstmParamsTable/snmpTlstmParamsTable.h
 ./mib_modules.lo: mibgroup/tsm-mib/snmpTsmStats/snmpTsmStats.h
-./mib_modules.lo: mibgroup/mibII/var_route.h mibgroup/mibII/tcpTable.h
-./mib_modules.lo: mibgroup/mibII/udpTable.h mibgroup/mibII/vacm_context.h
+./mib_modules.lo: mibgroup/mibII/vacm_context.h mibgroup/mibII/var_route.h
+./mib_modules.lo: mibgroup/mibII/tcpTable.h mibgroup/mibII/udpTable.h
 ./mib_modules.lo: mibgroup/ip-mib/ip_scalars.h
 ./mib_modules.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h
 ./mib_modules.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_constants.h
@@ -1356,7 +1356,6 @@
 ./snmp_agent.lo: ../include/net-snmp/agent/snmp_get_statistic.h snmpd.h
 ./snmp_agent.lo: ../include/net-snmp/agent/mib_modules.h
 ./snmp_agent.lo: ../agent/mibgroup/agentx/protocol.h
-./snmp_agent.lo: ../agent/mibgroup/agentx/master.h
 ./snmp_agent.lo: ../agent/mibgroup/smux/smux.h
 ./snmpd.lo: ../include/net-snmp/net-snmp-config.h
 ./snmpd.lo: ../include/net-snmp/net-snmp-features.h
diff --git a/agent/helpers/Makefile.depend b/agent/helpers/Makefile.depend
index d20e125..165e333 100644
--- a/agent/helpers/Makefile.depend
+++ b/agent/helpers/Makefile.depend
@@ -4,7 +4,6 @@
 ./all_helpers.lo: ../../include/net-snmp/system/linux.h
 ./all_helpers.lo: ../../include/net-snmp/system/sysv.h
 ./all_helpers.lo: ../../include/net-snmp/system/generic.h
-./all_helpers.lo: ../../include/net-snmp/machine/generic.h
 ./all_helpers.lo: ../../include/net-snmp/net-snmp-features.h
 ./all_helpers.lo: ../../include/net-snmp/net-snmp-includes.h
 ./all_helpers.lo: ../../include/net-snmp/definitions.h
diff --git a/agent/mibgroup/Makefile.depend b/agent/mibgroup/Makefile.depend
index a4e9711..a5ab40b 100644
--- a/agent/mibgroup/Makefile.depend
+++ b/agent/mibgroup/Makefile.depend
@@ -4,7 +4,6 @@
 ./header_complex.lo: ../../include/net-snmp/system/linux.h
 ./header_complex.lo: ../../include/net-snmp/system/sysv.h
 ./header_complex.lo: ../../include/net-snmp/system/generic.h
-./header_complex.lo: ../../include/net-snmp/machine/generic.h
 ./header_complex.lo: ../../include/net-snmp/net-snmp-includes.h
 ./header_complex.lo: ../../include/net-snmp/definitions.h
 ./header_complex.lo: ../../include/net-snmp/types.h
diff --git a/apps/Makefile.depend b/apps/Makefile.depend
index 014ad50..d8057dc 100644
--- a/apps/Makefile.depend
+++ b/apps/Makefile.depend
@@ -4,7 +4,6 @@
 ./agentxtrap.lo: ../include/net-snmp/system/linux.h
 ./agentxtrap.lo: ../include/net-snmp/system/sysv.h
 ./agentxtrap.lo: ../include/net-snmp/system/generic.h
-./agentxtrap.lo: ../include/net-snmp/machine/generic.h
 ./agentxtrap.lo: ../include/net-snmp/net-snmp-features.h
 ./agentxtrap.lo: ../include/net-snmp/net-snmp-includes.h
 ./agentxtrap.lo: ../include/net-snmp/definitions.h
diff --git a/apps/snmpnetstat/Makefile.depend b/apps/snmpnetstat/Makefile.depend
index a7ad095..c4728a0 100644
--- a/apps/snmpnetstat/Makefile.depend
+++ b/apps/snmpnetstat/Makefile.depend
@@ -4,7 +4,6 @@
 ./if.lo: ../../include/net-snmp/system/linux.h
 ./if.lo: ../../include/net-snmp/system/sysv.h
 ./if.lo: ../../include/net-snmp/system/generic.h
-./if.lo: ../../include/net-snmp/machine/generic.h
 ./if.lo: ../../include/net-snmp/net-snmp-includes.h
 ./if.lo: ../../include/net-snmp/definitions.h ../../include/net-snmp/types.h
 ./if.lo: ../../include/net-snmp/library/oid.h
diff --git a/snmplib/Makefile.depend b/snmplib/Makefile.depend
index b927907..01f4557 100644
--- a/snmplib/Makefile.depend
+++ b/snmplib/Makefile.depend
@@ -4,7 +4,6 @@
 ./asn1.lo: ../include/net-snmp/system/linux.h
 ./asn1.lo: ../include/net-snmp/system/sysv.h
 ./asn1.lo: ../include/net-snmp/system/generic.h
-./asn1.lo: ../include/net-snmp/machine/generic.h
 ./asn1.lo: ../include/net-snmp/output_api.h ../include/net-snmp/types.h
 ./asn1.lo: ../include/net-snmp/library/oid.h
 ./asn1.lo: ../include/net-snmp/library/types.h
@@ -58,7 +57,6 @@
 ./callback.lo: ../include/net-snmp/system/linux.h
 ./callback.lo: ../include/net-snmp/system/sysv.h
 ./callback.lo: ../include/net-snmp/system/generic.h
-./callback.lo: ../include/net-snmp/machine/generic.h
 ./callback.lo: ../include/net-snmp/net-snmp-features.h
 ./callback.lo: ../include/net-snmp/types.h
 ./callback.lo: ../include/net-snmp/library/oid.h
@@ -115,61 +113,11 @@
 ./cert_util.lo: ../include/net-snmp/system/linux.h
 ./cert_util.lo: ../include/net-snmp/system/sysv.h
 ./cert_util.lo: ../include/net-snmp/system/generic.h
-./cert_util.lo: ../include/net-snmp/machine/generic.h
 ./cert_util.lo: ../include/net-snmp/net-snmp-features.h
-./cert_util.lo: ../include/net-snmp/types.h
-./cert_util.lo: ../include/net-snmp/library/oid.h
-./cert_util.lo: ../include/net-snmp/library/types.h
-./cert_util.lo: ../include/net-snmp/definitions.h
-./cert_util.lo: ../include/net-snmp/library/snmp_api.h
-./cert_util.lo: ../include/net-snmp/varbind_api.h
-./cert_util.lo: ../include/net-snmp/library/snmp_client.h
-./cert_util.lo: ../include/net-snmp/pdu_api.h
-./cert_util.lo: ../include/net-snmp/library/asn1.h
-./cert_util.lo: ../include/net-snmp/output_api.h
-./cert_util.lo: ../include/net-snmp/library/snmp_debug.h
-./cert_util.lo: ../include/net-snmp/library/snmp_logging.h
-./cert_util.lo: ../include/net-snmp/session_api.h
-./cert_util.lo: ../include/net-snmp/library/callback.h
-./cert_util.lo: ../include/net-snmp/library/snmp_transport.h
-./cert_util.lo: ../include/net-snmp/library/snmp_service.h
-./cert_util.lo: ../include/net-snmp/library/snmpCallbackDomain.h
-./cert_util.lo: ../include/net-snmp/library/snmpUnixDomain.h
-./cert_util.lo: ../include/net-snmp/library/snmpUDPDomain.h
-./cert_util.lo: ../include/net-snmp/library/snmpUDPIPv4BaseDomain.h
-./cert_util.lo: ../include/net-snmp/library/snmpIPv4BaseDomain.h
-./cert_util.lo: ../include/net-snmp/library/snmpUDPBaseDomain.h
-./cert_util.lo: ../include/net-snmp/library/snmpTCPDomain.h
-./cert_util.lo: ../include/net-snmp/library/snmpUDPIPv6Domain.h
-./cert_util.lo: ../include/net-snmp/library/snmpIPv6BaseDomain.h
-./cert_util.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
-./cert_util.lo: ../include/net-snmp/library/snmpIPXDomain.h
-./cert_util.lo: ../include/net-snmp/library/ucd_compat.h
-./cert_util.lo: ../include/net-snmp/library/mib.h
-./cert_util.lo: ../include/net-snmp/mib_api.h
-./cert_util.lo: ../include/net-snmp/library/parse.h
-./cert_util.lo: ../include/net-snmp/library/oid_stash.h
-./cert_util.lo: ../include/net-snmp/library/snmp_impl.h
-./cert_util.lo: ../include/net-snmp/library/snmp.h
-./cert_util.lo: ../include/net-snmp/library/snmp-tc.h
-./cert_util.lo: ../include/net-snmp/config_api.h
-./cert_util.lo: ../include/net-snmp/library/read_config.h
-./cert_util.lo: ../include/net-snmp/library/default_store.h
-./cert_util.lo: ../include/net-snmp/net-snmp-config.h
-./cert_util.lo: ../include/net-snmp/library/snmp_parse_args.h
-./cert_util.lo: ../include/net-snmp/library/snmp_enum.h
-./cert_util.lo: ../include/net-snmp/library/vacm.h
-./cert_util.lo: ../include/net-snmp/library/snmp_assert.h
-./cert_util.lo: ../include/net-snmp/library/system.h
-./cert_util.lo: ../include/net-snmp/library/tools.h
-./cert_util.lo: ../include/net-snmp/library/container.h
-./cert_util.lo: ../include/net-snmp/library/factory.h
-./cert_util.lo: ../include/net-snmp/library/data_list.h
-./cert_util.lo: ../include/net-snmp/library/file_utils.h
-./cert_util.lo: ../include/net-snmp/library/dir_utils.h
-./cert_util.lo: ../include/net-snmp/library/cert_util.h
-./cert_util.lo: ../include/net-snmp/library/snmp_openssl.h
 ./check_varbind.lo: ../include/net-snmp/net-snmp-config.h
+./check_varbind.lo: ../include/net-snmp/system/linux.h
+./check_varbind.lo: ../include/net-snmp/system/sysv.h
+./check_varbind.lo: ../include/net-snmp/system/generic.h
 ./check_varbind.lo: ../include/net-snmp/net-snmp-includes.h
 ./check_varbind.lo: ../include/net-snmp/definitions.h
 ./check_varbind.lo: ../include/net-snmp/types.h
@@ -227,6 +175,7 @@
 ./check_varbind.lo: ../include/net-snmp/config_api.h
 ./check_varbind.lo: ../include/net-snmp/library/read_config.h
 ./check_varbind.lo: ../include/net-snmp/library/default_store.h
+./check_varbind.lo: ../include/net-snmp/net-snmp-config.h
 ./check_varbind.lo: ../include/net-snmp/library/snmp_parse_args.h
 ./check_varbind.lo: ../include/net-snmp/library/snmp_enum.h
 ./check_varbind.lo: ../include/net-snmp/library/vacm.h
@@ -2620,7 +2569,8 @@
 ./snmptsm.lo: ../include/net-snmp/net-snmp-config.h
 ./snmptsm.lo: ../include/net-snmp/net-snmp-features.h
 ./snmptsm.lo: ../include/net-snmp/net-snmp-includes.h
-./snmptsm.lo: ../include/net-snmp/definitions.h ../include/net-snmp/types.h
+./snmptsm.lo: ../include/net-snmp/definitions.h
+./snmptsm.lo: ../include/net-snmp/types.h
 ./snmptsm.lo: ../include/net-snmp/library/oid.h
 ./snmptsm.lo: ../include/net-snmp/library/types.h
 ./snmptsm.lo: ../include/net-snmp/library/snmp_api.h