diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cb082a4..24d0c01 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -128,7 +128,7 @@ jobs:
       fail-fast: false
       matrix:
         disable_aad: ["ON", "OFF"]
-        cxx: ["17"]
+        cxx: ["17", "20"]
     runs-on: windows-2022
     env:
       vsvarsall: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
diff --git a/ql/qlrisks.hpp b/ql/qlrisks.hpp
index b3b3fc4..cb82b26 100644
--- a/ql/qlrisks.hpp
+++ b/ql/qlrisks.hpp
@@ -478,8 +478,6 @@ namespace boost {
 // MSVC specialisations / fixes
 #ifdef _MSC_VER
 
-#include <random>
-
 // required for random - as it calls ::sqrt on arguments
 using xad::sqrt;
 using xad::pow;
@@ -487,6 +485,8 @@ using xad::exp;
 using xad::log;
 using xad::tan;
 
+#include <random>
+
 namespace std {
 
     // this is needed to avoid std::random to revert to a binary / constexpr