diff --git a/include/chameleon/runtime_struct.h b/include/chameleon/runtime_struct.h
index e0282d6ae2cd5f51885db2ba684c5b8fcf887c8c..362af6e865f2552c618fd0c21192eb5c3e6cbe89 100644
--- a/include/chameleon/runtime_struct.h
+++ b/include/chameleon/runtime_struct.h
@@ -23,6 +23,13 @@
 #ifndef _chameleon_runtime_struct_h_
 #define _chameleon_runtime_struct_h_
 
+#include "chameleon/types.h"
+
+BEGIN_C_DECLS
+
+/**
+ * Datatype for distributed version
+ */
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>
 #else
@@ -34,8 +41,6 @@ typedef uintptr_t MPI_Comm;
 #endif
 #endif
 
-BEGIN_C_DECLS
-
 /**
  * @brief Ids of the runtime supported by the RUNTIME API
  */
diff --git a/include/chameleon/struct.h b/include/chameleon/struct.h
index abcaade243c8df0b320eafb65bf4bda755beabca..053cddd61d7b2d95a448ffabea429047a9aa50fb 100644
--- a/include/chameleon/struct.h
+++ b/include/chameleon/struct.h
@@ -25,6 +25,8 @@
 #ifndef _chameleon_struct_h_
 #define _chameleon_struct_h_
 
+#include "chameleon/config.h"
+#include "chameleon/types.h"
 #include "chameleon/constants.h"
 
 BEGIN_C_DECLS
diff --git a/testing/test_fembem b/testing/test_fembem
index 5bfc9b0c5db8f1dc26ca1d100308ca087c7f662e..d7f570b31ed33023591d03f1b99a6dc1245b1549 160000
--- a/testing/test_fembem
+++ b/testing/test_fembem
@@ -1 +1 @@
-Subproject commit 5bfc9b0c5db8f1dc26ca1d100308ca087c7f662e
+Subproject commit d7f570b31ed33023591d03f1b99a6dc1245b1549