diff --git a/include/arpa/ftp.h b/include/arpa/ftp.h
index 64532b9e250..9a364885401 100644
--- a/include/arpa/ftp.h
+++ b/include/arpa/ftp.h
@@ -33,8 +33,8 @@
  *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _FTP_H_
-#define	_FTP_H_
+#ifndef _ARPA_FTP_H_
+#define	_ARPA_FTP_H_
 
 /* Definitions for FTP; see RFC-765. */
 
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index a2314846428..014277cb4c1 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -33,8 +33,8 @@
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _INET_H_
-#define	_INET_H_
+#ifndef _ARPA_INET_H_
+#define	_ARPA_INET_H_
 
 /* External definitions for functions in inet(3) */
 
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index bef010c53df..81e71fbde8e 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -53,8 +53,8 @@
  * --Copyright--
  */
 
-#ifndef _NAMESER_H_
-#define	_NAMESER_H_
+#ifndef _ARPA_NAMESER_H_
+#define	_ARPA_NAMESER_H_
 
 #include <sys/types.h>
 
diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h
index 10155a84a87..28f52d8b1db 100644
--- a/include/arpa/telnet.h
+++ b/include/arpa/telnet.h
@@ -33,8 +33,8 @@
  *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
  */
 
-#ifndef _TELNET_H_
-#define	_TELNET_H_
+#ifndef _ARPA_TELNET_H_
+#define	_ARPA_TELNET_H_
 
 /*
  * Definitions for the TELNET protocol.
diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h
index 036720011f0..3d3dbf37652 100644
--- a/include/arpa/tftp.h
+++ b/include/arpa/tftp.h
@@ -33,8 +33,8 @@
  *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _TFTP_H_
-#define	_TFTP_H_
+#ifndef _ARPA_TFTP_H_
+#define	_ARPA_TFTP_H_
 
 /*
  * Trivial File Transfer Protocol (IEN-133)
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index f6f6845e05d..72eddcd0f2d 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -38,8 +38,8 @@
  *	@(#)dumprestore.h	8.2 (Berkeley) 1/21/94
  */
 
-#ifndef _DUMPRESTORE_H_
-#define _DUMPRESTORE_H_
+#ifndef _PROTOCOLS_DUMPRESTORE_H_
+#define _PROTOCOLS_DUMPRESTORE_H_
 
 /*
  * TP_BSIZE is the size of file blocks on the dump tapes.
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index f41fc2182ae..d53b16890d7 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -33,8 +33,8 @@
  *	@(#)routed.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _ROUTED_H_
-#define	_ROUTED_H_
+#ifndef _PROTOCOLS_ROUTED_H_
+#define	_PROTOCOLS_ROUTED_H_
 
 /*
  * Routing Information Protocol
diff --git a/include/protocols/rwhod.h b/include/protocols/rwhod.h
index 93008a41818..df61d3ca2d2 100644
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.h
@@ -33,8 +33,8 @@
  *	@(#)rwhod.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _RWHOD_H_
-#define	_RWHOD_H_
+#ifndef _PROTOCOLS_RWHOD_H_
+#define	_PROTOCOLS_RWHOD_H_
 
 /*
  * rwho protocol packet format.
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 0d30d5bfa3e..34b5da2e567 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -33,8 +33,8 @@
  *	@(#)talkd.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _TALKD_H_
-#define	_TALKD_H_
+#ifndef _PROTOCOLS_TALKD_H_
+#define	_PROTOCOLS_TALKD_H_
 
 /*
  * This describes the protocol used by the talk server and clients.
diff --git a/include/protocols/timed.h b/include/protocols/timed.h
index 1b569f53126..cbbbdba927e 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.h
@@ -33,8 +33,8 @@
  *	@(#)timed.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef	_TIMED_H_
-#define	_TIMED_H_
+#ifndef	_PROTOCOLS_TIMED_H_
+#define	_PROTOCOLS_TIMED_H_
 
 /*
  * Time Synchronization Protocol