Index: plugins/snmp_bc/t/Makefile.am
===================================================================
--- plugins/snmp_bc/t/Makefile.am	(revision 7107)
+++ plugins/snmp_bc/t/Makefile.am	(working copy)
@@ -35,6 +35,18 @@
 		snmp_bc_watchdog.c \
 		snmp_bc_xml2event.c
 
+REMOTE_OPENHPID_SOURCES = \
+	   	../../../openhpid/config.c \
+        ../../../openhpid/domain.c \
+        ../../../openhpid/event.c \
+        ../../../openhpid/threaded.c \
+        ../../../openhpid/alarm.c \
+        ../../../openhpid/hotswap.c \
+        ../../../openhpid/lock.c \
+        ../../../openhpid/plugin.c \
+        ../../../openhpid/plugin_static.c \
+        ../../../openhpid/session.c
+
 MOSTLYCLEANFILES = @TEST_CLEAN@ $(REMOTE_SIM_SOURCES) uid_map
 MOSTLYCLEANFILES += $(GENERATED_CODE)
 
@@ -178,391 +190,391 @@
 check_PROGRAMS = $(TESTS)
 
 # Unit test using normal IF calls and simulation library
-tsim_file_SOURCES = tsim_file.c
+tsim_file_SOURCES = tsim_file.c $(REMOTE_OPENHPID_SOURCES)
 tsim_file_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 # Unit test using normal IF calls and simulation library
-tevent_SOURCES = tevent.c
+tevent_SOURCES = tevent.c $(REMOTE_OPENHPID_SOURCES)
 tevent_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 # Unit test using normal IF calls and simulation library
-tcontrol_parms_SOURCES = tcontrol_parms.c
+tcontrol_parms_SOURCES = tcontrol_parms.c $(REMOTE_OPENHPID_SOURCES)
 tcontrol_parms_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 # Unit test using normal IF calls and simulation library
-tset_resource_tag_SOURCES = tset_resource_tag.c
+tset_resource_tag_SOURCES = tset_resource_tag.c $(REMOTE_OPENHPID_SOURCES)
 tset_resource_tag_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 # Unit test using normal IF calls and simulation library
-tset_resource_sev_SOURCES = tset_resource_sev.c
+tset_resource_sev_SOURCES = tset_resource_sev.c $(REMOTE_OPENHPID_SOURCES)
 tset_resource_sev_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 # Unit test using normal IF calls and simulation library
-tsnmp_bc_getset_SOURCES = tsnmp_bc_getset.c
+tsnmp_bc_getset_SOURCES = tsnmp_bc_getset.c $(REMOTE_OPENHPID_SOURCES)
 tsnmp_bc_getset_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget001_SOURCES = tsensorget001.c
+tsensorget001_SOURCES = tsensorget001.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget002_SOURCES = tsensorget002.c
+tsensorget002_SOURCES = tsensorget002.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget002_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget003_SOURCES = tsensorget003.c
+tsensorget003_SOURCES = tsensorget003.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget003_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget004_SOURCES = tsensorget004.c
+tsensorget004_SOURCES = tsensorget004.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget004_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget005_SOURCES = tsensorget005.c
+tsensorget005_SOURCES = tsensorget005.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget005_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget010_SOURCES = tsensorget010.c
+tsensorget010_SOURCES = tsensorget010.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget010_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget013_SOURCES = tsensorget013.c
+tsensorget013_SOURCES = tsensorget013.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget013_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget016_SOURCES = tsensorget016.c
+tsensorget016_SOURCES = tsensorget016.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget016_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget031_SOURCES = tsensorget031.c
+tsensorget031_SOURCES = tsensorget031.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget031_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget033_SOURCES = tsensorget033.c
+tsensorget033_SOURCES = tsensorget033.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget033_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget034_SOURCES = tsensorget034.c
+tsensorget034_SOURCES = tsensorget034.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget034_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget035_SOURCES = tsensorget035.c
+tsensorget035_SOURCES = tsensorget035.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget035_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget036_SOURCES = tsensorget036.c
+tsensorget036_SOURCES = tsensorget036.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget036_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget040_SOURCES = tsensorget040.c
+tsensorget040_SOURCES = tsensorget040.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget040_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorget041_SOURCES = tsensorget041.c
+tsensorget041_SOURCES = tsensorget041.c $(REMOTE_OPENHPID_SOURCES)
 tsensorget041_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset001_SOURCES = tsensorset001.c
+tsensorset001_SOURCES = tsensorset001.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset002_SOURCES = tsensorset002.c
+tsensorset002_SOURCES = tsensorset002.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset002_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset003_SOURCES = tsensorset003.c
+tsensorset003_SOURCES = tsensorset003.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset003_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset004_SOURCES = tsensorset004.c
+tsensorset004_SOURCES = tsensorset004.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset004_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset005_SOURCES = tsensorset005.c
+tsensorset005_SOURCES = tsensorset005.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset005_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset006_SOURCES = tsensorset006.c
+tsensorset006_SOURCES = tsensorset006.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset006_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset007_SOURCES = tsensorset007.c
+tsensorset007_SOURCES = tsensorset007.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset007_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset008_SOURCES = tsensorset008.c
+tsensorset008_SOURCES = tsensorset008.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset008_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset009_SOURCES = tsensorset009.c
+tsensorset009_SOURCES = tsensorset009.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset009_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset010_SOURCES = tsensorset010.c
+tsensorset010_SOURCES = tsensorset010.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset010_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset011_SOURCES = tsensorset011.c
+tsensorset011_SOURCES = tsensorset011.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset011_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset012_SOURCES = tsensorset012.c
+tsensorset012_SOURCES = tsensorset012.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset012_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset013_SOURCES = tsensorset013.c
+tsensorset013_SOURCES = tsensorset013.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset013_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset015_SOURCES = tsensorset015.c
+tsensorset015_SOURCES = tsensorset015.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset015_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset017_SOURCES = tsensorset017.c
+tsensorset017_SOURCES = tsensorset017.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset017_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset018_SOURCES = tsensorset018.c
+tsensorset018_SOURCES = tsensorset018.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset018_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset019_SOURCES = tsensorset019.c
+tsensorset019_SOURCES = tsensorset019.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset019_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset020_SOURCES = tsensorset020.c
+tsensorset020_SOURCES = tsensorset020.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset020_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset021_SOURCES = tsensorset021.c
+tsensorset021_SOURCES = tsensorset021.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset021_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset022_SOURCES = tsensorset022.c
+tsensorset022_SOURCES = tsensorset022.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset022_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset023_SOURCES = tsensorset023.c
+tsensorset023_SOURCES = tsensorset023.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset023_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsensorset024_SOURCES = tsensorset024.c
+tsensorset024_SOURCES = tsensorset024.c $(REMOTE_OPENHPID_SOURCES)
 tsensorset024_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tel001_SOURCES = tel001.c
+tel001_SOURCES = tel001.c $(REMOTE_OPENHPID_SOURCES)
 tel001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tel002_SOURCES = tel002.c
+tel002_SOURCES = tel002.c $(REMOTE_OPENHPID_SOURCES)
 tel002_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tel003_SOURCES = tel003.c
+tel003_SOURCES = tel003.c $(REMOTE_OPENHPID_SOURCES)
 tel003_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tel004_SOURCES = tel004.c
+tel004_SOURCES = tel004.c $(REMOTE_OPENHPID_SOURCES)
 tel004_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tel005_SOURCES = tel005.c
+tel005_SOURCES = tel005.c $(REMOTE_OPENHPID_SOURCES)
 tel005_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tel006_SOURCES = tel006.c
+tel006_SOURCES = tel006.c $(REMOTE_OPENHPID_SOURCES)
 tel006_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tel007_SOURCES = tel007.c
+tel007_SOURCES = tel007.c $(REMOTE_OPENHPID_SOURCES)
 tel007_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tinv001_SOURCES = tinv001.c
+tinv001_SOURCES = tinv001.c $(REMOTE_OPENHPID_SOURCES)
 tinv001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tinv002_SOURCES = tinv002.c
+tinv002_SOURCES = tinv002.c $(REMOTE_OPENHPID_SOURCES)
 tinv002_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tinv003_SOURCES = tinv003.c
+tinv003_SOURCES = tinv003.c $(REMOTE_OPENHPID_SOURCES)
 tinv003_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tinv004_SOURCES = tinv004.c
+tinv004_SOURCES = tinv004.c $(REMOTE_OPENHPID_SOURCES)
 tinv004_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tinv005_SOURCES = tinv005.c
+tinv005_SOURCES = tinv005.c $(REMOTE_OPENHPID_SOURCES)
 tinv005_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tinv006_SOURCES = tinv006.c
+tinv006_SOURCES = tinv006.c $(REMOTE_OPENHPID_SOURCES)
 tinv006_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tinv007_SOURCES = tinv007.c
+tinv007_SOURCES = tinv007.c $(REMOTE_OPENHPID_SOURCES)
 tinv007_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-thotswap001_SOURCES = thotswap001.c
+thotswap001_SOURCES = thotswap001.c $(REMOTE_OPENHPID_SOURCES)
 thotswap001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-thotswap_mhs001_SOURCES = thotswap-mhs001.c
+thotswap_mhs001_SOURCES = thotswap-mhs001.c $(REMOTE_OPENHPID_SOURCES)
 thotswap_mhs001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-thotswap_simple001_SOURCES = thotswap-simple001.c
+thotswap_simple001_SOURCES = thotswap-simple001.c $(REMOTE_OPENHPID_SOURCES)
 thotswap_simple001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tpower001_SOURCES = tpower001.c
+tpower001_SOURCES = tpower001.c $(REMOTE_OPENHPID_SOURCES)
 tpower001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-treset001_SOURCES = treset001.c
+treset001_SOURCES = treset001.c $(REMOTE_OPENHPID_SOURCES)
 treset001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsptime001_SOURCES = tsptime001.c
+tsptime001_SOURCES = tsptime001.c $(REMOTE_OPENHPID_SOURCES)
 tsptime001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tsptime002_SOURCES = tsptime002.c
+tsptime002_SOURCES = tsptime002.c $(REMOTE_OPENHPID_SOURCES)
 tsptime002_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tdiscover001_SOURCES = tdiscover001.c
+tdiscover001_SOURCES = tdiscover001.c $(REMOTE_OPENHPID_SOURCES)
 tdiscover001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
@@ -574,24 +586,24 @@
 #		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tcontrol001_SOURCES = tcontrol001.c
+tcontrol001_SOURCES = tcontrol001.c $(REMOTE_OPENHPID_SOURCES)
 tcontrol001_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tcontrol002_SOURCES = tcontrol002.c
+tcontrol002_SOURCES = tcontrol002.c $(REMOTE_OPENHPID_SOURCES)
 tcontrol002_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
 #
-tcontrol003_SOURCES = tcontrol003.c
+tcontrol003_SOURCES = tcontrol003.c $(REMOTE_OPENHPID_SOURCES)
 tcontrol003_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la
 
-tcontrolfailover_SOURCES = tcontrolfailover.c
+tcontrolfailover_SOURCES = tcontrolfailover.c $(REMOTE_OPENHPID_SOURCES)
 tcontrolfailover_LDADD   = $(top_builddir)/utils/libopenhpiutils.la \
 		 $(top_builddir)/baselib/libopenhpi.la \
 		 $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la