diff --git a/collects/net/imap.ss b/collects/net/imap.ss
index 844c484245..551218a4de 100644
--- a/collects/net/imap.ss
+++ b/collects/net/imap.ss
@@ -1,8 +1,11 @@
 
-(require-relative-library "imaps.ss")
+(module imap mzscheme
+  (import (lib "unitsig.ss"))
 
-(begin-elaboration-time
- (require-library "invoke.ss"))
+  (import "imap-sig.ss")
+  (import "imap-unit.ss")
 
-(define-values/invoke-unit/sig mzlib:imap^
-  (require-relative-library "imapr.ss"))
+  (define-values/invoke-unit/sig net:imap^
+    net:imap@)
+
+  (export-signature-elements net:imap^))
diff --git a/collects/net/smtp.ss b/collects/net/smtp.ss
index 28da5346bb..b3c169fc1c 100644
--- a/collects/net/smtp.ss
+++ b/collects/net/smtp.ss
@@ -1,8 +1,11 @@
 
-(require-relative-library "smtps.ss")
+(module smtp mzscheme
+  (import (lib "unitsig.ss"))
 
-(begin-elaboration-time
- (require-library "invoke.ss"))
+  (import "smtp-sig.ss")
+  (import "smtp-unit.ss")
 
-(define-values/invoke-unit/sig mzlib:smtp^
-  (require-relative-library "smtpr.ss"))
+  (define-values/invoke-unit/sig net:smtp^
+    net:smtp@)
+
+  (export-signature-elements net:smtp^))