Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -172,11 +172,11 @@
 
 tests.o tasks.o dashboard-tasks.o : task_records.scm
 
 runs.o : test_records.scm
 
-megatest.o : megatest-fossil-hash.scm megatest-version.scm
+megatest.o : megatest-fossil-hash.scm megatest-version.scm *scm
 
 rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm
 
 common_records.scm : altdb.scm
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -30,10 +30,11 @@
 ;; (include "ducttape/ducttape-lib.scm")
 ;; (include "hostinfo/hostinfo.scm")
 ;; (include "adjutant.scm")
 
 (declare (uses autoload))
+(declare (uses dbi))
 (declare (uses pkts))
 (declare (uses stml2))
 (declare (uses cookie))
 (declare (uses csv-xml))
 (declare (uses hostinfo))

Index: pkts.scm
==================================================================
--- pkts.scm
+++ pkts.scm
@@ -17,7 +17,7 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit pkts))
-
+(declare (uses dbi))
 (include "pkts/pkts.scm")

Index: stml2.scm
==================================================================
--- stml2.scm
+++ stml2.scm
@@ -17,11 +17,9 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit stml2))
+(declare (uses cookie))
 
 (include "stml2/stml2.scm")
 
-(import stml2)
-
-(write "true")