#include "common/macros.h"
#include "lib/object.h"
-#include <babeltrace2/graph/connection-const.h>
-#include <babeltrace2/graph/message-const.h>
+#include <babeltrace2/graph/connection.h>
+#include <babeltrace2/graph/message.h>
#include <babeltrace2/types.h>
#include "common/assert.h"
#include <stdbool.h>