diff --git a/collects/net/cgi.ss b/collects/net/cgi.ss
index 7308ab2d64..db770679d9 100644
--- a/collects/net/cgi.ss
+++ b/collects/net/cgi.ss
@@ -1,5 +1,8 @@
-(require-library "macro.ss")
 
 (require-library "cgiu.ss" "net")
 
-(invoke-open-unit/sig mzlib:cgi@ #f)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:cgi^
+  mzlib:cgi@)
diff --git a/collects/net/dns.ss b/collects/net/dns.ss
index db2b431d7f..3dff1a084c 100644
--- a/collects/net/dns.ss
+++ b/collects/net/dns.ss
@@ -1,5 +1,7 @@
 
-
 (require-relative-library "dnss.ss")
 
-(invoke-open-unit/sig (require-relative-library "dnsr.ss"))
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig (require-relative-library "dnsr.ss"))
diff --git a/collects/net/imap.ss b/collects/net/imap.ss
index 4f1c5c2bf3..844c484245 100644
--- a/collects/net/imap.ss
+++ b/collects/net/imap.ss
@@ -1,4 +1,8 @@
 
 (require-relative-library "imaps.ss")
 
-(invoke-open-unit/sig (require-relative-library "imapr.ss"))
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:imap^
+  (require-relative-library "imapr.ss"))
diff --git a/collects/net/nntp.ss b/collects/net/nntp.ss
index 5e6ae32947..0050f26a6d 100644
--- a/collects/net/nntp.ss
+++ b/collects/net/nntp.ss
@@ -1,3 +1,8 @@
 (require-library "nntpu.ss" "net")
 
-(invoke-open-unit/sig mzlib:nntp@ nntp)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:nntp^
+  mzlib:nntp@
+  nntp)
diff --git a/collects/net/pop3.ss b/collects/net/pop3.ss
index a6c21c81c5..b91822c818 100644
--- a/collects/net/pop3.ss
+++ b/collects/net/pop3.ss
@@ -1,6 +1,10 @@
 (require-library "pop3u.ss" "net")
 
-(invoke-open-unit/sig mzlib:pop3@ pop3)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:pop3^
+  mzlib:pop3@ pop3)
 
 #|
 
diff --git a/collects/net/smtp.ss b/collects/net/smtp.ss
index 07794a0576..28da5346bb 100644
--- a/collects/net/smtp.ss
+++ b/collects/net/smtp.ss
@@ -1,4 +1,8 @@
 
 (require-relative-library "smtps.ss")
 
-(invoke-open-unit/sig (require-relative-library "smtpr.ss"))
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:smtp^
+  (require-relative-library "smtpr.ss"))