X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace.h;h=2cf04c80d3681d1ee0c7a1acc41af24ad0f594e4;hb=e5be10efe4d5543ba697c7e607ca0a5c33fa3ccb;hp=da6d03e90260e2d879a2885048ee5c7bb1075214;hpb=69b772a4f25fc4512abc877662a8c19e404b452c;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index da6d03e9..2cf04c80 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -27,7 +27,9 @@
 
 /* Core API */
 #include <babeltrace/logging.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
+#include <babeltrace/private-values.h>
+#include <babeltrace/types.h>
 #include <babeltrace/values.h>
 #include <babeltrace/version.h>
 
@@ -39,30 +41,57 @@
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/ctf-writer/event-types.h>
 #include <babeltrace/ctf-writer/event.h>
+#include <babeltrace/ctf-writer/field-types.h>
+#include <babeltrace/ctf-writer/fields.h>
 #include <babeltrace/ctf-writer/stream-class.h>
 #include <babeltrace/ctf-writer/stream.h>
+#include <babeltrace/ctf-writer/trace.h>
+#include <babeltrace/ctf-writer/utils.h>
+#include <babeltrace/ctf-writer/visitor.h>
 #include <babeltrace/ctf-writer/writer.h>
 
-/* CTF IR API */
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/event-class.h>
+/* Legacy API (for CTF writer) */
+#include <babeltrace/ctf-ir/clock.h>
+#include <babeltrace/ctf-ir/event-fields.h>
+#include <babeltrace/ctf-ir/event-types.h>
 #include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/field-path.h>
 #include <babeltrace/ctf-ir/field-types.h>
 #include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/trace.h>
 #include <babeltrace/ctf-ir/utils.h>
-#include <babeltrace/ctf-ir/visitor.h>
+
+/* Trace IR API */
+#include <babeltrace/trace-ir/clock-class.h>
+#include <babeltrace/trace-ir/clock-value.h>
+#include <babeltrace/trace-ir/event-class.h>
+#include <babeltrace/trace-ir/event.h>
+#include <babeltrace/trace-ir/field-classes.h>
+#include <babeltrace/trace-ir/field-path.h>
+#include <babeltrace/trace-ir/fields.h>
+#include <babeltrace/trace-ir/packet.h>
+#include <babeltrace/trace-ir/private-clock-class.h>
+#include <babeltrace/trace-ir/private-event-class.h>
+#include <babeltrace/trace-ir/private-event-header-field.h>
+#include <babeltrace/trace-ir/private-event.h>
+#include <babeltrace/trace-ir/private-field-classes.h>
+#include <babeltrace/trace-ir/private-fields.h>
+#include <babeltrace/trace-ir/private-packet-context-field.h>
+#include <babeltrace/trace-ir/private-packet-header-field.h>
+#include <babeltrace/trace-ir/private-packet.h>
+#include <babeltrace/trace-ir/private-stream-class.h>
+#include <babeltrace/trace-ir/private-stream.h>
+#include <babeltrace/trace-ir/private-trace.h>
+#include <babeltrace/trace-ir/stream-class.h>
+#include <babeltrace/trace-ir/stream.h>
+#include <babeltrace/trace-ir/trace.h>
 
 /* Plugin and plugin development API */
 #include <babeltrace/plugin/plugin-dev.h>
 #include <babeltrace/plugin/plugin.h>
 
 /* Graph, component, and notification API */
-#include <babeltrace/graph/clock-class-priority-map.h>
 #include <babeltrace/graph/component-class-filter.h>
 #include <babeltrace/graph/component-class-sink.h>
 #include <babeltrace/graph/component-class-source.h>
@@ -75,19 +104,26 @@
 #include <babeltrace/graph/connection.h>
 #include <babeltrace/graph/graph.h>
 #include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-heap.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/output-port-notification-iterator.h>
 #include <babeltrace/graph/port.h>
 #include <babeltrace/graph/private-component-filter.h>
 #include <babeltrace/graph/private-component-sink.h>
 #include <babeltrace/graph/private-component-source.h>
 #include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/private-connection-notification-iterator.h>
+#include <babeltrace/graph/private-connection-private-notification-iterator.h>
 #include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-notification-iterator.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-port.h>
+#include <babeltrace/graph/query-executor.h>
 
 #endif /* BABELTRACE_BABELTRACE_H */