diff --git a/collects/db/base.rkt b/collects/db/base.rkt
index fe626b3aa6..4a6e137a26 100644
--- a/collects/db/base.rkt
+++ b/collects/db/base.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          unstable/prop-contract)
 
 ;; ============================================================
diff --git a/collects/db/main.rkt b/collects/db/main.rkt
index 529b65cfea..ce4cd3502a 100644
--- a/collects/db/main.rkt
+++ b/collects/db/main.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require (for-syntax racket/base)
          unstable/lazy-require
-         racket/contract
+         racket/contract/base
          "base.rkt")
 (provide (all-from-out "base.rkt"))
 
diff --git a/collects/db/mysql.rkt b/collects/db/mysql.rkt
index 89779bc604..e2cf7cc75d 100644
--- a/collects/db/mysql.rkt
+++ b/collects/db/mysql.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          openssl
          "base.rkt"
          "private/mysql/main.rkt")
diff --git a/collects/db/odbc.rkt b/collects/db/odbc.rkt
index d1f752c962..4d88401b79 100644
--- a/collects/db/odbc.rkt
+++ b/collects/db/odbc.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          "base.rkt"
          "private/odbc/main.rkt")
 
diff --git a/collects/db/postgresql.rkt b/collects/db/postgresql.rkt
index e36267e82f..cfa93700b6 100644
--- a/collects/db/postgresql.rkt
+++ b/collects/db/postgresql.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          openssl
          "base.rkt"
          "private/postgresql/main.rkt")
diff --git a/collects/db/private/generic/dsn.rkt b/collects/db/private/generic/dsn.rkt
index 7b8595ae76..9d7fd11f43 100644
--- a/collects/db/private/generic/dsn.rkt
+++ b/collects/db/private/generic/dsn.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require unstable/lazy-require
-         racket/match
+         syntax/parse/private/minimatch
          racket/file
          racket/list)
 (provide dsn-connect
diff --git a/collects/db/private/generic/place-client.rkt b/collects/db/private/generic/place-client.rkt
index 2a6e458490..13e226ca15 100644
--- a/collects/db/private/generic/place-client.rkt
+++ b/collects/db/private/generic/place-client.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         racket/match
+         syntax/parse/private/minimatch
          racket/place
          racket/promise
          racket/serialize
diff --git a/collects/db/private/generic/place-server.rkt b/collects/db/private/generic/place-server.rkt
index 76de2701fe..f398873ed0 100644
--- a/collects/db/private/generic/place-server.rkt
+++ b/collects/db/private/generic/place-server.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require (for-syntax racket/base)
          racket/class
-         racket/match
+         syntax/parse/private/minimatch
          racket/place
          racket/serialize
          unstable/lazy-require
diff --git a/collects/db/private/generic/socket.rkt b/collects/db/private/generic/socket.rkt
index 5db8afad25..2745bdc4e8 100644
--- a/collects/db/private/generic/socket.rkt
+++ b/collects/db/private/generic/socket.rkt
@@ -1,17 +1,15 @@
 #lang racket/base
 (require ffi/unsafe
-         ffi/file
-         (rename-in racket/contract [-> c->]))
-(provide/contract
- [unix-socket-connect
-  (c-> path-string?
-       (values input-port? output-port?))])
+         ffi/file)
+(provide unix-socket-connect)
 
 ;; The solaris code is untested (and thus disabled).
 
 ;; unix-socket-connect : pathlike -> input-port output-port
 ;; Connects to the unix domain socket associated with the given path.
 (define (unix-socket-connect path0)
+  (unless (path-string? path0)
+    (raise-type-error 'unix-socket-connect "path or string" path0))
   (security-guard-check-file 'unix-socket-connect path0 '(read write))
   (let* ([path* (cleanse-path (path->complete-path path0))]
          [path-b (path->bytes path*)])
diff --git a/collects/db/sqlite3.rkt b/collects/db/sqlite3.rkt
index 26f17efc10..f3d5c91b83 100644
--- a/collects/db/sqlite3.rkt
+++ b/collects/db/sqlite3.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          "base.rkt"
          "private/sqlite3/main.rkt")