@@ -14,20 +14,32 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-(include "mutils/mutils.scm")
-(include "autoload/autoload.scm")
-(include "dbi/dbi.scm")
-(include "stml2/cookie.scm")
-(include "stml2/stml2.scm")
-(include "pkts/pkts.scm")
+;;  megatest.scm mofiles/autoload.o mofiles/dbi.o mofiles/ducttape-lib.o
+;;  mofiles/pkts.o mofiles/stml2.o mofiles/cookie.o mofiles/mutils.o
+;;  mofiles/mtargs.o
+
+;; (include "mutils/mutils.scm")
+;; (include "autoload/autoload.scm")
+;; (include "dbi/dbi.scm")
+;; (include "stml2/cookie.scm")
+;; (include "stml2/stml2.scm")
+;; (include "pkts/pkts.scm")
 (include "csv-xml/csv-xml.scm")
-(include "ducttape/ducttape-lib.scm")
+;; (include "ducttape/ducttape-lib.scm")
 (include "hostinfo/hostinfo.scm")
 (include "adjutant.scm")
+
+(declare (uses mutils))
+(declare (uses autoload))
+(declare (uses pkts))
+(declare (uses ducttape-lib))
+(declare (uses stml2))
+(declare (uses cookie))
+(declare (uses mtargs))
 
 ;; (include "call-with-environment-variables/call-with-environment-variables.scm")
 
 (module megatest-main
 	*
@@ -76,11 +88,17 @@
 		sparse-vectors
 		sxml-serializer
 		sxml-modifications
 		system-information
 		z3
-		spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing
+		spiffy
+		uri-common
+		intarweb
+		http-client
+		spiffy-request-vars
+		intarweb
+		spiffy-directory-listing
 		
 		srfi-1
 		srfi-4
 		srfi-18
 		srfi-13