#include <assert.h> // for assert
#include <time.h> // for timespec
-#include "frsh_core.h" // for frsh_contract_set_xxx
-#include "frsh_core_types.h" // for FRSH_NETWORK_ID_DEFAULT
-#include "frsh_distributed_types.h" // for frsh_network_address_t, frsh_stream_id_t
+#include "frsh.h" // for frsh_contract_set_xxx, FRSH_NETWORK_ID_DEFAULT, frsh_network_address_t, frsh_stream_id_t
#include "fna.h" // for fna_vres_id_t
#include "frsh_fna.h" // for frsh_rtep_*