@@ -15,11 +15,26 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables)
+(import sqlite3 srfi-1
+	;; posix
+	regex regex-case srfi-69
+	;; dot-locking
+	(srfi 18)
+	;; posix-extras directory-utils call-with-environment-variables
+  chicken.file
+  chicken.port
+  chicken.pretty-print
+  chicken.process
+  chicken.process-context.posix
+  chicken.string
+  chicken.time
+  chicken.condition
+  chicken.process-context
+  )
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit mt))
 (declare (uses db))
 (declare (uses common))