diff --git a/talk/xmpp/asyncsocket.h b/talk/xmpp/asyncsocket.h
index 5e83b63057..2514742c9c 100644
--- a/talk/xmpp/asyncsocket.h
+++ b/talk/xmpp/asyncsocket.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ASYNCSOCKET_H_
-#define _ASYNCSOCKET_H_
+#ifndef TALK_XMPP_ASYNCSOCKET_H_
+#define TALK_XMPP_ASYNCSOCKET_H_
 
 #include <string>
 
@@ -86,4 +86,4 @@ public:
 
 }
 
-#endif
+#endif  // TALK_XMPP_ASYNCSOCKET_H_
diff --git a/talk/xmpp/chatroommodule.h b/talk/xmpp/chatroommodule.h
index 47a7106a13..8358fc1e94 100644
--- a/talk/xmpp/chatroommodule.h
+++ b/talk/xmpp/chatroommodule.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _multiuserchatmodule_h_
-#define _multiuserchatmodule_h_
+#ifndef TALK_XMPP_CHATROOMMODULE_H_
+#define TALK_XMPP_CHATROOMMODULE_H_
 
 #include "talk/xmpp/module.h"
 #include "talk/xmpp/rostermodule.h"
@@ -267,4 +267,4 @@ public:
 
 }
 
-#endif
+#endif  // TALK_XMPP_CHATROOMMODULE_H_
diff --git a/talk/xmpp/jingleinfotask.h b/talk/xmpp/jingleinfotask.h
index 5865a77c81..18cb5a9f46 100644
--- a/talk/xmpp/jingleinfotask.h
+++ b/talk/xmpp/jingleinfotask.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_EXAMPLES_LOGIN_JINGLEINFOTASK_H_
-#define TALK_EXAMPLES_LOGIN_JINGLEINFOTASK_H_
+#ifndef TALK_XMPP_JINGLEINFOTASK_H_
+#define TALK_XMPP_JINGLEINFOTASK_H_
 
 #include <vector>
 
@@ -58,4 +58,4 @@ class JingleInfoTask : public XmppTask {
 };
 }
 
-#endif  // TALK_EXAMPLES_LOGIN_JINGLEINFOTASK_H_
+#endif  // TALK_XMPP_JINGLEINFOTASK_H_
diff --git a/talk/xmpp/module.h b/talk/xmpp/module.h
index 37396ef072..a5d06877b8 100644
--- a/talk/xmpp/module.h
+++ b/talk/xmpp/module.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _module_h_
-#define _module_h_
+#ifndef TALK_XMPP_MODULE_H_
+#define TALK_XMPP_MODULE_H_
 
 #include "talk/xmpp/xmppengine.h"
 
@@ -49,4 +49,4 @@ public:
 };
 
 }
-#endif
+#endif  // TALK_XMPP_MODULE_H_
diff --git a/talk/xmpp/moduleimpl.h b/talk/xmpp/moduleimpl.h
index 32a182b99a..897bfce72d 100644
--- a/talk/xmpp/moduleimpl.h
+++ b/talk/xmpp/moduleimpl.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _moduleimpl_h_
-#define _moduleimpl_h_
+#ifndef TALK_XMPP_MODULEIMPL_H_
+#define TALK_XMPP_MODULEIMPL_H_
 
 #include "talk/xmpp/module.h"
 #include "talk/xmpp/xmppengine.h"
@@ -90,4 +90,4 @@ private:
 
 }
 
-#endif
+#endif  // TALK_XMPP_MODULEIMPL_H_
diff --git a/talk/xmpp/plainsaslhandler.h b/talk/xmpp/plainsaslhandler.h
index 2ca364c737..31032e40d2 100644
--- a/talk/xmpp/plainsaslhandler.h
+++ b/talk/xmpp/plainsaslhandler.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PLAINSASLHANDLER_H_
-#define _PLAINSASLHANDLER_H_
+#ifndef TALK_XMPP_PLAINSASLHANDLER_H_
+#define TALK_XMPP_PLAINSASLHANDLER_H_
 
 #include <algorithm>
 #include "talk/xmpp/saslhandler.h"
@@ -78,4 +78,4 @@ private:
 
 }
 
-#endif
+#endif  // TALK_XMPP_PLAINSASLHANDLER_H_
diff --git a/talk/xmpp/presenceouttask.h b/talk/xmpp/presenceouttask.h
index a72457e987..53bbae5bf0 100644
--- a/talk/xmpp/presenceouttask.h
+++ b/talk/xmpp/presenceouttask.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PRESENCEOUTTASK_H_
-#define _PRESENCEOUTTASK_H_
+#ifndef TALK_XMPP_PRESENCEOUTTASK_H_
+#define TALK_XMPP_PRESENCEOUTTASK_H_
 
 #include "talk/xmpp/presencestatus.h"
 #include "talk/xmpp/xmppengine.h"
@@ -51,4 +51,4 @@ private:
 
 }
 
-#endif
+#endif  // TALK_XMPP_PRESENCEOUTTASK_H_
diff --git a/talk/xmpp/rostermodule.h b/talk/xmpp/rostermodule.h
index 7e14dc1314..dfb647d6a6 100644
--- a/talk/xmpp/rostermodule.h
+++ b/talk/xmpp/rostermodule.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _rostermodule_h_
-#define _rostermodule_h_
+#ifndef TALK_XMPP_ROSTERMODULE_H_
+#define TALK_XMPP_ROSTERMODULE_H_
 
 #include "talk/xmpp/module.h"
 
@@ -345,4 +345,4 @@ public:
 
 }
 
-#endif
+#endif  // TALK_XMPP_ROSTERMODULE_H_
diff --git a/talk/xmpp/rostermoduleimpl.h b/talk/xmpp/rostermoduleimpl.h
index a6b15cfa92..37d1117cc1 100644
--- a/talk/xmpp/rostermoduleimpl.h
+++ b/talk/xmpp/rostermoduleimpl.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _rostermoduleimpl_h_
-#define _rostermoduleimpl_h_
+#ifndef TALK_XMPP_XMPPTHREAD_H_
+#define TALK_XMPP_XMPPTHREAD_H_
 
 #include "talk/xmpp/moduleimpl.h"
 #include "talk/xmpp/rostermodule.h"
@@ -299,4 +299,4 @@ private:
 
 }
 
-#endif
+#endif  // TALK_XMPP_XMPPTHREAD_H_
diff --git a/talk/xmpp/saslhandler.h b/talk/xmpp/saslhandler.h
index bead8aadc1..a4a73e4b37 100644
--- a/talk/xmpp/saslhandler.h
+++ b/talk/xmpp/saslhandler.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SASLHANDLER_H_
-#define _SASLHANDLER_H_
+#ifndef TALK_XMPP_SASLHANDLER_H_
+#define TALK_XMPP_SASLHANDLER_H_
 
 #include <string>
 #include <vector>
@@ -56,4 +56,4 @@ public:
 
 }
 
-#endif
+#endif  // TALK_XMPP_SASLHANDLER_H_
diff --git a/talk/xmpp/saslmechanism.h b/talk/xmpp/saslmechanism.h
index f2e5adce48..ee419d1c7a 100644
--- a/talk/xmpp/saslmechanism.h
+++ b/talk/xmpp/saslmechanism.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SASLMECHANISM_H_
-#define _SASLMECHANISM_H_
+#ifndef TALK_XMPP_SASLMECHANISM_H_
+#define TALK_XMPP_SASLMECHANISM_H_
 
 #include <string>
 
@@ -71,4 +71,4 @@ protected:
 
 }
 
-#endif
+#endif  // TALK_XMPP_SASLMECHANISM_H_
diff --git a/talk/xmpp/xmppengine.h b/talk/xmpp/xmppengine.h
index a092600c30..461e90f7b5 100644
--- a/talk/xmpp/xmppengine.h
+++ b/talk/xmpp/xmppengine.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _xmppengine_h_
-#define _xmppengine_h_
+#ifndef TALK_XMPP_XMPPENGINE_H_
+#define TALK_XMPP_XMPPENGINE_H_
 
 // also part of the API
 #include "webrtc/libjingle/xmllite/qname.h"
@@ -346,4 +346,4 @@ public:
   } while (false)                     \
 
 
-#endif
+#endif  // TALK_XMPP_XMPPENGINE_H_
diff --git a/talk/xmpp/xmppstanzaparser.h b/talk/xmpp/xmppstanzaparser.h
index dfc1f2e23d..ffb32753fa 100644
--- a/talk/xmpp/xmppstanzaparser.h
+++ b/talk/xmpp/xmppstanzaparser.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _xmppstanzaparser_h_
-#define _xmppstanzaparser_h_
+#ifndef TALK_XMPP_XMPPSTANZAPARSER_H_
+#define TALK_XMPP_XMPPSTANZAPARSER_H_
 
 #include "webrtc/libjingle/xmllite/xmlbuilder.h"
 #include "webrtc/libjingle/xmllite/xmlparser.h"
@@ -94,4 +94,4 @@ private:
 
 }
 
-#endif
+#endif  // TALK_XMPP_XMPPSTANZAPARSER_H_