diff --git a/crypto/thread/build.info b/crypto/thread/build.info
index 1e9b97d48a..8b9cc54af3 100644
--- a/crypto/thread/build.info
+++ b/crypto/thread/build.info
@@ -1,9 +1,16 @@
 LIBS=../../libcrypto
 
 IF[{- !$disabled{'thread-pool'} -}]
-  $THREADS=\
-        api.c internal.c arch.c \
+  $THREADS_ARCH=\
+        arch.c  \
         arch/thread_win.c arch/thread_posix.c arch/thread_none.c
+
+  $THREADS=\
+        api.c internal.c $THREADS_ARCH
+
+  IF[{- !$disabled{quic} -}]
+    SHARED_SOURCE[../../libssl]=$THREADS_ARCH
+  ENDIF
 ELSE
   $THREADS=api.c
 ENDIF
diff --git a/ssl/build.info b/ssl/build.info
index 4b43a4ce01..00e9e8fd7d 100644
--- a/ssl/build.info
+++ b/ssl/build.info
@@ -33,13 +33,4 @@ ENDIF
 
 IF[{- !$disabled{quic} -}]
   SOURCE[../libssl]=priority_queue.c event_queue.c
-
-  IF[{- !$disabled{'thread-pool'} -}]
-    SHARED_SOURCE[../libssl]=\
-      ../crypto/thread/arch/thread_posix.c \
-      ../crypto/thread/arch/thread_win.c \
-      ../crypto/thread/arch/thread_none.c \
-      ../crypto/thread/arch.c
-  ENDIF
-
 ENDIF