diff --git a/batch-driver.scm b/batch-driver.scm
index f994ae6..9b9ef4f 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -548,7 +548,15 @@
 		    (collect-options 'types))
 		   (for-each
 		    (lambda (id)
-		      (load-type-database (make-pathname #f (symbol->string id) "types")))
+		      (let ((types-filename (make-pathname #f (symbol->string id) "types")))
+		       (or
+			(load-type-database types-filename)
+			(and-let* ((tfile (##sys#resolve-include-filename 
+					   types-filename
+					   #f #t))
+				   ((file-exists? tfile)))
+			  (load-type-database types-filename
+					      (pathname-directory tfile))))))
 		    mreq)
 		   (begin-time)
 		   (set! first-analysis #f)