X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fself-component-port.h;h=ad5daeb8cf52917a4486b92555e8b94b2622ba06;hb=4725a2013cb518374822ccb490610b45f74dbdbf;hp=7af4102a0f404b6a2961c0342e6f6fb26c04ff99;hpb=e2f7325d1e58710ee928373592adcee466f93d06;p=babeltrace.git

diff --git a/include/babeltrace/graph/self-component-port.h b/include/babeltrace/graph/self-component-port.h
index 7af4102a..ad5daeb8 100644
--- a/include/babeltrace/graph/self-component-port.h
+++ b/include/babeltrace/graph/self-component-port.h
@@ -23,35 +23,31 @@
  * SOFTWARE.
  */
 
+/*
+ * For bt_port, bt_self_component_port, bt_self_component, bt_connection
+ */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_port;
-struct bt_self_component_port;
-struct bt_self_component;
-struct bt_connection;
-
-enum bt_self_component_port_status {
+typedef enum bt_self_component_port_status {
 	BT_SELF_PORT_STATUS_OK = 0,
-};
+} bt_self_component_port_status;
 
 static inline
-const struct bt_port *bt_self_component_port_as_port(
-		struct bt_self_component_port *self_port)
+const bt_port *bt_self_component_port_as_port(
+		bt_self_component_port *self_port)
 {
 	return (const void *) self_port;
 }
 
-extern struct bt_self_component *bt_self_component_port_borrow_component(
-		struct bt_self_component_port *self_port);
-
-extern enum bt_self_component_port_status
-bt_self_component_port_remove_from_component(
-		struct bt_self_component_port *self_port);
+extern bt_self_component *bt_self_component_port_borrow_component(
+		bt_self_component_port *self_port);
 
 extern void *bt_self_component_port_get_data(
-		const struct bt_self_component_port *self_port);
+		const bt_self_component_port *self_port);
 
 #ifdef __cplusplus
 }