-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-inactivity.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/port-input.h>
-#include <babeltrace/graph/port-output-notification-iterator.h>
-#include <babeltrace/graph/port-output.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-component-class-filter.h>
-#include <babeltrace/graph/private-component-class-sink.h>
-#include <babeltrace/graph/private-component-class-source.h>
-#include <babeltrace/graph/private-component-class.h>
-#include <babeltrace/graph/private-graph.h>
-#include <babeltrace/graph/private-notification-event.h>
-#include <babeltrace/graph/private-notification-inactivity.h>
-#include <babeltrace/graph/private-notification-packet.h>
-#include <babeltrace/graph/private-notification-stream.h>
-#include <babeltrace/graph/private-notification.h>
-#include <babeltrace/graph/private-query-executor.h>
+#include <babeltrace/graph/message-const.h>
+#include <babeltrace/graph/message-event-const.h>
+#include <babeltrace/graph/message-event.h>
+#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/port-const.h>
+#include <babeltrace/graph/port-input-const.h>
+#include <babeltrace/graph/port-output-const.h>
+#include <babeltrace/graph/port-output-message-iterator.h>
+#include <babeltrace/graph/query-executor-const.h>