@@ -14,21 +14,10 @@
 ;;     GNU General Public License for more details.
 ;; 
 ;;     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  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras)
-
-(use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
-
-;; Configurations for server
-(tcp-buffer-size 2048)
-(max-connections 2048) 
-
 (declare (unit http-transport))
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
@@ -37,10 +26,23 @@
 ;; (declare (uses daemon))
 (declare (uses portlogger))
 (declare (uses rmt))
 (declare (uses dbfile))
 (declare (uses commonmod))
+(declare (uses mtargs))
+
+(require-extension (srfi 18) extras tcp s11n)
+
+(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras)
+
+(use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
+
+(import (prefix mtargs args:))
+
+;; Configurations for server
+(tcp-buffer-size 2048)
+(max-connections 2048) 
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "js-path.scm")