Index: osm_files.c
===================================================================
--- osm_files.c	(revision 5788)
+++ osm_files.c	(working copy)
@@ -1,126 +1,78 @@
+#include <main.c>
+#include <osm_console.c>
+#include <osm_console_io.c>
 #include <osm_db_files.c>
+#include <osm_helper.c>
 #include <osm_db_pack.c>
-#include <osm_fwd_tbl.c>
+#include <osm_dump.c>
+#include <osm_event_plugin.c>
 #include <osm_inform.c>
 #include <osm_lid_mgr.c>
-#include <osm_lin_fwd_rcv.c>
-#include <osm_lin_fwd_rcv_ctrl.c>
-#include <osm_lin_fwd_tbl.c>
-
+#include <osm_prtn.c>
 #include <osm_link_mgr.c>
-#include <osm_matrix.c>
+#include <osm_lin_fwd_rcv.c>
+#include <osm_log.c>
+#include <osm_mad_pool.c>
 #include <osm_mcast_fwd_rcv.c>
-#include <osm_mcast_fwd_rcv_ctrl.c>
 #include <osm_mcast_mgr.c>
 #include <osm_mcast_tbl.c>
-#include <osm_mcm_info.c>
 #include <osm_mcm_port.c>
+#include <osm_mesh.c>
 #include <osm_mtree.c>
 #include <osm_multicast.c>
 #include <osm_node.c>
 #include <osm_node_desc_rcv.c>
-#include <osm_node_desc_rcv_ctrl.c>
 #include <osm_node_info_rcv.c>
-#include <osm_node_info_rcv_ctrl.c>
 #include <osm_opensm.c>
+#include <osm_perfmgr.c>
+#include <osm_perfmgr_db.c>
 #include <osm_pkey.c>
 #include <osm_pkey_mgr.c>
-#include <osm_prtn.c>
 #include <osm_pkey_rcv.c>
-#include <osm_pkey_rcv_ctrl.c>
-#include <osm_qos.c>
 #include <osm_port.c>
 #include <osm_port_info_rcv.c>
-#include <osm_port_info_rcv_ctrl.c>
+#include <osm_qos.c>
+#include <osm_qos_policy.c>
 #include <osm_remote_sm.c>
 #include <osm_req.c>
-#include <osm_req_ctrl.c>
 #include <osm_resp.c>
-#include <osm_sa.c>
 #include <osm_router.c>
+#include <osm_sa.c>
 #include <osm_sa_class_port_info.c>
-#include <osm_sa_class_port_info_ctrl.c>
 #include <osm_sa_guidinfo_record.c>
-#include <osm_sa_guidinfo_record_ctrl.c>
 #include <osm_sa_informinfo.c>
-#include <osm_sa_informinfo_ctrl.c>
 #include <osm_sa_lft_record.c>
-#include <osm_sa_lft_record_ctrl.c>
 #include <osm_sa_link_record.c>
-#include <osm_sa_link_record_ctrl.c>
-
 #include <osm_sa_mad_ctrl.c>
-
-#include <osm_sa_mcmember_record_ctrl.c>
-
 #include <osm_sa_mft_record.c>
-
-#include <osm_sa_mft_record_ctrl.c>
-
+#include <osm_sa_multipath_record.c>
 #include <osm_sa_node_record.c>
-
-#include <osm_sa_node_record_ctrl.c>
-
-#include <osm_sa_path_record_ctrl.c>
-
 #include <osm_sa_pkey_record.c>
-
-#include <osm_sa_pkey_record_ctrl.c>
-
 #include <osm_sa_portinfo_record.c>
-
-#include <osm_sa_portinfo_record_ctrl.c>
-
-#include <osm_sa_response.c>
-
 #include <osm_sa_service_record.c>
-
-#include <osm_sa_service_record_ctrl.c>
-
 #include <osm_sa_slvl_record.c>
-
-#include <osm_sa_slvl_record_ctrl.c>
-
 #include <osm_sa_sminfo_record.c>
-
-#include <osm_sa_sminfo_record_ctrl.c>
-
 #include <osm_sa_sw_info_record.c>
-
-#include <osm_sa_sw_info_record_ctrl.c>
-
 #include <osm_sa_vlarb_record.c>
-
-#include <osm_sa_vlarb_record_ctrl.c>
-
 #include <osm_service.c>
-
 #include <osm_slvl_map_rcv.c>
-
-#include <osm_slvl_map_rcv_ctrl.c>
-
 #include <osm_sm.c>
 #include <osm_sminfo_rcv.c>
-#include <osm_sminfo_rcv_ctrl.c>
 #include <osm_sm_mad_ctrl.c>
 #include <osm_sm_state_mgr.c>
 #include <osm_state_mgr.c>
-#include <osm_state_mgr_ctrl.c>
 #include <osm_subnet.c>
-#include <osm_sweep_fail_ctrl.c>
-#include <osm_sw_info_rcv.c>
-#include <osm_sw_info_rcv_ctrl.c>
 #include <osm_switch.c>
+#include <osm_sw_info_rcv.c>
 #include <osm_trap_rcv.c>
-#include <osm_trap_rcv_ctrl.c>
-#include <osm_ucast_mgr.c>
-#include <osm_ucast_updn.c>
+#include <osm_ucast_cache.c>
 #include <osm_ucast_file.c>
 #include <osm_ucast_ftree.c>
+#include <osm_ucast_lash.c>
+#include <osm_ucast_mgr.c>
+#include <osm_ucast_updn.c>
 #include <osm_vl15intf.c>
 #include <osm_vl_arb_rcv.c>
-#include <osm_vl_arb_rcv_ctrl.c>
 #include <st.c>
-#include <main.c>
-#include <cl_event_wheel.c>
-#include <cl_dispatcher.c>
+#include <osm_drop_mgr.c>
+#include <osm_prtn_config.c>
Index: SOURCES
===================================================================
--- SOURCES	(revision 5788)
+++ SOURCES	(working copy)
@@ -25,92 +25,11 @@
 SOURCES=\
 	osm.mc \
 	opensm.rc \
-	main.c \
-	osm_console.c \
-	osm_console_io.c \
-	osm_db_files.c \
-	osm_helper.c \
-	osm_db_pack.c \
-	osm_drop_mgr.c \
-	osm_dump.c \
-	osm_event_plugin.c \
-	osm_inform.c \
-	osm_lid_mgr.c \
-	osm_link_mgr.c \
-	osm_lin_fwd_rcv.c \
-	osm_log.c \
-	osm_mad_pool.c \
-	osm_mcast_fwd_rcv.c \
-	osm_mcast_mgr.c \
-	osm_mcast_tbl.c \
-	osm_mcm_port.c \
-	osm_mesh.c \
-	osm_mtree.c \
-	osm_multicast.c \
-	osm_node.c \
-	osm_node_desc_rcv.c \
-	osm_node_info_rcv.c \
-	osm_opensm.c \
-	osm_perfmgr.c \
-	osm_perfmgr_db.c \
-	osm_pkey.c \
-	osm_pkey_mgr.c \
-	osm_pkey_rcv.c \
-	osm_port.c \
-	osm_port_info_rcv.c \
-	osm_prtn.c \
-	osm_prtn_config.c \
-	osm_qos.c \
-	osm_qos_parser_y.c \
-	osm_qos_parser_l.c \
-	osm_qos_policy.c \
-	osm_remote_sm.c \
-	osm_req.c \
-	osm_resp.c \
-	osm_router.c \
-	osm_sa.c \
-	osm_sa_class_port_info.c \
-	osm_sa_guidinfo_record.c \
-	osm_sa_informinfo.c \
-	osm_sa_lft_record.c \
-	osm_sa_link_record.c \
-	osm_sa_mad_ctrl.c \
-	osm_sa_mcmember_record.c \
-	osm_sa_mft_record.c \
-	osm_sa_multipath_record.c \
-	osm_sa_node_record.c \
-	osm_sa_path_record.c \
-	osm_sa_pkey_record.c \
-	osm_sa_portinfo_record.c \
-	osm_sa_service_record.c \
-	osm_sa_slvl_record.c \
-	osm_sa_sminfo_record.c \
-	osm_sa_sw_info_record.c \
-	osm_sa_vlarb_record.c \
-	osm_service.c \
-	osm_slvl_map_rcv.c \
-	osm_sm.c \
-	osm_sminfo_rcv.c \
-	osm_sm_mad_ctrl.c \
-	osm_sm_state_mgr.c \
-	osm_state_mgr.c \
-	osm_subnet.c \
-	osm_switch.c \
-	osm_sw_info_rcv.c \
-	osm_trap_rcv.c \
-	osm_ucast_cache.c \
-	osm_ucast_file.c \
-	osm_ucast_ftree.c \
-	osm_ucast_lash.c \
-	osm_ucast_mgr.c \
-	osm_ucast_updn.c \
-	osm_vl15intf.c \
-	osm_vl_arb_rcv.c \
-	st.c \
-	osm_drop_mgr.c \
-	osm_prtn_config.c \
-	osm_sa_mcmember_record.c \
-	osm_sa_path_record.c
+        osm_qos_parser_y.c\
+        osm_qos_parser_l.c\
+        osm_sa_mcmember_record.c\
+        osm_sa_path_record.c\
+        osm_files.c
 
 OSM_HOME=..