@@ -15,25 +15,28 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-(require-extension (srfi 18) extras tcp s11n)
 
-(use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
-(import (prefix sqlite3 sqlite3:))
 
 (declare (unit portlogger))
-(declare (uses db))
-
+;; (declare (uses db))
 (declare (uses commonmod))
-(import commonmod)
-
 (declare (uses configfmod))
-(import configfmod)
-
 (declare (uses dbmod))
+
+(module portlogger
+	*
+
+(import scheme chicken data-structures extras ports)
+(import (srfi 18) extras tcp s11n)
+
+(use (prefix sqlite3 sqlite3:) srfi-1 posix srfi-69 hostinfo dot-locking z3)
+
+(import commonmod)
+(import configfmod)
 (import dbmod)
 
 ;; lsof -i
 
 (define (portlogger:open-db fname)
@@ -193,5 +196,7 @@
 	     ((failed)(portlogger:set-failed db (string->number (cadr args))) 'failed)))))
     (sqlite3:finalize! db)
     result))
      
 ;; (print (apply portlogger:main (cdr (argv))))
+
+)