diff --git a/src/analyzer/protocols/TODO b/src/analyzer/protocols/TODO
index 41a4d579bc..61a17a95c9 100644
--- a/src/analyzer/protocols/TODO
+++ b/src/analyzer/protocols/TODO
@@ -1,5 +1,4 @@
 
-- add functions.bif where needed
 - update *.h guards
 - cleanup analyzer descriptions
 - can now lower-case the analyzer name in plugin
diff --git a/src/analyzer/protocols/arp/ARP.h b/src/analyzer/protocols/arp/ARP.h
index ee01669e92..f09dc6c398 100644
--- a/src/analyzer/protocols/arp/ARP.h
+++ b/src/analyzer/protocols/arp/ARP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef arp_h
-#define arp_h
+#ifndef ANALYZER_PROTOCOL_ARP_ARP_H
+#define ANALYZER_PROTOCOL_ARP_ARP_H
 
 #include "config.h"
 #include <sys/types.h>
diff --git a/src/analyzer/protocols/ayiya/AYIYA.h b/src/analyzer/protocols/ayiya/AYIYA.h
index 2995131be5..f5bb379cf4 100644
--- a/src/analyzer/protocols/ayiya/AYIYA.h
+++ b/src/analyzer/protocols/ayiya/AYIYA.h
@@ -1,5 +1,5 @@
-#ifndef AYIYA_h
-#define AYIYA_h
+#ifndef ANALYZER_PROTOCOL_AYIYA_AYIYA_H
+#define ANALYZER_PROTOCOL_AYIYA_AYIYA_H
 
 #include "ayiya_pac.h"
 
diff --git a/src/analyzer/protocols/backdoor/BackDoor.h b/src/analyzer/protocols/backdoor/BackDoor.h
index bab981cf89..36c8430c34 100644
--- a/src/analyzer/protocols/backdoor/BackDoor.h
+++ b/src/analyzer/protocols/backdoor/BackDoor.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef backdoor_h
-#define backdoor_h
+#ifndef ANALYZER_PROTOCOL_BACKDOOR_BACKDOOR_H
+#define ANALYZER_PROTOCOL_BACKDOOR_BACKDOOR_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "Timer.h"
diff --git a/src/analyzer/protocols/bittorrent/BitTorrent.h b/src/analyzer/protocols/bittorrent/BitTorrent.h
index 7812261f04..4065b45648 100644
--- a/src/analyzer/protocols/bittorrent/BitTorrent.h
+++ b/src/analyzer/protocols/bittorrent/BitTorrent.h
@@ -1,7 +1,7 @@
 // This code contributed by Nadi Sarrar.
 
-#ifndef bittorrent_h
-#define bittorrent_h
+#ifndef ANALYZER_PROTOCOL_BITTORRENT_BITTORRENT_H
+#define ANALYZER_PROTOCOL_BITTORRENT_BITTORRENT_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 
diff --git a/src/analyzer/protocols/bittorrent/BitTorrentTracker.h b/src/analyzer/protocols/bittorrent/BitTorrentTracker.h
index 8db92c6af7..572a8d2093 100644
--- a/src/analyzer/protocols/bittorrent/BitTorrentTracker.h
+++ b/src/analyzer/protocols/bittorrent/BitTorrentTracker.h
@@ -1,7 +1,7 @@
 // This code contributed by Nadi Sarrar.
 
-#ifndef bittorrenttracker_h
-#define bittorrenttracker_h
+#ifndef ANALYZER_PROTOCOL_BITTORRENT_BITTORRENTTRACKER_H
+#define ANALYZER_PROTOCOL_BITTORRENT_BITTORRENTTRACKER_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 
diff --git a/src/analyzer/protocols/conn-size/ConnSize.h b/src/analyzer/protocols/conn-size/ConnSize.h
index 567895a9f5..25f096dd32 100644
--- a/src/analyzer/protocols/conn-size/ConnSize.h
+++ b/src/analyzer/protocols/conn-size/ConnSize.h
@@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 //
 
-#ifndef CONNSTATS_H
-#define CONNSTATS_H
+#ifndef ANALYZER_PROTOCOL_CONN_SIZE_CONNSIZE_H
+#define ANALYZER_PROTOCOL_CONN_SIZE_CONNSIZE_H
 
 #include "analyzer/Analyzer.h"
 #include "NetVar.h"
diff --git a/src/analyzer/protocols/dce-rpc/DCE_RPC.h b/src/analyzer/protocols/dce-rpc/DCE_RPC.h
index fabd68912e..ff85e16ee1 100644
--- a/src/analyzer/protocols/dce-rpc/DCE_RPC.h
+++ b/src/analyzer/protocols/dce-rpc/DCE_RPC.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef dce_rpc_h
-#define dce_rpc_h
+#ifndef ANALYZER_PROTOCOL_DCE_RPC_DCE_RPC_H
+#define ANALYZER_PROTOCOL_DCE_RPC_DCE_RPC_H
 
 // NOTE: This is a somewhat crude analyzer for DCE/RPC (used on Microsoft
 // Windows systems) and shouldn't be considered as stable.
@@ -88,7 +88,7 @@ enum DCE_RPC_PTYPE {
 };
 */
 
-#define DCE_RPC_HEADER_LENGTH 16
+#define ANALYZER_PROTOCOL_DCE_RPC_DCE_RPC_HEADER_LENGTH 16
 
 class DCE_RPC_Header {
 public:
diff --git a/src/analyzer/protocols/dhcp/DHCP.h b/src/analyzer/protocols/dhcp/DHCP.h
index 189e04ecab..207651d7c1 100644
--- a/src/analyzer/protocols/dhcp/DHCP.h
+++ b/src/analyzer/protocols/dhcp/DHCP.h
@@ -1,5 +1,5 @@
-#ifndef dhcp_binpac_h
-#define dhcp_binpac_h
+#ifndef ANALYZER_PROTOCOL_DHCP_DHCP_H
+#define ANALYZER_PROTOCOL_DHCP_DHCP_H
 
 #include "analyzer/protocols/udp/UDP.h"
 
diff --git a/src/analyzer/protocols/dns/DNS.h b/src/analyzer/protocols/dns/DNS.h
index fc19fe82b3..9c7874400d 100644
--- a/src/analyzer/protocols/dns/DNS.h
+++ b/src/analyzer/protocols/dns/DNS.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef dns_h
-#define dns_h
+#ifndef ANALYZER_PROTOCOL_DNS_DNS_H
+#define ANALYZER_PROTOCOL_DNS_DNS_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "binpac_bro.h"
diff --git a/src/analyzer/protocols/file/File.h b/src/analyzer/protocols/file/File.h
index ae6a815378..368fe22dae 100644
--- a/src/analyzer/protocols/file/File.h
+++ b/src/analyzer/protocols/file/File.h
@@ -1,7 +1,7 @@
 // Analyzer for connections that transfer binary data.
 
-#ifndef FILEANALYZER_H
-#define FILEANALYZER_H
+#ifndef ANALYZER_PROTOCOL_FILE_FILE_H
+#define ANALYZER_PROTOCOL_FILE_FILE_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 
diff --git a/src/analyzer/protocols/finger/Finger.h b/src/analyzer/protocols/finger/Finger.h
index d80549bb4c..5624030f80 100644
--- a/src/analyzer/protocols/finger/Finger.h
+++ b/src/analyzer/protocols/finger/Finger.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef finger_h
-#define finger_h
+#ifndef ANALYZER_PROTOCOL_FINGER_FINGER_H
+#define ANALYZER_PROTOCOL_FINGER_FINGER_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "analyzer/protocols/tcp/ContentLine.h"
diff --git a/src/analyzer/protocols/ftp/FTP.h b/src/analyzer/protocols/ftp/FTP.h
index 9ebf38b2f7..577082644a 100644
--- a/src/analyzer/protocols/ftp/FTP.h
+++ b/src/analyzer/protocols/ftp/FTP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef ftp_h
-#define ftp_h
+#ifndef ANALYZER_PROTOCOL_FTP_FTP_H
+#define ANALYZER_PROTOCOL_FTP_FTP_H
 
 #include "analyzer/protocols/login/NVT.h"
 #include "analyzer/protocols/tcp/TCP.h"
diff --git a/src/analyzer/protocols/gnutella/Gnutella.h b/src/analyzer/protocols/gnutella/Gnutella.h
index 3a6e51d0c4..d67d319c4e 100644
--- a/src/analyzer/protocols/gnutella/Gnutella.h
+++ b/src/analyzer/protocols/gnutella/Gnutella.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef gnutella_h
-#define gnutella_h
+#ifndef ANALYZER_PROTOCOL_GNUTELLA_GNUTELLA_H
+#define ANALYZER_PROTOCOL_GNUTELLA_GNUTELLA_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 
diff --git a/src/analyzer/protocols/gtpv1/GTPv1.h b/src/analyzer/protocols/gtpv1/GTPv1.h
index 3fb7634534..b58405ea7f 100644
--- a/src/analyzer/protocols/gtpv1/GTPv1.h
+++ b/src/analyzer/protocols/gtpv1/GTPv1.h
@@ -1,5 +1,5 @@
-#ifndef GTPv1_h
-#define GTPv1_h
+#ifndef ANALYZER_PROTOCOL_GTPV1_GTPV1_H
+#define ANALYZER_PROTOCOL_GTPV1_GTPV1_H
 
 #include "gtpv1_pac.h"
 
diff --git a/src/analyzer/protocols/http/HTTP.h b/src/analyzer/protocols/http/HTTP.h
index 49235ae173..cb53e30c9a 100644
--- a/src/analyzer/protocols/http/HTTP.h
+++ b/src/analyzer/protocols/http/HTTP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef http_h
-#define http_h
+#ifndef ANALYZER_PROTOCOL_HTTP_HTTP_H
+#define ANALYZER_PROTOCOL_HTTP_HTTP_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "analyzer/protocols/tcp/ContentLine.h"
diff --git a/src/analyzer/protocols/icmp/ICMP.h b/src/analyzer/protocols/icmp/ICMP.h
index 6a9ba3282c..e371f53889 100644
--- a/src/analyzer/protocols/icmp/ICMP.h
+++ b/src/analyzer/protocols/icmp/ICMP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef icmp_h
-#define icmp_h
+#ifndef ANALYZER_PROTOCOL_ICMP_ICMP_H
+#define ANALYZER_PROTOCOL_ICMP_ICMP_H
 
 #include "RuleMatcher.h"
 #include "analyzer/Analyzer.h"
diff --git a/src/analyzer/protocols/ident/Ident.h b/src/analyzer/protocols/ident/Ident.h
index 473d201e65..7e1b7508c5 100644
--- a/src/analyzer/protocols/ident/Ident.h
+++ b/src/analyzer/protocols/ident/Ident.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef ident_h
-#define ident_h
+#ifndef ANALYZER_PROTOCOL_IDENT_IDENT_H
+#define ANALYZER_PROTOCOL_IDENT_IDENT_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "analyzer/protocols/tcp/ContentLine.h"
diff --git a/src/analyzer/protocols/interconn/InterConn.h b/src/analyzer/protocols/interconn/InterConn.h
index c51113c156..4faa684818 100644
--- a/src/analyzer/protocols/interconn/InterConn.h
+++ b/src/analyzer/protocols/interconn/InterConn.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef interconn_h
-#define interconn_h
+#ifndef ANALYZER_PROTOCOL_INTERCONN_INTERCONN_H
+#define ANALYZER_PROTOCOL_INTERCONN_INTERCONN_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "Timer.h"
diff --git a/src/analyzer/protocols/irc/IRC.h b/src/analyzer/protocols/irc/IRC.h
index d5fa3b57e5..a0f35639d3 100644
--- a/src/analyzer/protocols/irc/IRC.h
+++ b/src/analyzer/protocols/irc/IRC.h
@@ -1,7 +1,7 @@
 // An IRC analyzer contributed by Roland Gruber.
 
-#ifndef irc_h
-#define irc_h
+#ifndef ANALYZER_PROTOCOL_IRC_IRC_H
+#define ANALYZER_PROTOCOL_IRC_IRC_H
 #include "analyzer/protocols/tcp/TCP.h"
 
 namespace analyzer { namespace irc {
diff --git a/src/analyzer/protocols/login/Login.h b/src/analyzer/protocols/login/Login.h
index 55d12c80da..3d41ad94c3 100644
--- a/src/analyzer/protocols/login/Login.h
+++ b/src/analyzer/protocols/login/Login.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef login_h
-#define login_h
+#ifndef ANALYZER_PROTOCOL_LOGIN_LOGIN_H
+#define ANALYZER_PROTOCOL_LOGIN_LOGIN_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 
diff --git a/src/analyzer/protocols/login/NVT.h b/src/analyzer/protocols/login/NVT.h
index dea4c90ad5..9fb85c8823 100644
--- a/src/analyzer/protocols/login/NVT.h
+++ b/src/analyzer/protocols/login/NVT.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef nvt_h
-#define nvt_h
+#ifndef ANALYZER_PROTOCOL_LOGIN_NVT_H
+#define ANALYZER_PROTOCOL_LOGIN_NVT_H
 
 #include "analyzer/protocols/tcp/ContentLine.h"
 
diff --git a/src/analyzer/protocols/login/RSH.h b/src/analyzer/protocols/login/RSH.h
index 2738060a9f..c2d19c8958 100644
--- a/src/analyzer/protocols/login/RSH.h
+++ b/src/analyzer/protocols/login/RSH.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef rsh_h
-#define rsh_h
+#ifndef ANALYZER_PROTOCOL_LOGIN_RSH_H
+#define ANALYZER_PROTOCOL_LOGIN_RSH_H
 
 #include "Login.h"
 #include "analyzer/protocols/tcp/ContentLine.h"
diff --git a/src/analyzer/protocols/login/Rlogin.h b/src/analyzer/protocols/login/Rlogin.h
index c4cdfd7516..3efdfa8107 100644
--- a/src/analyzer/protocols/login/Rlogin.h
+++ b/src/analyzer/protocols/login/Rlogin.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef rlogin_h
-#define rlogin_h
+#ifndef ANALYZER_PROTOCOL_LOGIN_RLOGIN_H
+#define ANALYZER_PROTOCOL_LOGIN_RLOGIN_H
 
 #include "Login.h"
 #include "analyzer/protocols/tcp/ContentLine.h"
diff --git a/src/analyzer/protocols/login/Telnet.h b/src/analyzer/protocols/login/Telnet.h
index a13fe230af..332281013c 100644
--- a/src/analyzer/protocols/login/Telnet.h
+++ b/src/analyzer/protocols/login/Telnet.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef telnet_h
-#define telnet_h
+#ifndef ANALYZER_PROTOCOL_LOGIN_TELNET_H
+#define ANALYZER_PROTOCOL_LOGIN_TELNET_H
 
 #include "Login.h"
 
diff --git a/src/analyzer/protocols/mime/MIME.h b/src/analyzer/protocols/mime/MIME.h
index d6ef2b5375..10d4da3fd1 100644
--- a/src/analyzer/protocols/mime/MIME.h
+++ b/src/analyzer/protocols/mime/MIME.h
@@ -1,5 +1,5 @@
-#ifndef mime_h
-#define mime_h
+#ifndef ANALYZER_PROTOCOL_MIME_MIME_H
+#define ANALYZER_PROTOCOL_MIME_MIME_H
 
 #include <assert.h>
 #include <openssl/md5.h>
diff --git a/src/analyzer/protocols/modbus/Modbus.h b/src/analyzer/protocols/modbus/Modbus.h
index 063014cf2b..9ecd952e2e 100644
--- a/src/analyzer/protocols/modbus/Modbus.h
+++ b/src/analyzer/protocols/modbus/Modbus.h
@@ -1,5 +1,5 @@
-#ifndef MODBUS_H
-#define MODBUS_H
+#ifndef ANALYZER_PROTOCOL_MODBUS_MODBUS_H
+#define ANALYZER_PROTOCOL_MODBUS_MODBUS_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "modbus_pac.h"
diff --git a/src/analyzer/protocols/ncp/NCP.h b/src/analyzer/protocols/ncp/NCP.h
index 0ab73707fb..aa667657ca 100644
--- a/src/analyzer/protocols/ncp/NCP.h
+++ b/src/analyzer/protocols/ncp/NCP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef ncp_h
-#define ncp_h
+#ifndef ANALYZER_PROTOCOL_NCP_NCP_H
+#define ANALYZER_PROTOCOL_NCP_NCP_H
 
 // A very crude analyzer for NCP (Netware Core Protocol)
 //
@@ -73,7 +73,7 @@ protected:
 	int buf_len;	// size off msg_buf
 };
 
-#define NCP_TCPIP_HEADER_LENGTH 8
+#define ANALYZER_PROTOCOL_NCP_NCP_HEADER_LENGTH 8
 
 class NCP_FrameBuffer : public FrameBuffer {
 public:
diff --git a/src/analyzer/protocols/netbios-ssn/NetbiosSSN.h b/src/analyzer/protocols/netbios-ssn/NetbiosSSN.h
index df065c4348..5908250669 100644
--- a/src/analyzer/protocols/netbios-ssn/NetbiosSSN.h
+++ b/src/analyzer/protocols/netbios-ssn/NetbiosSSN.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef netbios_ssn_h
-#define netbios_ssn_h
+#ifndef ANALYZER_PROTOCOL_NETBIOS_SSN_NETBIOSSSN_H
+#define ANALYZER_PROTOCOL_NETBIOS_SSN_NETBIOSSSN_H
 
 #include "analyzer/protocols/udp/UDP.h"
 #include "analyzer/protocols/tcp/TCP.h"
diff --git a/src/analyzer/protocols/ntp/NTP.h b/src/analyzer/protocols/ntp/NTP.h
index 2c989da4d1..25cc9bad43 100644
--- a/src/analyzer/protocols/ntp/NTP.h
+++ b/src/analyzer/protocols/ntp/NTP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef ntp_h
-#define ntp_h
+#ifndef ANALYZER_PROTOCOL_NTP_NTP_H
+#define ANALYZER_PROTOCOL_NTP_NTP_H
 
 #include "analyzer/protocols/udp/UDP.h"
 
diff --git a/src/analyzer/protocols/pia/PIA.h b/src/analyzer/protocols/pia/PIA.h
index 1d788d39a6..a117a60978 100644
--- a/src/analyzer/protocols/pia/PIA.h
+++ b/src/analyzer/protocols/pia/PIA.h
@@ -1,7 +1,7 @@
 // An analyzer for application-layer protocol-detection.
 
-#ifndef PIA_H
-#define PIA_H
+#ifndef ANALYZER_PROTOCOL_PIA_PIA_H
+#define ANALYZER_PROTOCOL_PIA_PIA_H
 
 #include "analyzer/Analyzer.h"
 #include "analyzer/protocols/tcp/TCP.h"
diff --git a/src/analyzer/protocols/pop3/POP3.h b/src/analyzer/protocols/pop3/POP3.h
index 37620c0024..bd882f480b 100644
--- a/src/analyzer/protocols/pop3/POP3.h
+++ b/src/analyzer/protocols/pop3/POP3.h
@@ -2,8 +2,8 @@
 //
 // An analyser for the POP3 protocol.
 
-#ifndef pop3_h
-#define pop3_h
+#ifndef ANALYZER_PROTOCOL_POP3_POP3_H
+#define ANALYZER_PROTOCOL_POP3_POP3_H
 
 #include <vector>
 #include <string>
diff --git a/src/analyzer/protocols/rpc/NFS.h b/src/analyzer/protocols/rpc/NFS.h
index e9e978eaa2..7656450d94 100644
--- a/src/analyzer/protocols/rpc/NFS.h
+++ b/src/analyzer/protocols/rpc/NFS.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef nfs_h
-#define nfs_h
+#ifndef ANALYZER_PROTOCOL_RPC_NFS_H
+#define ANALYZER_PROTOCOL_RPC_NFS_H
 
 #include "RPC.h"
 #include "XDR.h"
diff --git a/src/analyzer/protocols/rpc/Portmap.h b/src/analyzer/protocols/rpc/Portmap.h
index 6aa1173f02..52d0c21a04 100644
--- a/src/analyzer/protocols/rpc/Portmap.h
+++ b/src/analyzer/protocols/rpc/Portmap.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef portmap_h
-#define portmap_h
+#ifndef ANALYZER_PROTOCOL_RPC_PORTMAP_H
+#define ANALYZER_PROTOCOL_RPC_PORTMAP_H
 
 #include "RPC.h"
 
diff --git a/src/analyzer/protocols/rpc/RPC.h b/src/analyzer/protocols/rpc/RPC.h
index 504f2eb194..0face29d50 100644
--- a/src/analyzer/protocols/rpc/RPC.h
+++ b/src/analyzer/protocols/rpc/RPC.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef rpc_h
-#define rpc_h
+#ifndef ANALYZER_PROTOCOL_RPC_RPC_H
+#define ANALYZER_PROTOCOL_RPC_RPC_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "analyzer/protocols/udp/UDP.h"
diff --git a/src/analyzer/protocols/rpc/XDR.h b/src/analyzer/protocols/rpc/XDR.h
index 2f4a7d59e4..a1be0a1e05 100644
--- a/src/analyzer/protocols/rpc/XDR.h
+++ b/src/analyzer/protocols/rpc/XDR.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef xdr_h
-#define xdr_h
+#ifndef ANALYZER_PROTOCOL_RPC_XDR_H
+#define ANALYZER_PROTOCOL_RPC_XDR_H
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/src/analyzer/protocols/smb/SMB.h b/src/analyzer/protocols/smb/SMB.h
index 0b67c96710..eed1d2e5a0 100644
--- a/src/analyzer/protocols/smb/SMB.h
+++ b/src/analyzer/protocols/smb/SMB.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef smb_h
-#define smb_h
+#ifndef ANALYZER_PROTOCOL_SMB_SMB_H
+#define ANALYZER_PROTOCOL_SMB_SMB_H
 
 // SMB (CIFS) analyzer.
 // Reference: http://www.snia.org/tech_activities/CIFS/CIFS-TR-1p00_FINAL.pdf
diff --git a/src/analyzer/protocols/smtp/SMTP.h b/src/analyzer/protocols/smtp/SMTP.h
index 02322f09c7..c179db4ecb 100644
--- a/src/analyzer/protocols/smtp/SMTP.h
+++ b/src/analyzer/protocols/smtp/SMTP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef smtp_h
-#define smtp_h
+#ifndef ANALYZER_PROTOCOL_SMTP_SMTP_H
+#define ANALYZER_PROTOCOL_SMTP_SMTP_H
 
 #include <list>
 using namespace std;
diff --git a/src/analyzer/protocols/socks/SOCKS.h b/src/analyzer/protocols/socks/SOCKS.h
index 7aed5c02a3..424443c826 100644
--- a/src/analyzer/protocols/socks/SOCKS.h
+++ b/src/analyzer/protocols/socks/SOCKS.h
@@ -1,5 +1,5 @@
-#ifndef socks_h
-#define socks_h
+#ifndef ANALYZER_PROTOCOL_SOCKS_SOCKS_H
+#define ANALYZER_PROTOCOL_SOCKS_SOCKS_H
 
 // SOCKS v4 analyzer.
 
diff --git a/src/analyzer/protocols/ssh/SSH.h b/src/analyzer/protocols/ssh/SSH.h
index 644444136d..6587425807 100644
--- a/src/analyzer/protocols/ssh/SSH.h
+++ b/src/analyzer/protocols/ssh/SSH.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef ssh_h
-#define ssh_h
+#ifndef ANALYZER_PROTOCOL_SSH_SSH_H
+#define ANALYZER_PROTOCOL_SSH_SSH_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 #include "analyzer/protocols/tcp/ContentLine.h"
diff --git a/src/analyzer/protocols/ssl/SSL.h b/src/analyzer/protocols/ssl/SSL.h
index b8d6f20db1..f1323566af 100644
--- a/src/analyzer/protocols/ssl/SSL.h
+++ b/src/analyzer/protocols/ssl/SSL.h
@@ -1,5 +1,5 @@
-#ifndef ssl_h
-#define ssl_h
+#ifndef ANALYZER_PROTOCOL_SSL_SSL_H
+#define ANALYZER_PROTOCOL_SSL_SSL_H
 
 #include "events.bif.h"
 
diff --git a/src/analyzer/protocols/stepping-stone/SteppingStone.h b/src/analyzer/protocols/stepping-stone/SteppingStone.h
index f818a0ee70..212899f32c 100644
--- a/src/analyzer/protocols/stepping-stone/SteppingStone.h
+++ b/src/analyzer/protocols/stepping-stone/SteppingStone.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef steppingstone_h
-#define steppingstone_h
+#ifndef ANALYZER_PROTOCOL_STEPPING_STONE_STEPPINGSTONE_H
+#define ANALYZER_PROTOCOL_STEPPING_STONE_STEPPINGSTONE_H
 
 #include "Queue.h"
 #include "analyzer/protocols/tcp/TCP.h"
diff --git a/src/analyzer/protocols/syslog/Syslog.h b/src/analyzer/protocols/syslog/Syslog.h
index 391c5115b3..fd929a478e 100644
--- a/src/analyzer/protocols/syslog/Syslog.h
+++ b/src/analyzer/protocols/syslog/Syslog.h
@@ -1,6 +1,6 @@
 
-#ifndef Syslog_h
-#define Syslog_h
+#ifndef ANALYZER_PROTOCOL_SYSLOG_SYSLOG_H
+#define ANALYZER_PROTOCOL_SYSLOG_SYSLOG_H
 
 #include "analyzer/protocols/udp/UDP.h"
 #include "analyzer/protocols/tcp/TCP.h"
diff --git a/src/analyzer/protocols/tcp/ContentLine.h b/src/analyzer/protocols/tcp/ContentLine.h
index ca48393cb4..f5d3ef8211 100644
--- a/src/analyzer/protocols/tcp/ContentLine.h
+++ b/src/analyzer/protocols/tcp/ContentLine.h
@@ -1,7 +1,7 @@
 // Support-analyzer to split a reassembled stream into lines.
 
-#ifndef CONTENTLINE_H
-#define CONTENTLINE_H
+#ifndef ANALYZER_PROTOCOL_TCP_CONTENTLINE_H
+#define ANALYZER_PROTOCOL_TCP_CONTENTLINE_H
 
 #include "analyzer/protocols/tcp/TCP.h"
 
diff --git a/src/analyzer/protocols/tcp/Stats.h b/src/analyzer/protocols/tcp/Stats.h
index 42c03ab321..721d898d95 100644
--- a/src/analyzer/protocols/tcp/Stats.h
+++ b/src/analyzer/protocols/tcp/Stats.h
@@ -1,6 +1,6 @@
 
-#ifndef ANALYZER_PROTOCOLS_TCP_STATS_H
-#define ANALYZER_PROTOCOLS_TCP_STATS_H
+#ifndef ANALYZER_PROTOCOL_TCP_STATS_H
+#define ANALYZER_PROTOCOL_TCP_STATS_H
 
 #include "TCP_Endpoint.h"
 
diff --git a/src/analyzer/protocols/tcp/TCP.h b/src/analyzer/protocols/tcp/TCP.h
index 6b0b9e8637..ded3cd7270 100644
--- a/src/analyzer/protocols/tcp/TCP.h
+++ b/src/analyzer/protocols/tcp/TCP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef TCP_H
-#define TCP_H
+#ifndef ANALYZER_PROTOCOL_TCP_TCP_H
+#define ANALYZER_PROTOCOL_TCP_TCP_H
 
 #include "analyzer/Analyzer.h"
 #include "analyzer/protocols/tcp/TCP.h"
diff --git a/src/analyzer/protocols/tcp/TCP_Endpoint.h b/src/analyzer/protocols/tcp/TCP_Endpoint.h
index 6cc2fefebf..31e239225b 100644
--- a/src/analyzer/protocols/tcp/TCP_Endpoint.h
+++ b/src/analyzer/protocols/tcp/TCP_Endpoint.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef tcpendpoint_h
-#define tcpendpoint_h
+#ifndef ANALYZER_PROTOCOL_TCP_TCP_ENDPOINT_H
+#define ANALYZER_PROTOCOL_TCP_TCP_ENDPOINT_H
 
 #include "IPAddr.h"
 
diff --git a/src/analyzer/protocols/tcp/TCP_Reassembler.h b/src/analyzer/protocols/tcp/TCP_Reassembler.h
index ab6eb97b70..8bb80a0570 100644
--- a/src/analyzer/protocols/tcp/TCP_Reassembler.h
+++ b/src/analyzer/protocols/tcp/TCP_Reassembler.h
@@ -1,5 +1,5 @@
-#ifndef TCP_REASSEMBLER_H
-#define TCP_REASSEMBLER_H
+#ifndef ANALYZER_PROTOCOL_TCP_TCP_REASSEMBLER_H
+#define ANALYZER_PROTOCOL_TCP_TCP_REASSEMBLER_H
 
 #include "Reassem.h"
 #include "TCP_Endpoint.h"
diff --git a/src/analyzer/protocols/teredo/Teredo.h b/src/analyzer/protocols/teredo/Teredo.h
index b202a6e729..0da007187d 100644
--- a/src/analyzer/protocols/teredo/Teredo.h
+++ b/src/analyzer/protocols/teredo/Teredo.h
@@ -1,5 +1,5 @@
-#ifndef Teredo_h
-#define Teredo_h
+#ifndef ANALYZER_PROTOCOL_TEREDO_TEREDO_H
+#define ANALYZER_PROTOCOL_TEREDO_TEREDO_H
 
 #include "analyzer/Analyzer.h"
 #include "NetVar.h"
diff --git a/src/analyzer/protocols/udp/UDP.h b/src/analyzer/protocols/udp/UDP.h
index b3ef3bcf2d..bcfee401b0 100644
--- a/src/analyzer/protocols/udp/UDP.h
+++ b/src/analyzer/protocols/udp/UDP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef udp_h
-#define udp_h
+#ifndef ANALYZER_PROTOCOL_UDP_UDP_H
+#define ANALYZER_PROTOCOL_UDP_UDP_H
 
 #include "analyzer/Analyzer.h"
 #include <netinet/udp.h>
diff --git a/src/analyzer/protocols/zip/ZIP.h b/src/analyzer/protocols/zip/ZIP.h
index 7eda1e295f..7753ac2945 100644
--- a/src/analyzer/protocols/zip/ZIP.h
+++ b/src/analyzer/protocols/zip/ZIP.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef zip_h
-#define zip_h
+#ifndef ANALYZER_PROTOCOL_ZIP_ZIP_H
+#define ANALYZER_PROTOCOL_ZIP_ZIP_H
 
 #include "config.h"