-#include <babeltrace/graph/message-inactivity-const.h>
-#include <babeltrace/graph/message-inactivity.h>
-#include <babeltrace/graph/message-packet-const.h>
-#include <babeltrace/graph/message-packet.h>
-#include <babeltrace/graph/message-stream-const.h>
-#include <babeltrace/graph/message-stream.h>
+#include <babeltrace/graph/message-iterator-const.h>
+#include <babeltrace/graph/message-message-iterator-inactivity-const.h>
+#include <babeltrace/graph/message-message-iterator-inactivity.h>
+#include <babeltrace/graph/message-packet-beginning-const.h>
+#include <babeltrace/graph/message-packet-beginning.h>
+#include <babeltrace/graph/message-packet-end-const.h>
+#include <babeltrace/graph/message-packet-end.h>
+#include <babeltrace/graph/message-stream-activity-beginning-const.h>
+#include <babeltrace/graph/message-stream-activity-beginning.h>
+#include <babeltrace/graph/message-stream-activity-const.h>
+#include <babeltrace/graph/message-stream-activity-end-const.h>
+#include <babeltrace/graph/message-stream-activity-end.h>
+#include <babeltrace/graph/message-stream-beginning-const.h>
+#include <babeltrace/graph/message-stream-beginning.h>
+#include <babeltrace/graph/message-stream-end-const.h>
+#include <babeltrace/graph/message-stream-end.h>