@@ -21,26 +21,38 @@
 ;;======================================================================
 ;;   All the crud that was in megatest.scm
 ;;======================================================================
 
 (declare (unit mtbody))
-(declare (uses debugprint))
-(declare (uses mtargs))
+
+(declare (uses apimod))
+(declare (uses archivemod))
 (declare (uses commonmod))
 (declare (uses configfmod))
-(declare (uses dbmod))
 (declare (uses dbfile))
+(declare (uses dbmod))
+(declare (uses debugprint))
+(declare (uses diff-report))
 (declare (uses envmod))
-(declare (uses apimod))
+(declare (uses fsmod))
 (declare (uses genexample))
-(declare (uses rmtmod))
-(declare (uses archivemod))
+(declare (uses launchmod))
+(declare (uses megatestmod))
+(declare (uses mtargs))
+(declare (uses mtmod))
 (declare (uses mutils))
 (declare (uses odsmod))
-(declare (uses testsmod))
-(declare (uses diff-report))
+(declare (uses portlogger))
+(declare (uses processmod))
+(declare (uses rmtmod))
+(declare (uses runsmod))
+(declare (uses servermod))
+(declare (uses stml2))
+(declare (uses tasksmod))
+(declare (uses tcp-transportmod))
 (declare (uses tdb))
+(declare (uses testsmod))
 
 (use srfi-69)
 (import csi)
 
 (module mtbody