-#include "src/surf/surf_interface.hpp"
-#include "smx_private.h"
-
-#include "src/kernel/activity/SynchroIo.hpp"
+#include "smx_private.hpp"
+#include "src/kernel/activity/IoImpl.hpp"
+#include "src/simix/smx_io_private.hpp"
+#include "src/surf/StorageImpl.hpp"