diff --git a/tests/functionality/CMakeLists.txt b/tests/functionality/CMakeLists.txt
index 90aa72c9..16cd1ec7 100644
--- a/tests/functionality/CMakeLists.txt
+++ b/tests/functionality/CMakeLists.txt
@@ -36,10 +36,6 @@ if(RESOLVE_USE_CUDA)
     add_executable(klu_rf_fgmres_test.exe testKLU_Rf_FGMRES.cpp)
     target_link_libraries(klu_rf_fgmres_test.exe PRIVATE ReSolve)
 
-    add_library( FunctionalityTestHelper SHARED FunctionalityTestHelper.cpp )
-    # Captain! add_library for functionality test helper, build it, then link it here
-    target_include_directories( FunctionalityTestHelper PUBLIC ../.. )
-
     # System solver test with cusolver rf and iterative refinement
     add_executable(sys_refactor_cuda_test.exe testSysRefactor.cpp)
     target_link_libraries(sys_refactor_cuda_test.exe PRIVATE ReSolve FunctionalityTestHelper )
diff --git a/tests/functionality/FunctionalityTestHelper.cpp b/tests/functionality/FunctionalityTestHelper.cpp
index c702aaa1..66e61363 100644
--- a/tests/functionality/FunctionalityTestHelper.cpp
+++ b/tests/functionality/FunctionalityTestHelper.cpp
@@ -1,4 +1,15 @@
 #include "FunctionalityTestHelper.hpp"
+#include <resolve/vector/Vector.hpp>
+#include <resolve/matrix/io.hpp>
+#include <resolve/matrix/Coo.hpp>
+#include <resolve/matrix/Csr.hpp>
+#include <resolve/matrix/Csc.hpp>
+#include <resolve/matrix/MatrixHandler.hpp>
+#include <resolve/vector/VectorHandler.hpp>
+#include <resolve/LinSolverDirectKLU.hpp>
+#include <resolve/LinSolverIterativeFGMRES.hpp>
+#include <resolve/workspace/LinAlgWorkspace.hpp>
+#include <resolve/SystemSolver.hpp>
 
 namespace ReSolve 
 {