Move all agent/helpers/*.h files to include/net-snmp/agent/ and change
references.
git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@6135 06827809-a52a-0410-b366-d66718629ded
diff --git a/agent/Makefile.in b/agent/Makefile.in
index acdf6fa..3682b10 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -122,333 +122,3 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-agent_handler.lo: agent_handler.h agent_read_config.h agent_registry.h
-agent_handler.lo: agent_trap.h ../include/net-snmp/net-snmp-config.h ../m/generic.h mibgroup/mibincl.h
-agent_handler.lo: ../mib_module_config.h ../s/generic.h ../s/linux.h
-agent_handler.lo: snmp_agent.h ../snmplib/asn1.h ../snmplib/callback.h
-agent_handler.lo: ../snmplib/data_list.h ../snmplib/mib.h
-agent_handler.lo: ../snmplib/read_config.h ../snmplib/snmp_alarm.h
-agent_handler.lo: ../snmplib/snmp_api.h ../snmplib/snmp_client.h
-agent_handler.lo: ../snmplib/snmp_debug.h ../snmplib/snmp_enum.h
-agent_handler.lo: ../snmplib/snmp.h ../snmplib/snmp_impl.h
-agent_handler.lo: ../snmplib/snmp_logging.h ../snmplib/tools.h snmp_vars.h
-agent_handler.lo: ../s/sysv.h
-agent_handler.lo: var_struct.h
-agent_index.lo: agent_callbacks.h agent_handler.h agent_index.h
-agent_index.lo: agent_read_config.h agent_registry.h agent_trap.h ../include/net-snmp/net-snmp-config.h
-agent_index.lo: ds_agent.h helpers/table.h helpers/table_iterator.h
-agent_index.lo: ../m/generic.h mibgroup/agent_mibs.h
-agent_index.lo: mibgroup/agent/nsTransactionTable.h
-agent_index.lo: mibgroup/agentx/agentx_config.h mibgroup/agentx/client.h
-agent_index.lo: mibgroup/agentx.h mibgroup/agentx/master_admin.h
-agent_index.lo: mibgroup/agentx/master.h mibgroup/agentx/protocol.h
-agent_index.lo: mibgroup/agentx/subagent.h mibgroup/header_complex.h
-agent_index.lo: mibgroup/mibdefs.h mibgroup/mibII/at.h mibgroup/mibII.h
-agent_index.lo: mibgroup/mibII/icmp.h mibgroup/mibII/interfaces.h
-agent_index.lo: mibgroup/mibII/ipAddr.h mibgroup/mibII/ip.h
-agent_index.lo: mibgroup/mibII/kernel_linux.h mibgroup/mibII/route_write.h
-agent_index.lo: mibgroup/mibII/snmp_mib.h mibgroup/mibII/sysORTable.h
-agent_index.lo: mibgroup/mibII/system_mib.h mibgroup/mibII/tcp.h
-agent_index.lo: mibgroup/mibII/tcpTable.h mibgroup/mibII/udp.h
-agent_index.lo: mibgroup/mibII/udpTable.h mibgroup/mibII/vacm_context.h
-agent_index.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/var_route.h
-agent_index.lo: mibgroup/mibincl.h mibgroup/mib_module_includes.h
-agent_index.lo: mibgroup/notification.h
-agent_index.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
-agent_index.lo: mibgroup/notification/snmpNotifyFilterTable.h
-agent_index.lo: mibgroup/notification/snmpNotifyTable.h
-agent_index.lo: mibgroup/snmpv3mibs.h mibgroup/snmpv3/snmpEngine.h
-agent_index.lo: mibgroup/snmpv3/snmpMPDStats.h mibgroup/snmpv3/usmStats.h
-agent_index.lo: mibgroup/snmpv3/usmUser.h mibgroup/struct.h mibgroup/target.h
-agent_index.lo: mibgroup/target/snmpTargetAddrEntry.h
-agent_index.lo: mibgroup/target/snmpTargetParamsEntry.h
-agent_index.lo: mibgroup/target/target_counters.h mibgroup/target/target.h
-agent_index.lo: mibgroup/ucd-snmp/disk.h mibgroup/ucd-snmp/dlmod.h
-agent_index.lo: mibgroup/ucd-snmp/errormib.h mibgroup/ucd-snmp/extensible.h
-agent_index.lo: mibgroup/ucd-snmp/file.h mibgroup/ucd_snmp.h
-agent_index.lo: mibgroup/ucd-snmp/loadave.h mibgroup/ucd-snmp/memory.h
-agent_index.lo: mibgroup/ucd-snmp/pass.h mibgroup/ucd-snmp/pass_persist.h
-agent_index.lo: mibgroup/ucd-snmp/proc.h mibgroup/ucd-snmp/proxy.h
-agent_index.lo: mibgroup/ucd-snmp/registry.h mibgroup/ucd-snmp/versioninfo.h
-agent_index.lo: mibgroup/ucd-snmp/vmstat.h mibgroup/util_funcs.h
-agent_index.lo: ../mib_module_config.h ../s/generic.h ../s/linux.h snmp_agent.h
-agent_index.lo: snmpd.h ../snmplib/asn1.h ../snmplib/callback.h
-agent_index.lo: ../snmplib/data_list.h ../snmplib/default_store.h
-agent_index.lo: ../snmplib/mib.h ../snmplib/read_config.h
-agent_index.lo: ../snmplib/snmp_alarm.h ../snmplib/snmp_api.h
-agent_index.lo: ../snmplib/snmp_client.h ../snmplib/snmp_debug.h
-agent_index.lo: ../snmplib/snmp.h ../snmplib/snmp_impl.h
-agent_index.lo: ../snmplib/snmp_logging.h ../snmplib/snmp_secmod.h
-agent_index.lo: ../snmplib/snmpusm.h ../snmplib/tools.h ../snmplib/vacm.h
-agent_index.lo: snmp_vars.h ../s/sysv.h
-agent_index.lo: var_struct.h
-agent_read_config.lo: agent_callbacks.h agent_handler.h agent_read_config.h
-agent_read_config.lo: agent_registry.h agent_trap.h ../include/net-snmp/net-snmp-config.h ds_agent.h
-agent_read_config.lo: helpers/table_data.h helpers/table_dataset.h
-agent_read_config.lo: helpers/table.h helpers/table_iterator.h ../m/generic.h
-agent_read_config.lo: mibgroup/agent_mibs.h mibgroup/agent/nsTransactionTable.h
-agent_read_config.lo: mibgroup/agentx/agentx_config.h mibgroup/agentx/client.h
-agent_read_config.lo: mibgroup/agentx.h mibgroup/agentx/master_admin.h
-agent_read_config.lo: mibgroup/agentx/master.h mibgroup/agentx/protocol.h
-agent_read_config.lo: mibgroup/agentx/subagent.h mibgroup/header_complex.h
-agent_read_config.lo: mibgroup/mibdefs.h mibgroup/mibII/at.h mibgroup/mibII.h
-agent_read_config.lo: mibgroup/mibII/icmp.h mibgroup/mibII/interfaces.h
-agent_read_config.lo: mibgroup/mibII/ipAddr.h mibgroup/mibII/ip.h
-agent_read_config.lo: mibgroup/mibII/kernel_linux.h
-agent_read_config.lo: mibgroup/mibII/route_write.h mibgroup/mibII/snmp_mib.h
-agent_read_config.lo: mibgroup/mibII/sysORTable.h mibgroup/mibII/system_mib.h
-agent_read_config.lo: mibgroup/mibII/tcp.h mibgroup/mibII/tcpTable.h
-agent_read_config.lo: mibgroup/mibII/udp.h mibgroup/mibII/udpTable.h
-agent_read_config.lo: mibgroup/mibII/vacm_context.h mibgroup/mibII/vacm_vars.h
-agent_read_config.lo: mibgroup/mibII/var_route.h mibgroup/mibincl.h
-agent_read_config.lo: mibgroup/mib_module_dot_conf.h
-agent_read_config.lo: mibgroup/mib_module_includes.h mibgroup/notification.h
-agent_read_config.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
-agent_read_config.lo: mibgroup/notification/snmpNotifyFilterTable.h
-agent_read_config.lo: mibgroup/notification/snmpNotifyTable.h
-agent_read_config.lo: mibgroup/snmpv3mibs.h mibgroup/snmpv3/snmpEngine.h
-agent_read_config.lo: mibgroup/snmpv3/snmpMPDStats.h mibgroup/snmpv3/usmStats.h
-agent_read_config.lo: mibgroup/snmpv3/usmUser.h mibgroup/struct.h
-agent_read_config.lo: mibgroup/target.h mibgroup/target/snmpTargetAddrEntry.h
-agent_read_config.lo: mibgroup/target/snmpTargetParamsEntry.h
-agent_read_config.lo: mibgroup/target/target_counters.h
-agent_read_config.lo: mibgroup/target/target.h mibgroup/ucd-snmp/disk.h
-agent_read_config.lo: mibgroup/ucd-snmp/dlmod.h mibgroup/ucd-snmp/errormib.h
-agent_read_config.lo: mibgroup/ucd-snmp/extensible.h mibgroup/ucd-snmp/file.h
-agent_read_config.lo: mibgroup/ucd_snmp.h mibgroup/ucd-snmp/loadave.h
-agent_read_config.lo: mibgroup/ucd-snmp/memory.h mibgroup/ucd-snmp/pass.h
-agent_read_config.lo: mibgroup/ucd-snmp/pass_persist.h mibgroup/ucd-snmp/proc.h
-agent_read_config.lo: mibgroup/ucd-snmp/proxy.h mibgroup/ucd-snmp/registry.h
-agent_read_config.lo: mibgroup/ucd-snmp/versioninfo.h
-agent_read_config.lo: mibgroup/ucd-snmp/vmstat.h mibgroup/util_funcs.h
-agent_read_config.lo: ../mib_module_config.h ../s/generic.h ../s/linux.h
-agent_read_config.lo: snmp_agent.h snmpd.h ../snmplib/asn1.h
-agent_read_config.lo: ../snmplib/callback.h ../snmplib/data_list.h
-agent_read_config.lo: ../snmplib/default_store.h ../snmplib/getopt.h
-agent_read_config.lo: ../snmplib/mib.h ../snmplib/read_config.h
-agent_read_config.lo: ../snmplib/snmp_alarm.h ../snmplib/snmp_api.h
-agent_read_config.lo: ../snmplib/snmp_client.h ../snmplib/snmp_debug.h
-agent_read_config.lo: ../snmplib/snmp.h ../snmplib/snmp_impl.h
-agent_read_config.lo: ../snmplib/snmp_logging.h ../snmplib/snmp_secmod.h
-agent_read_config.lo: ../snmplib/snmpusm.h ../snmplib/system.h
-agent_read_config.lo: ../snmplib/tools.h ../snmplib/vacm.h snmp_vars.h
-agent_read_config.lo: ../s/sysv.h
-agent_read_config.lo: var_struct.h
-agent_registry.lo: agent_callbacks.h agent_handler.h agent_read_config.h
-agent_registry.lo: agent_registry.h agent_trap.h ../include/net-snmp/net-snmp-config.h ds_agent.h
-agent_registry.lo: helpers/null.h helpers/old_api.h helpers/table.h
-agent_registry.lo: helpers/table_iterator.h ../m/generic.h
-agent_registry.lo: mibgroup/agent_mibs.h mibgroup/agent/nsTransactionTable.h
-agent_registry.lo: mibgroup/agentx/agentx_config.h mibgroup/agentx/client.h
-agent_registry.lo: mibgroup/agentx.h mibgroup/agentx/master_admin.h
-agent_registry.lo: mibgroup/agentx/master.h mibgroup/agentx/protocol.h
-agent_registry.lo: mibgroup/agentx/subagent.h mibgroup/header_complex.h
-agent_registry.lo: mibgroup/mibdefs.h mibgroup/mibII/at.h mibgroup/mibII.h
-agent_registry.lo: mibgroup/mibII/icmp.h mibgroup/mibII/interfaces.h
-agent_registry.lo: mibgroup/mibII/ipAddr.h mibgroup/mibII/ip.h
-agent_registry.lo: mibgroup/mibII/kernel_linux.h mibgroup/mibII/route_write.h
-agent_registry.lo: mibgroup/mibII/snmp_mib.h mibgroup/mibII/sysORTable.h
-agent_registry.lo: mibgroup/mibII/system_mib.h mibgroup/mibII/tcp.h
-agent_registry.lo: mibgroup/mibII/tcpTable.h mibgroup/mibII/udp.h
-agent_registry.lo: mibgroup/mibII/udpTable.h mibgroup/mibII/vacm_context.h
-agent_registry.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/var_route.h
-agent_registry.lo: mibgroup/mibincl.h mibgroup/mib_module_includes.h
-agent_registry.lo: mibgroup/notification.h
-agent_registry.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
-agent_registry.lo: mibgroup/notification/snmpNotifyFilterTable.h
-agent_registry.lo: mibgroup/notification/snmpNotifyTable.h
-agent_registry.lo: mibgroup/snmpv3mibs.h mibgroup/snmpv3/snmpEngine.h
-agent_registry.lo: mibgroup/snmpv3/snmpMPDStats.h mibgroup/snmpv3/usmStats.h
-agent_registry.lo: mibgroup/snmpv3/usmUser.h mibgroup/struct.h
-agent_registry.lo: mibgroup/target.h mibgroup/target/snmpTargetAddrEntry.h
-agent_registry.lo: mibgroup/target/snmpTargetParamsEntry.h
-agent_registry.lo: mibgroup/target/target_counters.h mibgroup/target/target.h
-agent_registry.lo: mibgroup/ucd-snmp/disk.h mibgroup/ucd-snmp/dlmod.h
-agent_registry.lo: mibgroup/ucd-snmp/errormib.h mibgroup/ucd-snmp/extensible.h
-agent_registry.lo: mibgroup/ucd-snmp/file.h mibgroup/ucd_snmp.h
-agent_registry.lo: mibgroup/ucd-snmp/loadave.h mibgroup/ucd-snmp/memory.h
-agent_registry.lo: mibgroup/ucd-snmp/pass.h mibgroup/ucd-snmp/pass_persist.h
-agent_registry.lo: mibgroup/ucd-snmp/proc.h mibgroup/ucd-snmp/proxy.h
-agent_registry.lo: mibgroup/ucd-snmp/registry.h mibgroup/ucd-snmp/versioninfo.h
-agent_registry.lo: mibgroup/ucd-snmp/vmstat.h mibgroup/util_funcs.h
-agent_registry.lo: ../mib_module_config.h ../s/generic.h ../s/linux.h
-agent_registry.lo: snmp_agent.h snmpd.h ../snmplib/asn1.h ../snmplib/callback.h
-agent_registry.lo: ../snmplib/data_list.h ../snmplib/default_store.h
-agent_registry.lo: ../snmplib/mib.h ../snmplib/read_config.h
-agent_registry.lo: ../snmplib/snmp_alarm.h ../snmplib/snmp_api.h
-agent_registry.lo: ../snmplib/snmp_client.h ../snmplib/snmp_debug.h
-agent_registry.lo: ../snmplib/snmp.h ../snmplib/snmp_impl.h
-agent_registry.lo: ../snmplib/snmp_logging.h ../snmplib/snmp_secmod.h
-agent_registry.lo: ../snmplib/snmpusm.h ../snmplib/tools.h ../snmplib/vacm.h
-agent_registry.lo: snmp_vars.h ../s/sysv.h
-agent_registry.lo: var_struct.h
-agent_trap.lo: agent_callbacks.h agent_trap.h ../include/net-snmp/net-snmp-config.h ../m/generic.h
-agent_trap.lo: ../mib_module_config.h ../s/generic.h ../s/linux.h
-agent_trap.lo: ../snmplib/asn1.h ../snmplib/callback.h ../snmplib/getopt.h
-agent_trap.lo: ../snmplib/read_config.h ../snmplib/snmp_api.h
-agent_trap.lo: ../snmplib/snmp_client.h ../snmplib/snmp_debug.h
-agent_trap.lo: ../snmplib/snmp.h ../snmplib/snmp_impl.h
-agent_trap.lo: ../snmplib/snmp_logging.h ../snmplib/snmp_parse_args.h
-agent_trap.lo: ../snmplib/snmp_transport.h ../snmplib/system.h
-agent_trap.lo: ../snmplib/tools.h ../s/sysv.h
-auto_nlist.lo: ../include/net-snmp/net-snmp-config.h ../m/generic.h ../s/generic.h ../s/linux.h
-auto_nlist.lo: ../s/sysv.h
-kernel.lo: ../include/net-snmp/net-snmp-config.h ../m/generic.h ../s/generic.h ../s/linux.h ../s/sysv.h
-mib_modules.lo: agent_handler.h agent_read_config.h agent_registry.h
-mib_modules.lo: ../include/net-snmp/net-snmp-config.h ds_agent.h helpers/table.h helpers/table_iterator.h
-mib_modules.lo: m2m.h ../m/generic.h mibgroup/agent_mibs.h
-mib_modules.lo: mibgroup/agent/nsTransactionTable.h
-mib_modules.lo: mibgroup/agentx/agentx_config.h mibgroup/agentx/client.h
-mib_modules.lo: mibgroup/agentx.h mibgroup/agentx/master_admin.h
-mib_modules.lo: mibgroup/agentx/master.h mibgroup/agentx/protocol.h
-mib_modules.lo: mibgroup/agentx/subagent.h mibgroup/header_complex.h
-mib_modules.lo: mibgroup/mibdefs.h mibgroup/mibII/at.h mibgroup/mibII.h
-mib_modules.lo: mibgroup/mibII/icmp.h mibgroup/mibII/interfaces.h
-mib_modules.lo: mibgroup/mibII/ipAddr.h mibgroup/mibII/ip.h
-mib_modules.lo: mibgroup/mibII/kernel_linux.h mibgroup/mibII/route_write.h
-mib_modules.lo: mibgroup/mibII/snmp_mib.h mibgroup/mibII/sysORTable.h
-mib_modules.lo: mibgroup/mibII/system_mib.h mibgroup/mibII/tcp.h
-mib_modules.lo: mibgroup/mibII/tcpTable.h mibgroup/mibII/udp.h
-mib_modules.lo: mibgroup/mibII/udpTable.h mibgroup/mibII/vacm_context.h
-mib_modules.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/var_route.h
-mib_modules.lo: mibgroup/mib_module_includes.h mibgroup/mib_module_inits.h
-mib_modules.lo: mibgroup/notification.h
-mib_modules.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
-mib_modules.lo: mibgroup/notification/snmpNotifyFilterTable.h
-mib_modules.lo: mibgroup/notification/snmpNotifyTable.h
-mib_modules.lo: mibgroup/snmpv3mibs.h mibgroup/snmpv3/snmpEngine.h
-mib_modules.lo: mibgroup/snmpv3/snmpMPDStats.h mibgroup/snmpv3/usmStats.h
-mib_modules.lo: mibgroup/snmpv3/usmUser.h mibgroup/struct.h mibgroup/target.h
-mib_modules.lo: mibgroup/target/snmpTargetAddrEntry.h
-mib_modules.lo: mibgroup/target/snmpTargetParamsEntry.h
-mib_modules.lo: mibgroup/target/target_counters.h mibgroup/target/target.h
-mib_modules.lo: mibgroup/ucd-snmp/disk.h mibgroup/ucd-snmp/dlmod.h
-mib_modules.lo: mibgroup/ucd-snmp/errormib.h mibgroup/ucd-snmp/extensible.h
-mib_modules.lo: mibgroup/ucd-snmp/file.h mibgroup/ucd_snmp.h
-mib_modules.lo: mibgroup/ucd-snmp/loadave.h mibgroup/ucd-snmp/memory.h
-mib_modules.lo: mibgroup/ucd-snmp/pass.h mibgroup/ucd-snmp/pass_persist.h
-mib_modules.lo: mibgroup/ucd-snmp/proc.h mibgroup/ucd-snmp/proxy.h
-mib_modules.lo: mibgroup/ucd-snmp/registry.h mibgroup/ucd-snmp/versioninfo.h
-mib_modules.lo: mibgroup/ucd-snmp/vmstat.h mibgroup/util_funcs.h
-mib_modules.lo: ../mib_module_config.h mib_modules.h ../s/generic.h
-mib_modules.lo: ../s/linux.h snmp_agent.h ../snmplib/asn1.h
-mib_modules.lo: ../snmplib/callback.h ../snmplib/data_list.h
-mib_modules.lo: ../snmplib/default_store.h ../snmplib/getopt.h ../snmplib/mib.h
-mib_modules.lo: ../snmplib/read_config.h ../snmplib/snmp_alarm.h
-mib_modules.lo: ../snmplib/snmp_api.h ../snmplib/snmp_debug.h ../snmplib/snmp.h
-mib_modules.lo: ../snmplib/snmp_impl.h ../snmplib/snmp_secmod.h
-mib_modules.lo: ../snmplib/snmpusm.h ../snmplib/snmpv3.h ../snmplib/system.h
-mib_modules.lo: ../snmplib/tools.h ../snmplib/vacm.h snmp_vars.h ../s/sysv.h
-snmp_agent.lo: agent_handler.h agent_read_config.h agent_registry.h
-snmp_agent.lo: agent_trap.h ../include/net-snmp/net-snmp-config.h ds_agent.h ../m/generic.h
-snmp_agent.lo: mibgroup/agentx/master.h mibgroup/agentx/protocol.h
-snmp_agent.lo: mibgroup/mibincl.h mibgroup/struct.h mibgroup/util_funcs.h
-snmp_agent.lo: ../mib_module_config.h ../s/generic.h ../s/linux.h snmp_agent.h
-snmp_agent.lo: snmpd.h ../snmplib/asn1.h ../snmplib/callback.h
-snmp_agent.lo: ../snmplib/data_list.h ../snmplib/default_store.h
-snmp_agent.lo: ../snmplib/getopt.h ../snmplib/mib.h ../snmplib/read_config.h
-snmp_agent.lo: ../snmplib/snmp_alarm.h ../snmplib/snmp_api.h
-snmp_agent.lo: ../snmplib/snmp_client.h ../snmplib/snmp_debug.h
-snmp_agent.lo: ../snmplib/snmp.h ../snmplib/snmp_impl.h
-snmp_agent.lo: ../snmplib/snmp_logging.h ../snmplib/snmp_transport.h
-snmp_agent.lo: ../snmplib/system.h ../snmplib/tools.h ../snmplib/vacm.h
-snmp_agent.lo: snmp_vars.h ../s/sysv.h
-snmp_agent.lo: var_struct.h
-snmpd.lo: agent_handler.h agent_read_config.h agent_registry.h agent_trap.h
-snmpd.lo: ../include/net-snmp/net-snmp-config.h ds_agent.h helpers/table.h helpers/table_iterator.h m2m.h
-snmpd.lo: ../m/generic.h mibgroup/agent_mibs.h
-snmpd.lo: mibgroup/agent/nsTransactionTable.h mibgroup/agentx/agentx_config.h
-snmpd.lo: mibgroup/agentx/client.h mibgroup/agentx.h
-snmpd.lo: mibgroup/agentx/master_admin.h mibgroup/agentx/master.h
-snmpd.lo: mibgroup/agentx/protocol.h mibgroup/agentx/subagent.h
-snmpd.lo: mibgroup/header_complex.h mibgroup/mibdefs.h mibgroup/mibII/at.h
-snmpd.lo: mibgroup/mibII.h mibgroup/mibII/icmp.h mibgroup/mibII/interfaces.h
-snmpd.lo: mibgroup/mibII/ipAddr.h mibgroup/mibII/ip.h
-snmpd.lo: mibgroup/mibII/kernel_linux.h mibgroup/mibII/route_write.h
-snmpd.lo: mibgroup/mibII/snmp_mib.h mibgroup/mibII/sysORTable.h
-snmpd.lo: mibgroup/mibII/system_mib.h mibgroup/mibII/tcp.h
-snmpd.lo: mibgroup/mibII/tcpTable.h mibgroup/mibII/udp.h
-snmpd.lo: mibgroup/mibII/udpTable.h mibgroup/mibII/vacm_context.h
-snmpd.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/var_route.h
-snmpd.lo: mibgroup/mib_module_includes.h mibgroup/mib_module_shutdown.h
-snmpd.lo: mibgroup/notification.h
-snmpd.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
-snmpd.lo: mibgroup/notification/snmpNotifyFilterTable.h
-snmpd.lo: mibgroup/notification/snmpNotifyTable.h
-snmpd.lo: mibgroup/snmpv3/snmpEngine.h mibgroup/snmpv3/snmpMPDStats.h
-snmpd.lo: mibgroup/snmpv3/usmStats.h mibgroup/snmpv3/usmUser.h
-snmpd.lo: mibgroup/struct.h mibgroup/target.h
-snmpd.lo: mibgroup/target/snmpTargetAddrEntry.h
-snmpd.lo: mibgroup/target/snmpTargetParamsEntry.h
-snmpd.lo: mibgroup/target/target_counters.h mibgroup/target/target.h
-snmpd.lo: mibgroup/ucd-snmp/disk.h mibgroup/ucd-snmp/dlmod.h
-snmpd.lo: mibgroup/ucd-snmp/errormib.h mibgroup/ucd-snmp/extensible.h
-snmpd.lo: mibgroup/ucd-snmp/file.h mibgroup/ucd_snmp.h
-snmpd.lo: mibgroup/ucd-snmp/loadave.h mibgroup/ucd-snmp/memory.h
-snmpd.lo: mibgroup/ucd-snmp/pass.h mibgroup/ucd-snmp/pass_persist.h
-snmpd.lo: mibgroup/ucd-snmp/proc.h mibgroup/ucd-snmp/proxy.h
-snmpd.lo: mibgroup/ucd-snmp/registry.h mibgroup/ucd-snmp/versioninfo.h
-snmpd.lo: mibgroup/ucd-snmp/vmstat.h mibgroup/util_funcs.h
-snmpd.lo: ../mib_module_config.h mib_modules.h ../s/generic.h ../s/linux.h
-snmpd.lo: snmp_agent.h snmpd.h ../snmplib/asn1.h ../snmplib/callback.h
-snmpd.lo: ../snmplib/data_list.h ../snmplib/default_store.h ../snmplib/getopt.h
-snmpd.lo: ../snmplib/lcd_time.h ../snmplib/mib.h ../snmplib/read_config.h
-snmpd.lo: ../snmplib/snmp_alarm.h ../snmplib/snmp_api.h
-snmpd.lo: ../snmplib/snmp_client.h ../snmplib/snmp_debug.h ../snmplib/snmp.h
-snmpd.lo: ../snmplib/snmp_impl.h ../snmplib/snmp_logging.h
-snmpd.lo: ../snmplib/snmp_secmod.h ../snmplib/snmp_transport.h
-snmpd.lo: ../snmplib/snmpusm.h ../snmplib/snmpv3.h ../snmplib/system.h
-snmpd.lo: ../snmplib/tools.h ../snmplib/vacm.h snmp_vars.h ../s/sysv.h
-snmpd.lo: var_struct.h ../version.h
-snmp_vars.lo: agent_handler.h agent_read_config.h agent_registry.h agent_trap.h
-snmp_vars.lo: ../include/net-snmp/net-snmp-config.h ds_agent.h helpers/all_helpers.h
-snmp_vars.lo: helpers/debug_handler.h helpers/instance.h helpers/multiplexer.h
-snmp_vars.lo: helpers/null.h helpers/old_api.h helpers/read_only.h
-snmp_vars.lo: helpers/serialize.h helpers/table_data.h helpers/table_dataset.h
-snmp_vars.lo: helpers/table.h helpers/table_iterator.h kernel.h ../m/generic.h
-snmp_vars.lo: mibgroup/agent_mibs.h mibgroup/agent/nsTransactionTable.h
-snmp_vars.lo: mibgroup/agentx/agentx_config.h mibgroup/agentx/client.h
-snmp_vars.lo: mibgroup/agentx.h mibgroup/agentx/master_admin.h
-snmp_vars.lo: mibgroup/agentx/master.h mibgroup/agentx/protocol.h
-snmp_vars.lo: mibgroup/agentx/subagent.h mibgroup/header_complex.h
-snmp_vars.lo: mibgroup/mibdefs.h mibgroup/mibII/at.h mibgroup/mibII.h
-snmp_vars.lo: mibgroup/mibII/icmp.h mibgroup/mibII/interfaces.h
-snmp_vars.lo: mibgroup/mibII/ipAddr.h mibgroup/mibII/ip.h
-snmp_vars.lo: mibgroup/mibII/kernel_linux.h mibgroup/mibII/route_write.h
-snmp_vars.lo: mibgroup/mibII/snmp_mib.h mibgroup/mibII/sysORTable.h
-snmp_vars.lo: mibgroup/mibII/system_mib.h mibgroup/mibII/tcp.h
-snmp_vars.lo: mibgroup/mibII/tcpTable.h mibgroup/mibII/udp.h
-snmp_vars.lo: mibgroup/mibII/udpTable.h mibgroup/mibII/vacm_context.h
-snmp_vars.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/var_route.h
-snmp_vars.lo: mibgroup/mibincl.h mibgroup/mib_module_includes.h
-snmp_vars.lo: mibgroup/notification.h
-snmp_vars.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
-snmp_vars.lo: mibgroup/notification/snmpNotifyFilterTable.h
-snmp_vars.lo: mibgroup/notification/snmpNotifyTable.h
-snmp_vars.lo: mibgroup/snmpv3/snmpEngine.h mibgroup/snmpv3/snmpMPDStats.h
-snmp_vars.lo: mibgroup/snmpv3/usmStats.h mibgroup/snmpv3/usmUser.h
-snmp_vars.lo: mibgroup/struct.h mibgroup/target.h
-snmp_vars.lo: mibgroup/target/snmpTargetAddrEntry.h
-snmp_vars.lo: mibgroup/target/snmpTargetParamsEntry.h
-snmp_vars.lo: mibgroup/target/target_counters.h mibgroup/target/target.h
-snmp_vars.lo: mibgroup/ucd-snmp/disk.h mibgroup/ucd-snmp/dlmod.h
-snmp_vars.lo: mibgroup/ucd-snmp/errormib.h mibgroup/ucd-snmp/extensible.h
-snmp_vars.lo: mibgroup/ucd-snmp/file.h mibgroup/ucd_snmp.h
-snmp_vars.lo: mibgroup/ucd-snmp/loadave.h mibgroup/ucd-snmp/memory.h
-snmp_vars.lo: mibgroup/ucd-snmp/pass.h mibgroup/ucd-snmp/pass_persist.h
-snmp_vars.lo: mibgroup/ucd-snmp/proc.h mibgroup/ucd-snmp/proxy.h
-snmp_vars.lo: mibgroup/ucd-snmp/registry.h mibgroup/ucd-snmp/versioninfo.h
-snmp_vars.lo: mibgroup/ucd-snmp/vmstat.h mibgroup/util_funcs.h
-snmp_vars.lo: ../mib_module_config.h ../s/generic.h ../s/linux.h snmp_agent.h
-snmp_vars.lo: snmpd.h ../snmplib/asn1.h ../snmplib/callback.h
-snmp_vars.lo: ../snmplib/data_list.h ../snmplib/default_store.h
-snmp_vars.lo: ../snmplib/mib.h ../snmplib/read_config.h ../snmplib/snmp_alarm.h
-snmp_vars.lo: ../snmplib/snmp_api.h ../snmplib/snmp_client.h
-snmp_vars.lo: ../snmplib/snmp_debug.h ../snmplib/snmp.h ../snmplib/snmp_impl.h
-snmp_vars.lo: ../snmplib/snmp_logging.h ../snmplib/snmp_secmod.h
-snmp_vars.lo: ../snmplib/snmp_transport.h ../snmplib/snmpUDPDomain.h
-snmp_vars.lo: ../snmplib/snmpusm.h ../snmplib/snmpv3.h ../snmplib/system.h
-snmp_vars.lo: ../snmplib/tools.h ../snmplib/transform_oids.h ../snmplib/vacm.h
-snmp_vars.lo: snmp_vars.h ../s/sysv.h
-snmp_vars.lo: var_struct.h
diff --git a/agent/agent_handler.c b/agent/agent_handler.c
index 4da3f5d..a689c97 100644
--- a/agent/agent_handler.c
+++ b/agent/agent_handler.c
@@ -13,6 +13,7 @@
#include <agent_registry.h>
#include <data_list.h>
#include <snmp_enum.h>
+#include <net-snmp/agent/bulk_to_next.h>
/***********************************************************************/
/* New Handler based API */
/***********************************************************************/
diff --git a/agent/agent_index.c b/agent/agent_index.c
index 88077fd..5d634f8 100644
--- a/agent/agent_index.c
+++ b/agent/agent_index.c
@@ -55,8 +55,8 @@
#include "snmpd.h"
#include "mibgroup/struct.h"
-#include "helpers/table.h"
-#include "helpers/table_iterator.h"
+#include "net-snmp/agent/table.h"
+#include "net-snmp/agent/table_iterator.h"
#include "mib_module_includes.h"
#ifdef USING_AGENTX_SUBAGENT_MODULE
diff --git a/agent/agent_read_config.c b/agent/agent_read_config.c
index 979814d..735a351 100644
--- a/agent/agent_read_config.c
+++ b/agent/agent_read_config.c
@@ -108,10 +108,10 @@
#include "agent_callbacks.h"
#include "default_store.h"
#include "ds_agent.h"
-#include "helpers/table.h"
-#include "helpers/table_iterator.h"
-#include "helpers/table_data.h"
-#include "helpers/table_dataset.h"
+#include "net-snmp/agent/table.h"
+#include "net-snmp/agent/table_iterator.h"
+#include "net-snmp/agent/table_data.h"
+#include "net-snmp/agent/table_dataset.h"
#include "mib_module_includes.h"
char dontReadConfigFiles;
diff --git a/agent/agent_registry.c b/agent/agent_registry.c
index 8d437b3..66ad29d 100644
--- a/agent/agent_registry.c
+++ b/agent/agent_registry.c
@@ -56,10 +56,10 @@
#include "snmpd.h"
#include "mibgroup/struct.h"
-#include "helpers/old_api.h"
-#include "helpers/null.h"
-#include "helpers/table.h"
-#include "helpers/table_iterator.h"
+#include "net-snmp/agent/old_api.h"
+#include "net-snmp/agent/null.h"
+#include "net-snmp/agent/table.h"
+#include "net-snmp/agent/table_iterator.h"
#include "mib_module_includes.h"
#ifdef USING_AGENTX_SUBAGENT_MODULE
diff --git a/agent/helpers/all_helpers.h b/agent/helpers/all_helpers.h
deleted file mode 100644
index fdd9278..0000000
--- a/agent/helpers/all_helpers.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef ALL_HANDLERS_H
-#define ALL_HANDLERS_H
-
-#include "instance.h"
-#include "multiplexer.h"
-#include "null.h"
-#include "debug_handler.h"
-#include "old_api.h"
-#include "read_only.h"
-#include "serialize.h"
-#include "bulk_to_next.h"
-/* #include "set_helper.h" */
-#include "table.h"
-#include "table_data.h"
-#include "table_dataset.h"
-#include "table_iterator.h"
-/* #include "table_array.h" */
-
-void init_helpers(void);
-
-#endif /* ALL_HANDLERS_H */
diff --git a/agent/helpers/bulk_to_next.c b/agent/helpers/bulk_to_next.c
index c5e0c78..cb57e02 100644
--- a/agent/helpers/bulk_to_next.c
+++ b/agent/helpers/bulk_to_next.c
@@ -9,7 +9,7 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "bulk_to_next.h"
+#include <net-snmp/agent/bulk_to_next.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/debug_handler.c b/agent/helpers/debug_handler.c
index 16688cd..1a726bb 100644
--- a/agent/helpers/debug_handler.c
+++ b/agent/helpers/debug_handler.c
@@ -9,7 +9,7 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "debug_handler.h"
+#include <net-snmp/agent/debug_handler.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/instance.c b/agent/helpers/instance.c
index 74083d1..6a86146 100644
--- a/agent/helpers/instance.c
+++ b/agent/helpers/instance.c
@@ -9,9 +9,9 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "instance.h"
-#include "serialize.h"
-#include "read_only.h"
+#include <net-snmp/agent/instance.h>
+#include <net-snmp/agent/serialize.h>
+#include <net-snmp/agent/read_only.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/multiplexer.c b/agent/helpers/multiplexer.c
index ea57ef5..5727916 100644
--- a/agent/helpers/multiplexer.c
+++ b/agent/helpers/multiplexer.c
@@ -6,7 +6,7 @@
#include "tools.h"
#include "snmp_agent.h"
#include "agent_registry.h"
-#include "multiplexer.h"
+#include <net-snmp/agent/multiplexer.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/null.c b/agent/helpers/null.c
index eb89170..3f20369 100644
--- a/agent/helpers/null.c
+++ b/agent/helpers/null.c
@@ -14,7 +14,7 @@
#include <dmalloc.h>
#endif
-#include "null.h"
+#include <net-snmp/agent/null.h>
int register_null(oid *loc, size_t loc_len) {
handler_registration *reginfo;
diff --git a/agent/helpers/old_api.c b/agent/helpers/old_api.c
index 6a18f9f..9052703 100644
--- a/agent/helpers/old_api.c
+++ b/agent/helpers/old_api.c
@@ -9,7 +9,7 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "old_api.h"
+#include <net-snmp/agent/old_api.h>
#include "agent_callbacks.h"
#if HAVE_DMALLOC_H
diff --git a/agent/helpers/read_only.c b/agent/helpers/read_only.c
index aa96664..a6ba907 100644
--- a/agent/helpers/read_only.c
+++ b/agent/helpers/read_only.c
@@ -9,7 +9,7 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "read_only.h"
+#include <net-snmp/agent/read_only.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/serialize.c b/agent/helpers/serialize.c
index b480ade..7c68c0b 100644
--- a/agent/helpers/serialize.c
+++ b/agent/helpers/serialize.c
@@ -9,7 +9,7 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "serialize.h"
+#include <net-snmp/agent/serialize.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/table.c b/agent/helpers/table.c
index 780e839..69db019 100644
--- a/agent/helpers/table.c
+++ b/agent/helpers/table.c
@@ -14,7 +14,7 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "table.h"
+#include <net-snmp/agent/table.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/table_array.c b/agent/helpers/table_array.c
index 4d2360d..f219382 100644
--- a/agent/helpers/table_array.c
+++ b/agent/helpers/table_array.c
@@ -15,9 +15,9 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "table.h"
+#include <net-snmp/agent/table.h>
#include "oid_array.h"
-#include "table_array.h"
+#include <net-snmp/agent/table_array.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/table_data.c b/agent/helpers/table_data.c
index a41bb1f..5145d81 100644
--- a/agent/helpers/table_data.c
+++ b/agent/helpers/table_data.c
@@ -7,9 +7,9 @@
#endif
#include "mibincl.h"
-#include "table.h"
-#include "table_data.h"
-#include "read_only.h"
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/table_data.h>
+#include <net-snmp/agent/read_only.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/helpers/table_dataset.c b/agent/helpers/table_dataset.c
index 477814d..8ba0cae 100644
--- a/agent/helpers/table_dataset.c
+++ b/agent/helpers/table_dataset.c
@@ -7,9 +7,9 @@
#endif
#include "mibincl.h"
-#include "table.h"
-#include "table_data.h"
-#include "table_dataset.h"
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/table_data.h>
+#include <net-snmp/agent/table_dataset.h>
#include "parse.h"
#include "data_list.h"
diff --git a/agent/helpers/table_iterator.c b/agent/helpers/table_iterator.c
index d158ff1..19297d1 100644
--- a/agent/helpers/table_iterator.c
+++ b/agent/helpers/table_iterator.c
@@ -21,9 +21,9 @@
#include "mibincl.h"
#include "tools.h"
#include "snmp_agent.h"
-#include "table.h"
-#include "serialize.h"
-#include "table_iterator.h"
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/serialize.h>
+#include <net-snmp/agent/table_iterator.h>
#if HAVE_DMALLOC_H
#include <dmalloc.h>
diff --git a/agent/mib_modules.c b/agent/mib_modules.c
index aa57dda..32e0229 100644
--- a/agent/mib_modules.c
+++ b/agent/mib_modules.c
@@ -62,8 +62,8 @@
#include "mibgroup/struct.h"
#include "mib_modules.h"
-#include "helpers/table.h"
-#include "helpers/table_iterator.h"
+#include "net-snmp/agent/table.h"
+#include "net-snmp/agent/table_iterator.h"
#include "mib_module_includes.h"
#ifdef USING_AGENTX_SUBAGENT_MODULE
#include "mibgroup/agentx/subagent.h"
diff --git a/agent/mibgroup/Makefile.in b/agent/mibgroup/Makefile.in
index 865ccf5..ab48893 100644
--- a/agent/mibgroup/Makefile.in
+++ b/agent/mibgroup/Makefile.in
@@ -35,297 +35,3 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-agent/nsTransactionTable.lo: ../agent_handler.h agent/nsTransactionTable.h
-agent/nsTransactionTable.lo: ../agent_read_config.h ../agent_registry.h
-agent/nsTransactionTable.lo: ../agent_trap.h ../helpers/table.h
-agent/nsTransactionTable.lo: ../helpers/table_iterator.h mibincl.h
-agent/nsTransactionTable.lo: ../snmp_agent.h ../snmp_vars.h
-agent/nsTransactionTable.lo: ../var_struct.h
-agentx/agentx_config.lo: ../agent_read_config.h agentx/agentx_config.h
-agentx/agentx_config.lo: ../ds_agent.h ../snmpd.h
-agentx/client.lo: ../agent_handler.h ../agent_index.h ../agent_registry.h
-agentx/client.lo: agentx/client.h agentx/protocol.h ../ds_agent.h
-agentx/client.lo: ../snmp_agent.h ../snmp_vars.h
-agentx/client.lo: ../var_struct.h
-agentx/master_admin.lo: ../agent_handler.h ../agent_index.h ../agent_registry.h
-agentx/master_admin.lo: ../agent_trap.h agentx/client.h agentx/master.h
-agentx/master_admin.lo: agentx/protocol.h mibII/sysORTable.h ../snmp_agent.h
-agentx/master_admin.lo: ../snmp_vars.h
-agentx/master_admin.lo: ../var_struct.h
-agentx/master.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-agentx/master.lo: agentx/master_admin.h agentx/protocol.h ../ds_agent.h
-agentx/master.lo: ../snmp_agent.h ../snmpd.h ../snmp_vars.h
-agentx/master.lo: ../var_struct.h
-agentx/protocol.lo: agentx/protocol.h
-agentx/subagent.lo: ../agent_callbacks.h ../agent_handler.h ../agent_registry.h
-agentx/subagent.lo: ../agent_trap.h agentx/client.h agentx/protocol.h
-agentx/subagent.lo: agentx/subagent.h ../ds_agent.h mibII/sysORTable.h
-agentx/subagent.lo: ../snmp_agent.h ../snmpd.h ../snmp_vars.h
-agentx/subagent.lo: ../var_struct.h
-header_complex.lo: ../agent_handler.h ../agent_read_config.h
-header_complex.lo: ../agent_registry.h ../agent_trap.h ../../include/net-snmp/net-snmp-config.h
-header_complex.lo: header_complex.h ../../m/generic.h mibincl.h
-header_complex.lo: ../../mib_module_config.h ../../s/generic.h ../../s/linux.h
-header_complex.lo: ../snmp_agent.h ../../snmplib/asn1.h
-header_complex.lo: ../../snmplib/callback.h ../../snmplib/data_list.h
-header_complex.lo: ../../snmplib/mib.h ../../snmplib/read_config.h
-header_complex.lo: ../../snmplib/snmp_alarm.h ../../snmplib/snmp_api.h
-header_complex.lo: ../../snmplib/snmp_client.h ../../snmplib/snmp_debug.h
-header_complex.lo: ../../snmplib/snmp.h ../../snmplib/snmp_impl.h
-header_complex.lo: ../../snmplib/snmp_logging.h ../../snmplib/tools.h
-header_complex.lo: ../snmp_vars.h ../../s/sysv.h
-header_complex.lo: ../var_struct.h
-mibII/at.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-mibII/at.lo: ../agent_trap.h ../auto_nlist.h mibII/at.h mibII/interfaces.h
-mibII/at.lo: mibincl.h ../snmp_agent.h ../snmp_vars.h
-mibII/at.lo: ../var_struct.h
-mibII/icmp.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-mibII/icmp.lo: ../agent_trap.h ../auto_nlist.h mibII/icmp.h
-mibII/icmp.lo: mibII/kernel_linux.h mibII/sysORTable.h mibincl.h
-mibII/icmp.lo: ../snmp_agent.h ../snmp_vars.h struct.h
-mibII/icmp.lo: util_funcs.h ../var_struct.h
-mibII/interfaces.lo: ../agent_handler.h ../agent_read_config.h
-mibII/interfaces.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-mibII/interfaces.lo: ../kernel.h mibII/interfaces.h mibII/sysORTable.h
-mibII/interfaces.lo: mibincl.h ../snmp_agent.h ../snmp_vars.h struct.h
-mibII/interfaces.lo: util_funcs.h ../var_struct.h
-mibII/ipAddr.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-mibII/ipAddr.lo: ../agent_trap.h ../auto_nlist.h ../kernel.h mibII/at.h
-mibII/ipAddr.lo: mibII/interfaces.h mibII/ip.h mibII/route_write.h
-mibII/ipAddr.lo: mibII/sysORTable.h mibII/var_route.h mibincl.h ../snmp_agent.h
-mibII/ipAddr.lo: ../snmp_vars.h
-mibII/ipAddr.lo: ../var_struct.h
-mibII/ip.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-mibII/ip.lo: ../agent_trap.h ../auto_nlist.h ../kernel.h mibII/at.h
-mibII/ip.lo: mibII/interfaces.h mibII/ipAddr.h mibII/ip.h mibII/kernel_linux.h
-mibII/ip.lo: mibII/route_write.h mibII/sysORTable.h mibII/var_route.h mibincl.h
-mibII/ip.lo: ../snmp_agent.h ../snmp_vars.h struct.h
-mibII/ip.lo: util_funcs.h ../var_struct.h
-mibII/kernel_linux.lo: ../agent_handler.h ../agent_read_config.h
-mibII/kernel_linux.lo: ../agent_registry.h ../agent_trap.h mibII/kernel_linux.h
-mibII/kernel_linux.lo: mibincl.h ../snmp_agent.h ../snmp_vars.h struct.h
-mibII/kernel_linux.lo: util_funcs.h ../var_struct.h
-mibII/route_write.lo: ../agent_registry.h mibII/ip.h mibII/route_write.h
-mibII/route_write.lo: mibII/var_route.h ../snmp_agent.h ../snmp_vars.h
-mibII/snmp_mib.lo: ../agent_handler.h ../agent_read_config.h
-mibII/snmp_mib.lo: ../agent_registry.h ../agent_trap.h mibII/snmp_mib.h
-mibII/snmp_mib.lo: mibII/sysORTable.h mibincl.h ../snmp_agent.h ../snmp_vars.h
-mibII/snmp_mib.lo: struct.h
-mibII/snmp_mib.lo: util_funcs.h ../var_struct.h
-mibII/sysORTable.lo: ../agent_callbacks.h ../agent_handler.h
-mibII/sysORTable.lo: ../agent_read_config.h ../agent_registry.h ../agent_trap.h
-mibII/sysORTable.lo: agentx/client.h agentx/subagent.h ../ds_agent.h
-mibII/sysORTable.lo: mibII/sysORTable.h mibincl.h ../snmp_agent.h ../snmpd.h
-mibII/sysORTable.lo: ../snmp_vars.h struct.h
-mibII/sysORTable.lo: util_funcs.h ../var_struct.h
-mibII/system_mib.lo: ../agent_handler.h ../agent_read_config.h
-mibII/system_mib.lo: ../agent_registry.h ../agent_trap.h mibII/sysORTable.h
-mibII/system_mib.lo: mibII/system_mib.h mibincl.h ../snmp_agent.h
-mibII/system_mib.lo: ../snmp_vars.h struct.h
-mibII/system_mib.lo: util_funcs.h ../var_struct.h
-mibII/tcp.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-mibII/tcp.lo: ../agent_trap.h ../auto_nlist.h ../kernel.h mibII/kernel_linux.h
-mibII/tcp.lo: mibII/sysORTable.h mibII/tcp.h mibII/tcpTable.h mibincl.h
-mibII/tcp.lo: ../snmp_agent.h ../snmp_vars.h struct.h
-mibII/tcp.lo: util_funcs.h ../var_struct.h
-mibII/tcpTable.lo: ../agent_handler.h ../agent_read_config.h
-mibII/tcpTable.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-mibII/tcpTable.lo: ../kernel.h mibII/tcp.h mibII/tcpTable.h mibincl.h
-mibII/tcpTable.lo: ../snmp_agent.h ../snmp_vars.h
-mibII/tcpTable.lo: ../var_struct.h
-mibII/udp.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-mibII/udp.lo: ../agent_trap.h ../auto_nlist.h ../kernel.h mibII/kernel_linux.h
-mibII/udp.lo: mibII/sysORTable.h mibII/tcp.h mibII/udp.h mibII/udpTable.h
-mibII/udp.lo: mibincl.h ../snmp_agent.h ../snmp_vars.h struct.h
-mibII/udp.lo: util_funcs.h ../var_struct.h
-mibII/udpTable.lo: ../agent_handler.h ../agent_read_config.h
-mibII/udpTable.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-mibII/udpTable.lo: ../kernel.h mibII/sysORTable.h mibII/tcpTable.h mibII/udp.h
-mibII/udpTable.lo: mibII/udpTable.h mibincl.h ../snmp_agent.h ../snmp_vars.h
-mibII/udpTable.lo: ../var_struct.h
-mibII/vacm_context.lo: ../agent_handler.h ../agent_read_config.h
-mibII/vacm_context.lo: ../agent_registry.h ../agent_trap.h ../helpers/table.h
-mibII/vacm_context.lo: ../helpers/table_iterator.h mibII/vacm_context.h
-mibII/vacm_context.lo: mibincl.h ../snmp_agent.h ../snmp_vars.h
-mibII/vacm_context.lo: ../var_struct.h
-mibII/vacm_vars.lo: ../agent_callbacks.h ../agent_handler.h
-mibII/vacm_vars.lo: ../agent_read_config.h ../agent_registry.h ../agent_trap.h
-mibII/vacm_vars.lo: mibII/sysORTable.h mibII/vacm_vars.h mibincl.h
-mibII/vacm_vars.lo: ../snmp_agent.h ../snmp_vars.h struct.h
-mibII/vacm_vars.lo: util_funcs.h ../var_struct.h
-mibII/var_route.lo: ../agent_handler.h ../agent_read_config.h
-mibII/var_route.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-mibII/var_route.lo: ../kernel.h mibII/at.h mibII/interfaces.h mibII/ip.h
-mibII/var_route.lo: mibII/route_write.h mibII/var_route.h mibincl.h
-mibII/var_route.lo: ../snmp_agent.h ../snmp_vars.h struct.h
-mibII/var_route.lo: util_funcs.h ../var_struct.h
-notification/snmpNotifyFilterProfileTable.lo: ../agent_handler.h
-notification/snmpNotifyFilterProfileTable.lo: ../agent_read_config.h
-notification/snmpNotifyFilterProfileTable.lo: ../agent_registry.h
-notification/snmpNotifyFilterProfileTable.lo: ../agent_trap.h header_complex.h
-notification/snmpNotifyFilterProfileTable.lo: mibincl.h
-notification/snmpNotifyFilterProfileTable.lo: notification/snmpNotifyFilterProfileTable.h
-notification/snmpNotifyFilterProfileTable.lo: ../snmp_agent.h ../snmp_vars.h
-notification/snmpNotifyFilterProfileTable.lo: ../var_struct.h
-notification/snmpNotifyFilterTable.lo: ../agent_handler.h
-notification/snmpNotifyFilterTable.lo: ../agent_read_config.h
-notification/snmpNotifyFilterTable.lo: ../agent_registry.h ../agent_trap.h
-notification/snmpNotifyFilterTable.lo: header_complex.h mibincl.h
-notification/snmpNotifyFilterTable.lo: notification/snmpNotifyFilterTable.h
-notification/snmpNotifyFilterTable.lo: ../snmp_agent.h ../snmp_vars.h
-notification/snmpNotifyFilterTable.lo: ../var_struct.h
-notification/snmpNotifyTable.lo: ../agent_callbacks.h ../agent_handler.h
-notification/snmpNotifyTable.lo: ../agent_read_config.h ../agent_registry.h
-notification/snmpNotifyTable.lo: ../agent_trap.h header_complex.h mibincl.h
-notification/snmpNotifyTable.lo: notification/snmpNotifyTable.h ../snmp_agent.h
-notification/snmpNotifyTable.lo: ../snmp_vars.h target/snmpTargetAddrEntry.h
-notification/snmpNotifyTable.lo: target/snmpTargetParamsEntry.h target/target.h
-notification/snmpNotifyTable.lo: ../var_struct.h
-policy/policyEndpointToGroupTable.lo: ../agent_handler.h ../agent_read_config.h
-policy/policyEndpointToGroupTable.lo: ../agent_registry.h ../agent_trap.h
-policy/policyEndpointToGroupTable.lo: ../helpers/table.h
-policy/policyEndpointToGroupTable.lo: ../helpers/table_iterator.h
-policy/policyEndpointToGroupTable.lo: mibII/interfaces.h mibincl.h
-policy/policyEndpointToGroupTable.lo: policy/policyEndpointToGroupTable.h
-policy/policyEndpointToGroupTable.lo: policy/policy_iterator.h ../snmp_agent.h
-policy/policyEndpointToGroupTable.lo: ../snmp_vars.h
-policy/policyEndpointToGroupTable.lo: ../var_struct.h
-policy/policyGroupContentsTable.lo: ../agent_handler.h ../agent_read_config.h
-policy/policyGroupContentsTable.lo: ../agent_registry.h ../agent_trap.h
-policy/policyGroupContentsTable.lo: ../helpers/table.h
-policy/policyGroupContentsTable.lo: ../helpers/table_iterator.h mibincl.h
-policy/policyGroupContentsTable.lo: policy/policyGroupContentsTable.h
-policy/policyGroupContentsTable.lo: policy/policy_iterator.h ../snmp_agent.h
-policy/policyGroupContentsTable.lo: ../snmp_vars.h
-policy/policyGroupContentsTable.lo: ../var_struct.h
-policy/policy_iterator.lo: ../agent_handler.h ../agent_read_config.h
-policy/policy_iterator.lo: ../agent_registry.h ../agent_trap.h
-policy/policy_iterator.lo: ../helpers/table.h ../helpers/table_iterator.h
-policy/policy_iterator.lo: mibincl.h ../snmp_agent.h ../snmp_vars.h
-policy/policy_iterator.lo: ../var_struct.h
-policy/policyRuleDefinitionTable.lo: ../agent_handler.h ../agent_read_config.h
-policy/policyRuleDefinitionTable.lo: ../agent_registry.h ../agent_trap.h
-policy/policyRuleDefinitionTable.lo: ../helpers/table.h
-policy/policyRuleDefinitionTable.lo: ../helpers/table_iterator.h mibincl.h
-policy/policyRuleDefinitionTable.lo: policy/policy_iterator.h
-policy/policyRuleDefinitionTable.lo: policy/policyRuleDefinitionTable.h
-policy/policyRuleDefinitionTable.lo: ../snmp_agent.h ../snmp_vars.h
-policy/policyRuleDefinitionTable.lo: ../var_struct.h
-snmpv3/snmpEngine.lo: ../agent_handler.h ../agent_read_config.h
-snmpv3/snmpEngine.lo: ../agent_registry.h ../agent_trap.h mibII/sysORTable.h
-snmpv3/snmpEngine.lo: mibincl.h ../snmp_agent.h snmpv3/snmpEngine.h
-snmpv3/snmpEngine.lo: ../snmp_vars.h struct.h
-snmpv3/snmpEngine.lo: util_funcs.h ../var_struct.h
-snmpv3/snmpMPDStats.lo: ../agent_handler.h ../agent_read_config.h
-snmpv3/snmpMPDStats.lo: ../agent_registry.h ../agent_trap.h mibII/sysORTable.h
-snmpv3/snmpMPDStats.lo: mibincl.h ../snmp_agent.h snmpv3/snmpMPDStats.h
-snmpv3/snmpMPDStats.lo: ../snmp_vars.h struct.h
-snmpv3/snmpMPDStats.lo: util_funcs.h ../var_struct.h
-snmpv3/usmStats.lo: ../agent_handler.h ../agent_read_config.h
-snmpv3/usmStats.lo: ../agent_registry.h ../agent_trap.h mibII/sysORTable.h
-snmpv3/usmStats.lo: mibincl.h ../snmp_agent.h snmpv3/usmStats.h ../snmp_vars.h
-snmpv3/usmStats.lo: struct.h
-snmpv3/usmStats.lo: util_funcs.h ../var_struct.h
-snmpv3/usmUser.lo: ../agent_handler.h ../agent_read_config.h
-snmpv3/usmUser.lo: ../agent_registry.h ../agent_trap.h mibincl.h
-snmpv3/usmUser.lo: ../snmp_agent.h snmpv3/usmUser.h ../snmp_vars.h struct.h
-snmpv3/usmUser.lo: util_funcs.h ../var_struct.h
-target/snmpTargetAddrEntry.lo: ../agent_handler.h ../agent_read_config.h
-target/snmpTargetAddrEntry.lo: ../agent_registry.h ../agent_trap.h mibincl.h
-target/snmpTargetAddrEntry.lo: ../snmp_agent.h ../snmp_vars.h
-target/snmpTargetAddrEntry.lo: target/snmpTargetAddrEntry.h
-target/snmpTargetAddrEntry.lo: ../var_struct.h
-target/snmpTargetParamsEntry.lo: ../agent_handler.h ../agent_read_config.h
-target/snmpTargetParamsEntry.lo: ../agent_registry.h ../agent_trap.h mibincl.h
-target/snmpTargetParamsEntry.lo: ../snmp_agent.h ../snmp_vars.h
-target/snmpTargetParamsEntry.lo: target/snmpTargetParamsEntry.h
-target/snmpTargetParamsEntry.lo: ../var_struct.h
-target/target_counters.lo: ../agent_handler.h ../agent_read_config.h
-target/target_counters.lo: ../agent_registry.h ../agent_trap.h
-target/target_counters.lo: ../helpers/instance.h mibincl.h ../snmp_agent.h
-target/target_counters.lo: ../snmp_vars.h target/target_counters.h
-target/target_counters.lo: ../var_struct.h
-target/target.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-target/target.lo: ../agent_trap.h mibincl.h ../snmp_agent.h ../snmp_vars.h
-target/target.lo: target/snmpTargetAddrEntry.h target/snmpTargetParamsEntry.h
-target/target.lo: target/target.h
-target/target.lo: ../var_struct.h
-ucd-snmp/disk.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-ucd-snmp/disk.lo: ../agent_trap.h ../auto_nlist.h mibdefs.h mibincl.h
-ucd-snmp/disk.lo: ../snmp_agent.h ../snmp_vars.h struct.h ucd-snmp/disk.h
-ucd-snmp/disk.lo: ucd-snmp/errormib.h
-ucd-snmp/disk.lo: util_funcs.h ../var_struct.h
-ucd-snmp/dlmod.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/dlmod.lo: ../agent_registry.h ../agent_trap.h mibincl.h
-ucd-snmp/dlmod.lo: ../snmp_agent.h ../snmp_vars.h struct.h ucd-snmp/dlmod.h
-ucd-snmp/dlmod.lo: util_funcs.h ../var_struct.h
-ucd-snmp/errormib.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/errormib.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-ucd-snmp/errormib.lo: mibdefs.h mibincl.h ../snmp_agent.h ../snmp_vars.h
-ucd-snmp/errormib.lo: struct.h ucd-snmp/errormib.h
-ucd-snmp/errormib.lo: util_funcs.h ../var_struct.h
-ucd-snmp/extensible.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/extensible.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-ucd-snmp/extensible.lo: mibdefs.h mibincl.h ../snmp_agent.h ../snmp_vars.h
-ucd-snmp/extensible.lo: struct.h ucd-snmp/extensible.h
-ucd-snmp/extensible.lo: util_funcs.h ../var_struct.h
-ucd-snmp/file.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-ucd-snmp/file.lo: ../agent_trap.h mibdefs.h mibincl.h ../snmp_agent.h
-ucd-snmp/file.lo: ../snmp_vars.h struct.h ucd-snmp/file.h
-ucd-snmp/file.lo: util_funcs.h ../var_struct.h
-ucd-snmp/loadave.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/loadave.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-ucd-snmp/loadave.lo: ../kernel.h mibdefs.h mibincl.h ../snmp_agent.h
-ucd-snmp/loadave.lo: ../snmp_vars.h struct.h ucd-snmp/loadave.h
-ucd-snmp/loadave.lo: util_funcs.h ../var_struct.h
-ucd-snmp/memory.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/memory.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-ucd-snmp/memory.lo: mibdefs.h mibincl.h ../snmp_agent.h ../snmp_vars.h struct.h
-ucd-snmp/memory.lo: ucd-snmp/memory.h
-ucd-snmp/memory.lo: util_funcs.h ../var_struct.h
-ucd-snmp/pass.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-ucd-snmp/pass.lo: ../agent_trap.h mibdefs.h mibincl.h ../snmp_agent.h
-ucd-snmp/pass.lo: ../snmp_vars.h struct.h ucd-snmp/extensible.h ucd-snmp/pass.h
-ucd-snmp/pass.lo: util_funcs.h ../var_struct.h
-ucd-snmp/pass_persist.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/pass_persist.lo: ../agent_registry.h ../agent_trap.h mibdefs.h
-ucd-snmp/pass_persist.lo: mibincl.h ../snmp_agent.h ../snmp_vars.h struct.h
-ucd-snmp/pass_persist.lo: ucd-snmp/extensible.h ucd-snmp/pass_persist.h
-ucd-snmp/pass_persist.lo: util_funcs.h ../var_struct.h
-ucd-snmp/proc.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-ucd-snmp/proc.lo: ../agent_trap.h ../kernel.h mibdefs.h mibincl.h
-ucd-snmp/proc.lo: ../snmp_agent.h ../snmp_vars.h struct.h ucd-snmp/errormib.h
-ucd-snmp/proc.lo: ucd-snmp/proc.h
-ucd-snmp/proc.lo: util_funcs.h ../var_struct.h
-ucd-snmp/proxy.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/proxy.lo: ../agent_registry.h ../agent_trap.h mibincl.h
-ucd-snmp/proxy.lo: ../snmp_agent.h ../snmp_vars.h ucd-snmp/proxy.h
-ucd-snmp/proxy.lo: ../var_struct.h
-ucd-snmp/registry.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/registry.lo: ../agent_registry.h ../agent_trap.h mibincl.h
-ucd-snmp/registry.lo: ../snmp_agent.h ../snmp_vars.h ucd-snmp/registry.h
-ucd-snmp/registry.lo: ../var_struct.h
-ucd-snmp/versioninfo.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/versioninfo.lo: ../agent_registry.h ../agent_trap.h mibdefs.h
-ucd-snmp/versioninfo.lo: mibincl.h ../snmp_agent.h ../snmp_vars.h struct.h
-ucd-snmp/versioninfo.lo: ucd-snmp/versioninfo.h
-ucd-snmp/versioninfo.lo: util_funcs.h ../var_struct.h
-ucd-snmp/vmstat.lo: ../agent_handler.h ../agent_read_config.h
-ucd-snmp/vmstat.lo: ../agent_registry.h ../agent_trap.h ../auto_nlist.h
-ucd-snmp/vmstat.lo: mibdefs.h mibincl.h ../snmp_agent.h ../snmp_vars.h struct.h
-ucd-snmp/vmstat.lo: ucd-snmp/vmstat.h
-ucd-snmp/vmstat.lo: util_funcs.h ../var_struct.h
-util_funcs.lo: ../agent_handler.h ../agent_read_config.h ../agent_registry.h
-util_funcs.lo: ../agent_trap.h ../../include/net-snmp/net-snmp-config.h ../../m/generic.h mibdefs.h
-util_funcs.lo: mibincl.h ../../mib_module_config.h ../../s/generic.h
-util_funcs.lo: ../../s/linux.h ../snmp_agent.h ../../snmplib/asn1.h
-util_funcs.lo: ../../snmplib/callback.h ../../snmplib/data_list.h
-util_funcs.lo: ../../snmplib/getopt.h ../../snmplib/mib.h
-util_funcs.lo: ../../snmplib/read_config.h ../../snmplib/snmp_alarm.h
-util_funcs.lo: ../../snmplib/snmp_api.h ../../snmplib/snmp_client.h
-util_funcs.lo: ../../snmplib/snmp_debug.h ../../snmplib/snmp.h
-util_funcs.lo: ../../snmplib/snmp_impl.h ../../snmplib/snmp_logging.h
-util_funcs.lo: ../../snmplib/system.h ../../snmplib/tools.h ../snmp_vars.h
-util_funcs.lo: ../../s/sysv.h struct.h ucd-snmp/errormib.h
-util_funcs.lo: util_funcs.h ../var_struct.h
diff --git a/agent/mibgroup/agent/nsTransactionTable.c b/agent/mibgroup/agent/nsTransactionTable.c
index 5031862..3706311 100644
--- a/agent/mibgroup/agent/nsTransactionTable.c
+++ b/agent/mibgroup/agent/nsTransactionTable.c
@@ -4,8 +4,8 @@
#include <net-snmp/net-snmp-config.h>
#include "mibincl.h"
-#include <helpers/table.h>
-#include <helpers/table_iterator.h>
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/table_iterator.h>
#include "nsTransactionTable.h"
/** Initialize the nsTransactionTable table by defining it's contents
diff --git a/agent/mibgroup/mibII/vacm_context.c b/agent/mibgroup/mibII/vacm_context.c
index eb8301e..41b5d20 100644
--- a/agent/mibgroup/mibII/vacm_context.c
+++ b/agent/mibgroup/mibII/vacm_context.c
@@ -12,8 +12,8 @@
#include "snmp_api.h"
#include "snmp_client.h"
-#include "helpers/table.h"
-#include "helpers/table_iterator.h"
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/table_iterator.h>
static oid vacm_context_oid[] = {1,3,6,1,6,3,16,1,1};
diff --git a/agent/mibgroup/target/target_counters.c b/agent/mibgroup/target/target_counters.c
index 0f18c10..bce043f 100644
--- a/agent/mibgroup/target/target_counters.c
+++ b/agent/mibgroup/target/target_counters.c
@@ -12,7 +12,7 @@
#include "snmp_api.h"
#include "snmp_client.h"
-#include "helpers/instance.h"
+#include <net-snmp/agent/instance.h>
static oid unavailable_context_oid[] = {1,3,6,1,6,3,12,1,4,0};
static oid unknown_context_oid[] = {1,3,6,1,6,3,12,1,5,0};
diff --git a/agent/mibgroup/testdelayed.c b/agent/mibgroup/testdelayed.c
index 44fb10f..f6d71fc 100644
--- a/agent/mibgroup/testdelayed.c
+++ b/agent/mibgroup/testdelayed.c
@@ -13,9 +13,9 @@
#include "snmp_alarm.h"
#include "snmp_api.h"
-#include "helpers/table.h"
-#include "helpers/instance.h"
-#include "helpers/serialize.h"
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/instance.h>
+#include <net-snmp/agent/serialize.h>
static oid my_delayed_oid[5] = {1,2,3,99,1};
diff --git a/agent/mibgroup/testhandler.c b/agent/mibgroup/testhandler.c
index bbdf984..15d2d41 100644
--- a/agent/mibgroup/testhandler.c
+++ b/agent/mibgroup/testhandler.c
@@ -12,10 +12,10 @@
#include "snmp_api.h"
#include "snmp_client.h"
-#include "helpers/table.h"
-#include "helpers/instance.h"
-#include "helpers/table_data.h"
-#include "helpers/table_dataset.h"
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/instance.h>
+#include <net-snmp/agent/table_data.h>
+#include <net-snmp/agent/table_dataset.h>
static oid my_test_oid[4] = {1,2,3,4};
static oid my_table_oid[4] = {1,2,3,5};
diff --git a/agent/snmp_vars.c b/agent/snmp_vars.c
index a3e3cfd..a18254f 100644
--- a/agent/snmp_vars.c
+++ b/agent/snmp_vars.c
@@ -137,7 +137,7 @@
#include "callback.h"
#include "snmp_alarm.h"
#include "snmpd.h"
-#include "helpers/all_helpers.h"
+#include "net-snmp/agent/all_helpers.h"
#include "mib_module_includes.h"
#ifndef MIN
diff --git a/agent/snmpd.c b/agent/snmpd.c
index f6e323b..6d8d03b 100644
--- a/agent/snmpd.c
+++ b/agent/snmpd.c
@@ -164,8 +164,8 @@
#include "version.h"
-#include <helpers/table.h>
-#include <helpers/table_iterator.h>
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/table_iterator.h>
#include "mib_module_includes.h"
/*
diff --git a/include/net-snmp/agent/all_helpers.h b/include/net-snmp/agent/all_helpers.h
new file mode 100644
index 0000000..ccbf2a0
--- /dev/null
+++ b/include/net-snmp/agent/all_helpers.h
@@ -0,0 +1,21 @@
+#ifndef ALL_HANDLERS_H
+#define ALL_HANDLERS_H
+
+#include <net-snmp/agent/instance.h>
+#include <net-snmp/agent/multiplexer.h>
+#include <net-snmp/agent/null.h>
+#include <net-snmp/agent/debug_handler.h>
+#include <net-snmp/agent/old_api.h>
+#include <net-snmp/agent/read_only.h>
+#include <net-snmp/agent/serialize.h>
+#include <net-snmp/agent/bulk_to_next.h>
+/* #include <net-snmp/agent/set_helper.h> */
+#include <net-snmp/agent/table.h>
+#include <net-snmp/agent/table_data.h>
+#include <net-snmp/agent/table_dataset.h>
+#include <net-snmp/agent/table_iterator.h>
+/* #include <net-snmp/agent/table_array.h> */
+
+void init_helpers(void);
+
+#endif /* ALL_HANDLERS_H */
diff --git a/agent/helpers/bulk_to_next.h b/include/net-snmp/agent/bulk_to_next.h
similarity index 100%
rename from agent/helpers/bulk_to_next.h
rename to include/net-snmp/agent/bulk_to_next.h
diff --git a/agent/helpers/debug_handler.h b/include/net-snmp/agent/debug_handler.h
similarity index 100%
rename from agent/helpers/debug_handler.h
rename to include/net-snmp/agent/debug_handler.h
diff --git a/agent/helpers/instance.h b/include/net-snmp/agent/instance.h
similarity index 100%
rename from agent/helpers/instance.h
rename to include/net-snmp/agent/instance.h
diff --git a/agent/helpers/multiplexer.h b/include/net-snmp/agent/multiplexer.h
similarity index 100%
rename from agent/helpers/multiplexer.h
rename to include/net-snmp/agent/multiplexer.h
diff --git a/agent/helpers/null.h b/include/net-snmp/agent/null.h
similarity index 100%
rename from agent/helpers/null.h
rename to include/net-snmp/agent/null.h
diff --git a/agent/helpers/old_api.h b/include/net-snmp/agent/old_api.h
similarity index 100%
rename from agent/helpers/old_api.h
rename to include/net-snmp/agent/old_api.h
diff --git a/agent/helpers/read_only.h b/include/net-snmp/agent/read_only.h
similarity index 100%
rename from agent/helpers/read_only.h
rename to include/net-snmp/agent/read_only.h
diff --git a/agent/helpers/serialize.h b/include/net-snmp/agent/serialize.h
similarity index 100%
rename from agent/helpers/serialize.h
rename to include/net-snmp/agent/serialize.h
diff --git a/agent/helpers/set_helper.h b/include/net-snmp/agent/set_helper.h
similarity index 100%
rename from agent/helpers/set_helper.h
rename to include/net-snmp/agent/set_helper.h
diff --git a/agent/helpers/table.h b/include/net-snmp/agent/table.h
similarity index 100%
rename from agent/helpers/table.h
rename to include/net-snmp/agent/table.h
diff --git a/agent/helpers/table_array.h b/include/net-snmp/agent/table_array.h
similarity index 100%
rename from agent/helpers/table_array.h
rename to include/net-snmp/agent/table_array.h
diff --git a/agent/helpers/table_data.h b/include/net-snmp/agent/table_data.h
similarity index 100%
rename from agent/helpers/table_data.h
rename to include/net-snmp/agent/table_data.h
diff --git a/agent/helpers/table_dataset.h b/include/net-snmp/agent/table_dataset.h
similarity index 100%
rename from agent/helpers/table_dataset.h
rename to include/net-snmp/agent/table_dataset.h
diff --git a/agent/helpers/table_iterator.h b/include/net-snmp/agent/table_iterator.h
similarity index 100%
rename from agent/helpers/table_iterator.h
rename to include/net-snmp/agent/table_iterator.h
