diff --git a/cgi.d b/cgi.d
index dfcabdd..d73c51a 100644
--- a/cgi.d
+++ b/cgi.d
@@ -486,10 +486,6 @@ void main() {
 +/
 module arsd.cgi;
 
-static import arsd.core;
-version(Posix)
-import arsd.core : makeNonBlocking;
-
 // FIXME: Nullable!T can be a checkbox that enables/disables the T on the automatic form
 // and a SumType!(T, R) can be a radio box to pick between T and R to disclose the extra boxes on the automatic form
 
@@ -574,6 +570,11 @@ unittest {
 
 static import std.file;
 
+static import arsd.core;
+version(Posix)
+import arsd.core : makeNonBlocking;
+
+
 // for a single thread, linear request thing, use:
 // -version=embedded_httpd_threads -version=cgi_no_threads
 
diff --git a/http2.d b/http2.d
index 28f784f..9813a38 100644
--- a/http2.d
+++ b/http2.d
@@ -40,8 +40,6 @@
 +/
 module arsd.http2;
 
-static import arsd.core;
-
 ///
 unittest {
 	import arsd.http2;
@@ -61,6 +59,8 @@ unittest {
 	version(arsd_http2_integration_test) main(); // exclude from docs
 }
 
+static import arsd.core;
+
 // FIXME: I think I want to disable sigpipe here too.
 
 import std.uri : encodeComponent;