@@ -15,19 +15,34 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 (declare (unit diff-report))
-(declare (uses common))
+;; (declare (uses common))
 (declare (uses debugprint))
 (declare (uses rmtmod))
 (declare (uses commonmod))
-(import commonmod
+(declare (uses stml2))
+
+(module diff-report
+	*
+(import scheme
+	chicken
+	posix
+	debugprint
+	ports
+	srfi-1
+	srfi-13
+	srfi-69
+	data-structures
+
+	stml2
+	commonmod
 	rmtmod
-	debugprint)
+	)
          
-(include "common_records.scm")
+;; (include "common_records.scm")
 (use matchable)
 (use fmt)
 (use ducttape-lib)
 (define css "")
 
@@ -414,5 +429,6 @@
       #f)
      (else
       (diff:deliver-diff-report src-run-id dest-run-id email-recipients-list: to-list html-output-file: html-file)))))
 
   
+)