From 1ca80abd6ac25e66d876a358ceee03910e7c0173 Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Thu, 11 May 2017 12:46:12 -0400
Subject: [PATCH] Normalize public header include guards
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 include/babeltrace/babeltrace.h                     | 6 +++---
 include/babeltrace/ctf-ir/field-path.h              | 6 +++---
 include/babeltrace/ctf/events.h                     | 6 +++---
 include/babeltrace/graph/component-class-filter.h   | 6 +++---
 include/babeltrace/graph/component-class-sink.h     | 6 +++---
 include/babeltrace/graph/component-class-source.h   | 6 +++---
 include/babeltrace/graph/component-class.h          | 6 +++---
 include/babeltrace/graph/component-filter.h         | 6 +++---
 include/babeltrace/graph/component-sink.h           | 6 +++---
 include/babeltrace/graph/component-source.h         | 6 +++---
 include/babeltrace/graph/component-status.h         | 6 +++---
 include/babeltrace/graph/component.h                | 6 +++---
 include/babeltrace/graph/connection.h               | 6 +++---
 include/babeltrace/graph/graph.h                    | 6 +++---
 include/babeltrace/graph/notification-eot.h         | 6 +++---
 include/babeltrace/graph/notification-event.h       | 6 +++---
 include/babeltrace/graph/notification-heap.h        | 6 +++---
 include/babeltrace/graph/notification-inactivity.h  | 6 +++---
 include/babeltrace/graph/notification-iterator.h    | 6 +++---
 include/babeltrace/graph/notification-packet.h      | 6 +++---
 include/babeltrace/graph/notification-stream.h      | 6 +++---
 include/babeltrace/graph/notification.h             | 6 +++---
 include/babeltrace/graph/port.h                     | 6 +++---
 include/babeltrace/graph/private-component-sink.h   | 6 +++---
 include/babeltrace/graph/private-component-source.h | 6 +++---
 include/babeltrace/graph/private-component.h        | 6 +++---
 include/babeltrace/graph/private-connection.h       | 6 +++---
 include/babeltrace/graph/private-port.h             | 6 +++---
 include/babeltrace/values.h                         | 6 +++---
 29 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index f2efdf52..f6ba1bcb 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -1,5 +1,5 @@
-#ifndef _BABELTRACE_H
-#define _BABELTRACE_H
+#ifndef BABELTRACE_BABELTRACE_H
+#define BABELTRACE_BABELTRACE_H
 
 /*
  * BabelTrace API
@@ -30,4 +30,4 @@ extern int bt_version_get_minor(void);
 extern int bt_version_get_patch(void);
 extern const char *bt_version_get_extra(void);
 
-#endif /* _BABELTRACE_H */
+#endif /* BABELTRACE_BABELTRACE_H */
diff --git a/include/babeltrace/ctf-ir/field-path.h b/include/babeltrace/ctf-ir/field-path.h
index cb2466aa..a9100a11 100644
--- a/include/babeltrace/ctf-ir/field-path.h
+++ b/include/babeltrace/ctf-ir/field-path.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_CTF_IR_FIELD_PATH
-#define BABELTRACE_CTF_IR_FIELD_PATH
+#ifndef BABELTRACE_CTF_IR_FIELD_PATH_H
+#define BABELTRACE_CTF_IR_FIELD_PATH_H
 
 /*
  * BabelTrace - CTF IR: Field path
@@ -138,4 +138,4 @@ extern int bt_ctf_field_path_get_index(
 }
 #endif
 
-#endif /* BABELTRACE_CTF_IR_FIELD_PATH */
+#endif /* BABELTRACE_CTF_IR_FIELD_PATH_H */
diff --git a/include/babeltrace/ctf/events.h b/include/babeltrace/ctf/events.h
index cc448ba4..2fd1ffeb 100644
--- a/include/babeltrace/ctf/events.h
+++ b/include/babeltrace/ctf/events.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_CTF_EVENT_H
-#define BABELTRACE_CTF_EVENT_H
+#ifndef BABELTRACE_CTF_EVENTS_H
+#define BABELTRACE_CTF_EVENTS_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -38,4 +38,4 @@
 #include <babeltrace/ctf-writer/stream.h>
 #include <babeltrace/ctf-writer/writer.h>
 
-#endif /* BABELTRACE_CTF_EVENT_H */
+#endif /* BABELTRACE_CTF_EVENTS_H */
diff --git a/include/babeltrace/graph/component-class-filter.h b/include/babeltrace/graph/component-class-filter.h
index bc30a77f..9c1ee942 100644
--- a/include/babeltrace/graph/component-class-filter.h
+++ b/include/babeltrace/graph/component-class-filter.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_CLASS_FILTER_H
-#define BABELTRACE_COMPONENT_COMPONENT_CLASS_FILTER_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_CLASS_FILTER_H
+#define BABELTRACE_GRAPH_COMPONENT_CLASS_FILTER_H
 
 /*
  * Babeltrace - Component Class Interface.
@@ -56,4 +56,4 @@ int bt_component_class_filter_set_notification_iterator_seek_time_method(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_CLASS_FILTER_H */
+#endif /* BABELTRACEGRAPHCOMPONENT_COMPONENT_CLASS_FILTER_H */
diff --git a/include/babeltrace/graph/component-class-sink.h b/include/babeltrace/graph/component-class-sink.h
index e2cf85e2..76fce36f 100644
--- a/include/babeltrace/graph/component-class-sink.h
+++ b/include/babeltrace/graph/component-class-sink.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_CLASS_SINK_H
-#define BABELTRACE_COMPONENT_COMPONENT_CLASS_SINK_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_CLASS_SINK_H
+#define BABELTRACE_GRAPH_COMPONENT_CLASS_SINK_H
 
 /*
  * Babeltrace - Component Class Interface.
@@ -44,4 +44,4 @@ struct bt_component_class *bt_component_class_sink_create(const char *name,
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_CLASS_SINK_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_CLASS_SINK_H */
diff --git a/include/babeltrace/graph/component-class-source.h b/include/babeltrace/graph/component-class-source.h
index 6190977b..ebb6593a 100644
--- a/include/babeltrace/graph/component-class-source.h
+++ b/include/babeltrace/graph/component-class-source.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_CLASS_SOURCE_H
-#define BABELTRACE_COMPONENT_COMPONENT_CLASS_SOURCE_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_CLASS_SOURCE_H
+#define BABELTRACE_GRAPH_COMPONENT_CLASS_SOURCE_H
 
 /*
  * Babeltrace - Component Class Interface.
@@ -56,4 +56,4 @@ int bt_component_class_source_set_notification_iterator_seek_time_method(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_CLASS_SOURCE_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_CLASS_SOURCE_H */
diff --git a/include/babeltrace/graph/component-class.h b/include/babeltrace/graph/component-class.h
index a3ca7ccc..e30c329c 100644
--- a/include/babeltrace/graph/component-class.h
+++ b/include/babeltrace/graph/component-class.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_CLASS_H
-#define BABELTRACE_COMPONENT_COMPONENT_CLASS_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_CLASS_H
+#define BABELTRACE_GRAPH_COMPONENT_CLASS_H
 
 /*
  * Babeltrace - Component Class Interface.
@@ -196,4 +196,4 @@ bool bt_component_class_is_sink(struct bt_component_class *component_class)
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_CLASS_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_CLASS_H */
diff --git a/include/babeltrace/graph/component-filter.h b/include/babeltrace/graph/component-filter.h
index 26ebf157..428e39ac 100644
--- a/include/babeltrace/graph/component-filter.h
+++ b/include/babeltrace/graph/component-filter.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_FILTER_H
-#define BABELTRACE_COMPONENT_FILTER_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_FILTER_H
+#define BABELTRACE_GRAPH_COMPONENT_FILTER_H
 
 /*
  * BabelTrace - Filter Plug-in Interface
@@ -55,4 +55,4 @@ extern struct bt_port *bt_component_filter_get_output_port_by_index(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_FILTER_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_FILTER_H */
diff --git a/include/babeltrace/graph/component-sink.h b/include/babeltrace/graph/component-sink.h
index e30e2648..207c6c81 100644
--- a/include/babeltrace/graph/component-sink.h
+++ b/include/babeltrace/graph/component-sink.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_SINK_H
-#define BABELTRACE_COMPONENT_SINK_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_SINK_H
+#define BABELTRACE_GRAPH_COMPONENT_SINK_H
 
 /*
  * BabelTrace - Sink Component Interface
@@ -48,4 +48,4 @@ extern struct bt_port *bt_component_sink_get_input_port_by_index(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_SINK_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_SINK_H */
diff --git a/include/babeltrace/graph/component-source.h b/include/babeltrace/graph/component-source.h
index a1809a98..a86d6907 100644
--- a/include/babeltrace/graph/component-source.h
+++ b/include/babeltrace/graph/component-source.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_SOURCE_H
-#define BABELTRACE_COMPONENT_SOURCE_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_SOURCE_H
+#define BABELTRACE_GRAPH_COMPONENT_SOURCE_H
 
 /*
  * BabelTrace - Source Plug-in Interface
@@ -48,4 +48,4 @@ extern struct bt_port *bt_component_source_get_output_port_by_index(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_SOURCE_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_SOURCE_H */
diff --git a/include/babeltrace/graph/component-status.h b/include/babeltrace/graph/component-status.h
index b86db77e..2425c5ee 100644
--- a/include/babeltrace/graph/component-status.h
+++ b/include/babeltrace/graph/component-status.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_STATUS_H
-#define BABELTRACE_COMPONENT_COMPONENT_STATUS_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_STATUS_H
+#define BABELTRACE_GRAPH_COMPONENT_STATUS_H
 
 /*
  * BabelTrace - Babeltrace Component Interface
@@ -62,4 +62,4 @@ enum bt_component_status {
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_STATUS_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_STATUS_H */
diff --git a/include/babeltrace/graph/component.h b/include/babeltrace/graph/component.h
index f2faa36a..975c10e3 100644
--- a/include/babeltrace/graph/component.h
+++ b/include/babeltrace/graph/component.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_H
-#define BABELTRACE_COMPONENT_COMPONENT_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_H
+#define BABELTRACE_GRAPH_COMPONENT_H
 
 /*
  * BabelTrace - Babeltrace Component Interface
@@ -106,4 +106,4 @@ extern struct bt_graph *bt_component_get_graph(struct bt_component *component);
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_H */
diff --git a/include/babeltrace/graph/connection.h b/include/babeltrace/graph/connection.h
index 4fe1d4c3..2d276fe3 100644
--- a/include/babeltrace/graph/connection.h
+++ b/include/babeltrace/graph/connection.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_CONNECTION_H
-#define BABELTRACE_COMPONENT_CONNECTION_H
+#ifndef BABELTRACE_GRAPH_CONNECTION_H
+#define BABELTRACE_GRAPH_CONNECTION_H
 
 /*
  * BabelTrace - Babeltrace Component Connection Interface
@@ -45,4 +45,4 @@ extern struct bt_port *bt_connection_get_upstream_port(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_CONNECTION_H */
+#endif /* BABELTRACE_GRAPH_CONNECTION_H */
diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace/graph/graph.h
index 07ff3939..cb14c7da 100644
--- a/include/babeltrace/graph/graph.h
+++ b/include/babeltrace/graph/graph.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_GRAPH_H
-#define BABELTRACE_COMPONENT_GRAPH_H
+#ifndef BABELTRACE_GRAPH_GRAPH_H
+#define BABELTRACE_GRAPH_GRAPH_H
 
 /*
  * BabelTrace - Babeltrace Graph Interface
@@ -118,4 +118,4 @@ extern enum bt_graph_status bt_graph_add_ports_disconnected_listener(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_GRAPH_H */
+#endif /* BABELTRACE_GRAPH_GRAPH_H */
diff --git a/include/babeltrace/graph/notification-eot.h b/include/babeltrace/graph/notification-eot.h
index 4c3626c1..f6802d5d 100644
--- a/include/babeltrace/graph/notification-eot.h
+++ b/include/babeltrace/graph/notification-eot.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_EOT_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_EOT_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_EOT_H
+#define BABELTRACE_GRAPH_NOTIFICATION_EOT_H
 
 /*
  * BabelTrace - Plug-in End of Trace Notification
@@ -35,4 +35,4 @@ extern "C" {
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_EOT_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_EOT_H */
diff --git a/include/babeltrace/graph/notification-event.h b/include/babeltrace/graph/notification-event.h
index f386abb2..1dd62662 100644
--- a/include/babeltrace/graph/notification-event.h
+++ b/include/babeltrace/graph/notification-event.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_EVENT_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_EVENT_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_EVENT_H
+#define BABELTRACE_GRAPH_NOTIFICATION_EVENT_H
 
 /*
  * BabelTrace - Plug-in Event Notification
@@ -67,4 +67,4 @@ bt_notification_event_get_clock_class_priority_map(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_EVENT_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_EVENT_H */
diff --git a/include/babeltrace/graph/notification-heap.h b/include/babeltrace/graph/notification-heap.h
index ddadc67e..8eb2f7f8 100644
--- a/include/babeltrace/graph/notification-heap.h
+++ b/include/babeltrace/graph/notification-heap.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_HEAP_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_HEAP_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_HEAP_H
+#define BABELTRACE_GRAPH_NOTIFICATION_HEAP_H
 
 /*
  * Babeltrace - Notification Heap
@@ -90,4 +90,4 @@ extern struct bt_notification *bt_notification_heap_peek(
 extern struct bt_notification *bt_notification_heap_pop(
 		struct bt_notification_heap *heap);
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_HEAP_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_HEAP_H */
diff --git a/include/babeltrace/graph/notification-inactivity.h b/include/babeltrace/graph/notification-inactivity.h
index e5914935..6c8d0849 100644
--- a/include/babeltrace/graph/notification-inactivity.h
+++ b/include/babeltrace/graph/notification-inactivity.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_INACTIVITY_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_INACTIVITY_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_INACTIVITY_H
+#define BABELTRACE_GRAPH_NOTIFICATION_INACTIVITY_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -49,4 +49,4 @@ extern int bt_notification_inactivity_set_clock_value(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_INACTIVITY_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_INACTIVITY_H */
diff --git a/include/babeltrace/graph/notification-iterator.h b/include/babeltrace/graph/notification-iterator.h
index 03b53ce8..753ff6ec 100644
--- a/include/babeltrace/graph/notification-iterator.h
+++ b/include/babeltrace/graph/notification-iterator.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_ITERATOR_H
+#define BABELTRACE_GRAPH_NOTIFICATION_ITERATOR_H
 
 /*
  * BabelTrace - Plug-in Notification Iterator
@@ -136,4 +136,4 @@ extern struct bt_component *bt_notification_iterator_get_component(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_ITERATOR_H */
diff --git a/include/babeltrace/graph/notification-packet.h b/include/babeltrace/graph/notification-packet.h
index 94480e60..99749e48 100644
--- a/include/babeltrace/graph/notification-packet.h
+++ b/include/babeltrace/graph/notification-packet.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_PACKET_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_PACKET_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_PACKET_H
+#define BABELTRACE_GRAPH_NOTIFICATION_PACKET_H
 
 /*
  * BabelTrace - Plug-in Packet-related Notifications
@@ -53,4 +53,4 @@ extern struct bt_ctf_packet *bt_notification_packet_end_get_packet(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_PACKET_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_PACKET_H */
diff --git a/include/babeltrace/graph/notification-stream.h b/include/babeltrace/graph/notification-stream.h
index 67ed5f5b..1c377c26 100644
--- a/include/babeltrace/graph/notification-stream.h
+++ b/include/babeltrace/graph/notification-stream.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_STREAM_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_STREAM_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_STREAM_H
+#define BABELTRACE_GRAPH_NOTIFICATION_STREAM_H
 
 /*
  * BabelTrace - Plug-in Stream-related Notifications
@@ -50,4 +50,4 @@ extern struct bt_ctf_stream *bt_notification_stream_end_get_stream(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_STREAM_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_STREAM_H */
diff --git a/include/babeltrace/graph/notification.h b/include/babeltrace/graph/notification.h
index 632da9be..926c019f 100644
--- a/include/babeltrace/graph/notification.h
+++ b/include/babeltrace/graph/notification.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_H
+#define BABELTRACE_GRAPH_NOTIFICATION_H
 
 /*
  * BabelTrace - Plug-in Notification
@@ -62,4 +62,4 @@ extern enum bt_notification_type bt_notification_get_type(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_H */
diff --git a/include/babeltrace/graph/port.h b/include/babeltrace/graph/port.h
index b759b6ab..7569961b 100644
--- a/include/babeltrace/graph/port.h
+++ b/include/babeltrace/graph/port.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_PORT_H
-#define BABELTRACE_COMPONENT_PORT_H
+#ifndef BABELTRACE_GRAPH_PORT_H
+#define BABELTRACE_GRAPH_PORT_H
 
 /*
  * BabelTrace - Babeltrace Component Connection Interface
@@ -73,4 +73,4 @@ bool bt_port_is_output(struct bt_port *port)
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_PORT_H */
+#endif /* BABELTRACE_GRAPH_PORT_H */
diff --git a/include/babeltrace/graph/private-component-sink.h b/include/babeltrace/graph/private-component-sink.h
index d05d22c2..bf2473be 100644
--- a/include/babeltrace/graph/private-component-sink.h
+++ b/include/babeltrace/graph/private-component-sink.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SINK_H
-#define BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SINK_H
+#ifndef BABELTRACE_GRAPH_PRIVATE_COMPONENT_SINK_H
+#define BABELTRACE_GRAPH_PRIVATE_COMPONENT_SINK_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -51,4 +51,4 @@ bt_private_component_sink_add_input_private_port(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SINK_H */
+#endif /* BABELTRACE_GRAPH_PRIVATE_COMPONENT_SINK_H */
diff --git a/include/babeltrace/graph/private-component-source.h b/include/babeltrace/graph/private-component-source.h
index 086091a0..f4e9269e 100644
--- a/include/babeltrace/graph/private-component-source.h
+++ b/include/babeltrace/graph/private-component-source.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SOURCE_H
-#define BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SOURCE_H
+#ifndef BABELTRACE_GRAPH_PRIVATE_COMPONENT_SOURCE_H
+#define BABELTRACE_GRAPH_PRIVATE_COMPONENT_SOURCE_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -52,4 +52,4 @@ bt_private_component_source_add_output_private_port(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SOURCE_H */
+#endif /* BABELTRACE_GRAPH_PRIVATE_COMPONENT_SOURCE_H */
diff --git a/include/babeltrace/graph/private-component.h b/include/babeltrace/graph/private-component.h
index c2091985..cdbeb2a4 100644
--- a/include/babeltrace/graph/private-component.h
+++ b/include/babeltrace/graph/private-component.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_PRIVATE_COMPONENT_H
-#define BABELTRACE_COMPONENT_PRIVATE_COMPONENT_H
+#ifndef BABELTRACE_GRAPH_PRIVATE_COMPONENT_H
+#define BABELTRACE_GRAPH_PRIVATE_COMPONENT_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -45,4 +45,4 @@ extern enum bt_component_status bt_private_component_set_user_data(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_PRIVATE_COMPONENT_H */
+#endif /* BABELTRACE_GRAPH_PRIVATE_COMPONENT_H */
diff --git a/include/babeltrace/graph/private-connection.h b/include/babeltrace/graph/private-connection.h
index 9d3d39c4..59db640e 100644
--- a/include/babeltrace/graph/private-connection.h
+++ b/include/babeltrace/graph/private-connection.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_PRIVATE_CONNECTION_H
-#define BABELTRACE_COMPONENT_PRIVATE_CONNECTION_H
+#ifndef BABELTRACE_GRAPH_PRIVATE_CONNECTION_H
+#define BABELTRACE_GRAPH_PRIVATE_CONNECTION_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -45,4 +45,4 @@ bt_private_connection_create_notification_iterator(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_PRIVATE_CONNECTION_H */
+#endif /* BABELTRACE_GRAPH_PRIVATE_CONNECTION_H */
diff --git a/include/babeltrace/graph/private-port.h b/include/babeltrace/graph/private-port.h
index c9c140b7..8148f0a4 100644
--- a/include/babeltrace/graph/private-port.h
+++ b/include/babeltrace/graph/private-port.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_PRIVATE_PORT_H
-#define BABELTRACE_COMPONENT_PRIVATE_PORT_H
+#ifndef BABELTRACE_GRAPH_PRIVATE_PORT_H
+#define BABELTRACE_GRAPH_PRIVATE_PORT_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -46,4 +46,4 @@ extern void *bt_private_port_get_user_data(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_PRIVATE_PORT_H */
+#endif /* BABELTRACE_GRAPH_PRIVATE_PORT_H */
diff --git a/include/babeltrace/values.h b/include/babeltrace/values.h
index bc9669ce..b0544ec2 100644
--- a/include/babeltrace/values.h
+++ b/include/babeltrace/values.h
@@ -1,5 +1,5 @@
-#ifndef _BABELTRACE_VALUES_H
-#define _BABELTRACE_VALUES_H
+#ifndef BABELTRACE_VALUES_H
+#define BABELTRACE_VALUES_H
 
 /*
  * Babeltrace - Value objects
@@ -1499,4 +1499,4 @@ extern struct bt_value *bt_value_map_extend(struct bt_value *base_map_obj,
 }
 #endif
 
-#endif /* _BABELTRACE_VALUES_H */
+#endif /* BABELTRACE_VALUES_H */
-- 
2.34.1