diff --git a/Tests/noDist/testBlockedAlgorithm.cpp b/Tests/noDist/testBlockedAlgorithm.cpp
index fe48ea2ac4a7cd9d376b63ed0695e18cce2dfe8f..7255892c5f4008ce802ab6cf9ad3faf0116b8b21 100644
--- a/Tests/noDist/testBlockedAlgorithm.cpp
+++ b/Tests/noDist/testBlockedAlgorithm.cpp
@@ -14,8 +14,13 @@
 #include "../../Src/Files/FRandomLoader.hpp"
 
 #include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
+#ifdef ScalFMM_USE_OMP4
 #include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#endif
+#ifdef ScalFMM_USE_STARPU
 #include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
+#endif
+#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
diff --git a/Tests/noDist/testBlockedChebyshev.cpp b/Tests/noDist/testBlockedChebyshev.cpp
index afa9dc86548f4e538d84d3949276b9fd0164a3f2..7f240e2cf3524832151bac234edf3dff95ecf460 100644
--- a/Tests/noDist/testBlockedChebyshev.cpp
+++ b/Tests/noDist/testBlockedChebyshev.cpp
@@ -1,3 +1,7 @@
+// ==== CMAKE =====
+// @FUSE_BLAS
+// ================
+
 #include "../../Src/Utils/FGlobal.hpp"
 
 #include "../../Src/GroupTree/FGroupTree.hpp"
@@ -20,8 +24,13 @@
 
 #include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
 #include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#ifdef ScalFMM_USE_OMP4
 #include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#endif
+#ifdef ScalFMM_USE_STARPU
 #include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
+#endif
+#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
diff --git a/Tests/noDist/testBlockedRotation.cpp b/Tests/noDist/testBlockedRotation.cpp
index 6cab437dafd7e8f08a682834383fafe6ed1a595b..e898ad294c8ca17f95e380037e2d941760212b54 100644
--- a/Tests/noDist/testBlockedRotation.cpp
+++ b/Tests/noDist/testBlockedRotation.cpp
@@ -19,8 +19,13 @@
 
 #include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
 #include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#ifdef ScalFMM_USE_OMP4
 #include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#endif
+#ifdef ScalFMM_USE_STARPU
 #include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
+#endif
+#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
diff --git a/Tests/noDist/testBlockedTree.cpp b/Tests/noDist/testBlockedTree.cpp
index 1b4e7544e53f1010a7f9ff0ec93528762c1c9256..79d2a29e92585d8950ab3b3092e47800362992c9 100644
--- a/Tests/noDist/testBlockedTree.cpp
+++ b/Tests/noDist/testBlockedTree.cpp
@@ -21,13 +21,17 @@
 #include "../../Src/Core/FFmmAlgorithm.hpp"
 #include "../../Src/Core/FFmmAlgorithmThread.hpp"
 #include "../../Src/Core/FFmmAlgorithmTask.hpp"
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
 
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 
 #include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
 #include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#ifdef ScalFMM_USE_OMP4
 #include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#endif
+#ifdef ScalFMM_USE_STARPU
+#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
+#endif
 #include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
diff --git a/Utils/noDist/FmmAlgorithmTsm.cpp b/Utils/noDist/FmmAlgorithmTsm.cpp
index b6aca3a0178e0bb59dc93fc6d2549e0e2ca9e181..f32ee7ffe643640d79844a4b47e1d328e8abb5de 100755
--- a/Utils/noDist/FmmAlgorithmTsm.cpp
+++ b/Utils/noDist/FmmAlgorithmTsm.cpp
@@ -17,6 +17,11 @@
 //
 //  Utils/Release/FmmAlgorithmTsm -N 2 -h 4
 //  plot "output.txt"  using ($1):(log10($3)) w l,"output.txt"  using ($1):(log10($4)) w l,"output.txt"  using ($1):(log10($5)) w l,"output.txt"  using ($1):(log10($6)) w l
+
+// ==== CMAKE =====
+// @FUSE_BLAS
+// ================
+
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -50,6 +55,7 @@
 
 #include "Files/FRandomLoader.hpp"
 
+
 struct sourcePart {
 	FPoint   position;
 	double physicalValue ;