diff --git a/src/cell.h b/src/cell.h
index ef9881c664225488e47c6281e35c5388c1f1bc4c..184350901a02dd8b1ed2dfddbd425a3ac06c2d02 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -23,6 +23,9 @@
 #ifndef SWIFT_CELL_H
 #define SWIFT_CELL_H
 
+/* Config parameters. */
+#include "../config.h"
+
 /* Includes. */
 #include <stddef.h>
 
@@ -124,11 +127,13 @@ struct cell {
   /* The hierarchical tasks. */
   struct task *ghost, *init, *kick;
 
+#ifdef WITH_MPI
   /* Task receiving data. */
   struct task *recv_xv, *recv_rho, *recv_ti;
 
   /* Task send data. */
   struct link *send_xv, *send_rho, *send_ti;
+#endif
 
   /* Tasks for gravity tree. */
   struct task *grav_up, *grav_down;
diff --git a/src/engine.c b/src/engine.c
index fc8850d0cb1fb1648a313e90fa1273246d8c7711..42e7466f79a7e786cebd9cb5832f9f10e0c7641e 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1865,6 +1865,8 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
         }
       }
 
+#ifdef WITH_MPI
+
       /* Activate the send/recv flags. */
       if (ci->nodeID != engine_rank) {
 
@@ -1919,6 +1921,8 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
         if (l == NULL) error("Missing link to send_ti task.");
         l->t->skip = 0;
       }
+
+#endif
     }
 
     /* Kick? */