diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 2c63d3c1a..32629613d 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -188,7 +188,7 @@ jobs:
               -DBUILD_SHARED_LIBS=OFF
               -DCMAKE_CXX_COMPILER=clang-cl
               -DCMAKE_C_COMPILER=clang-cl
-              -DCMAKE_CXX_FLAGS="/source-charset:utf-8"
+              -DCMAKE_CXX_FLAGS="/source-charset:utf-8 /DUNICODE /D_UNICODE"
             testargs: >
               -GNinja
               -DCMAKE_BUILD_TYPE=Release
@@ -275,6 +275,7 @@ jobs:
       run: |
         tar -zxf libint*tgz
         ls -l libint-2*/src/CR_*
+        cat libint-2*/srclist.cmake
         mkdir libint && mv libint-2*/* libint/ && cd libint/
         cmake \
           -S. \
diff --git a/export/Makefile b/export/Makefile
index 64fb24d0f..e562daae3 100644
--- a/export/Makefile
+++ b/export/Makefile
@@ -102,7 +102,5 @@ exportdir::
 	-$(INSTALL) $(INSTALLLIBOPT) $(SRCDIR)/cmake/hftest.cmake $(TOPDIR)/$(EXPORTDIR)/cmake/hftest.cmake
 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/$(EXPORTDIR)/cmake/modules
 	-$(INSTALL) $(INSTALLLIBOPT) $(SRCDIR)/cmake/modules/*.cmake $(TOPDIR)/$(EXPORTDIR)/cmake/modules
-	echo "set(LIBINT2_LIBRARY_CXX_SRC" > $(TOPDIR)/$(EXPORTDIR)/srclist.cmake
 	ls $(TOPDIR)/$(EXPORTDIR)/src >> $(TOPDIR)/$(EXPORTDIR)/srclist.cmake
-	echo ")" >> $(TOPDIR)/$(EXPORTDIR)/srclist.cmake
 	cp -Rap $(SRCTOPDIR)/python $(TOPDIR)/$(EXPORTDIR)/
diff --git a/export/cmake/CMakeLists.txt.export b/export/cmake/CMakeLists.txt.export
index 87fc75cbd..9b88a43b8 100644
--- a/export/cmake/CMakeLists.txt.export
+++ b/export/cmake/CMakeLists.txt.export
@@ -188,9 +188,10 @@ set(LIBINT2_INSTALL_CMAKEDIR "lib/cmake/libint2"
 
 # Libint library =======================================================================================================
 
-include(srclist.cmake)
+file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/srclist.cmake" LIBINT2_LIBRARY_CXX_SRC ENCODING UTF-8)
 set(LIB_CXX_SRC )
 foreach(FN IN LISTS LIBINT2_LIBRARY_CXX_SRC)
+    message(WARNING "found source file src/${FN}")
     list(APPEND LIB_CXX_SRC "src/${FN}")
 endforeach()
 # Create object files to use for static and shared libraries
@@ -203,7 +204,7 @@ target_compile_features(libint2_obj PUBLIC "cxx_std_11")
 set_target_properties(
   libint2_obj
   PROPERTIES
-    UNITY_BUILD TRUE
+    UNITY_BUILD FALSE
   )
 if (TARGET MPFR::GMPXX)
   target_link_libraries(libint2_obj PUBLIC MPFR::GMPXX)