diff --git a/CMakeLists.txt b/CMakeLists.txt
index f30b99825fa64540bf18b92edddaa9f9ed660dbe..75e3c8fea58bf24da30862d4de35bbc72bbcfe73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -514,7 +514,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
     message(STATUS "         STARPU_LIBRARIES          = ${STARPU_LIBRARIES}")
     if (STARPU_INCLUDE_DIRS)
       message(STATUS "         STARPU_INCLUDES           = ${STARPU_INCLUDE_DIRS}")
-      set(SCALFMM_INCLUDES  "${SCALFMM_INCLUDES}; ${STARPU_INCLUDE_DIRS}")
+      set(SCALFMM_INCLUDES  "${SCALFMM_INCLUDES}; ${STARPU_INCLUDE_DIRS}; /home/stanisic/Work/simgrid/build/include")
     endif()
 
     # TODO: replace this by a component of find starpu
diff --git a/Src/GroupTree/StarPUUtils/FStarPUCpuWrapper.hpp b/Src/GroupTree/StarPUUtils/FStarPUCpuWrapper.hpp
index 951b7d9e5e30d297c5e6484a5c0f7d2f18b245eb..41c2293dd6da23f960f1a66de441d22c0d80e590 100644
--- a/Src/GroupTree/StarPUUtils/FStarPUCpuWrapper.hpp
+++ b/Src/GroupTree/StarPUUtils/FStarPUCpuWrapper.hpp
@@ -28,7 +28,7 @@
 
 #if defined(STARPU_USE_MPI) && defined(SCALFMM_USE_MPI)
 //extern "C"{
-#include <starpu_mpi.h>
+//#include <starpu_mpi.h>
 //}
 #endif
 
diff --git a/Tests/GroupTree/testBlockedUniform.cpp b/Tests/GroupTree/testBlockedUniform.cpp
index 29c3535df9fb6c34ed80eee8e27b98226b27bef9..a28bbc40255a98d158b93f2da55ad089f85c7e13 100644
--- a/Tests/GroupTree/testBlockedUniform.cpp
+++ b/Tests/GroupTree/testBlockedUniform.cpp
@@ -45,6 +45,7 @@
 
 #define RANDOM_PARTICLES
 
+extern "C" {
 int main(int argc, char* argv[]){
     const FParameterNames LocalOptionBlocSize { {"-bs"}, "The size of the block of the blocked tree"};
     const FParameterNames LocalOptionNoValidate { {"-no-validation"}, "To avoid comparing with direct computation"};
@@ -199,4 +200,4 @@ int main(int argc, char* argv[]){
 
     return 0;
 }
-
+}