diff --git a/agent/address.h b/agent/address.h
index 603afe20227cbd5cce835b5f2acab034995d2d53..fa555b210dc344e069b378da57eded69197d0b6e 100644
--- a/agent/address.h
+++ b/agent/address.h
@@ -37,8 +37,8 @@
  * file under either the MPL or the LGPL.
  */
 
-#ifndef _ADDRESS_H
-#define _ADDRESS_H
+#ifndef __LIBNICE_ADDRESS_H__
+#define __LIBNICE_ADDRESS_H__
 
 /**
  * SECTION:address
@@ -303,5 +303,5 @@ nice_address_ip_version (const NiceAddress *addr);
 
 G_END_DECLS
 
-#endif /* _ADDRESS_H */
+#endif /* __LIBNICE_ADDRESS_H__ */
 
diff --git a/agent/agent.h b/agent/agent.h
index a7da06f72a05d8cc85d15fc38498c705f59f82d4..5d388394b682e2ee8c817af2150b16e29995b950 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -37,8 +37,8 @@
  * file under either the MPL or the LGPL.
  */
 
-#ifndef _AGENT_H
-#define _AGENT_H
+#ifndef __LIBNICE_AGENT_H__
+#define __LIBNICE_AGENT_H__
 
 /**
  * SECTION:agent
@@ -1580,4 +1580,4 @@ nice_agent_get_component_state (NiceAgent *agent,
 
 G_END_DECLS
 
-#endif /* _AGENT_H */
+#endif /* __LIBNICE_AGENT_H__ */
diff --git a/agent/candidate.h b/agent/candidate.h
index 3111a4d684c98ce61c9b4e98961ca47356ef70f2..5e0eaf3378eb35d3c4eca723a9c50eaed6510fc5 100644
--- a/agent/candidate.h
+++ b/agent/candidate.h
@@ -37,8 +37,8 @@
  * file under either the MPL or the LGPL.
  */
 
-#ifndef _CANDIDATE_H
-#define _CANDIDATE_H
+#ifndef __LIBNICE_CANDIDATE_H__
+#define __LIBNICE_CANDIDATE_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -241,5 +241,5 @@ GType nice_candidate_get_type (void);
 
 G_END_DECLS
 
-#endif /* _CANDIDATE_H */
+#endif /* __LIBNICE_CANDIDATE_H__ */
 
diff --git a/agent/debug.h b/agent/debug.h
index 20816e81182fe42eb2d6f4c76f3f2ac41c7f0d66..c1a6473cd6f62e5466edc2b90f497b57cc562fc7 100644
--- a/agent/debug.h
+++ b/agent/debug.h
@@ -34,8 +34,8 @@
  * file under either the MPL or the LGPL.
  */
 
-#ifndef _DEBUG_H
-#define _DEBUG_H
+#ifndef __LIBNICE_DEBUG_H__
+#define __LIBNICE_DEBUG_H__
 
 
 /**
@@ -101,5 +101,5 @@ void nice_debug_disable (gboolean with_stun);
 
 G_END_DECLS
 
-#endif /* _DEBUG_H */
+#endif /* __LIBNICE_DEBUG_H__ */
 
diff --git a/agent/interfaces.h b/agent/interfaces.h
index cb766268d77693f4cde3693a15256ee07b7c96c6..50c627ec14059b07ec3eb142f18c4db678b35f06 100644
--- a/agent/interfaces.h
+++ b/agent/interfaces.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef __INTERFACES_H__
-#define __INTERFACES_H__
+#ifndef __LIBNICE_INTERFACES_H__
+#define __LIBNICE_INTERFACES_H__
 
 /**
  * SECTION:interfaces
@@ -79,4 +79,4 @@ GList * nice_interfaces_get_local_interfaces (void);
 
 G_END_DECLS
 
-#endif
+#endif /* __LIBNICE_INTERFACES_H__ */
diff --git a/agent/pseudotcp.h b/agent/pseudotcp.h
index f08318a157bed73a08da89e3a4de53a67cfc8d11..879276e0f0910ad341fe66c1ae034852dba50331 100644
--- a/agent/pseudotcp.h
+++ b/agent/pseudotcp.h
@@ -35,8 +35,8 @@
  * file under either the MPL or the LGPL.
  */
 
-#ifndef _PSEUDOTCP_H
-#define _PSEUDOTCP_H
+#ifndef __LIBNICE_PSEUDOTCP_H__
+#define __LIBNICE_PSEUDOTCP_H__
 
 /**
  * SECTION:pseudotcp
@@ -586,5 +586,5 @@ gboolean pseudo_tcp_socket_is_closed_remotely (PseudoTcpSocket *self);
 
 G_END_DECLS
 
-#endif /* _PSEUDOTCP_H */
+#endif /* __LIBNICE_PSEUDOTCP_H__ */