diff --git a/minissdpd/codelength.h b/minissdpd/codelength.h
index e89aeb0..50d4606 100644
--- a/minissdpd/codelength.h
+++ b/minissdpd/codelength.h
@@ -4,8 +4,8 @@
  * copyright (c) 2005-2011 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENCE file. */
-#ifndef __CODELENGTH_H__
-#define __CODELENGTH_H__
+#ifndef CODELENGTH_H_INCLUDED
+#define CODELENGTH_H_INCLUDED
 
 /* Encode length by using 7bit per Byte :
  * Most significant bit of each byte specifies that the
diff --git a/minissdpd/config.h b/minissdpd/config.h
index 10ba30b..d509fef 100644
--- a/minissdpd/config.h
+++ b/minissdpd/config.h
@@ -4,8 +4,8 @@
  * (c) 2006-2011 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
+#ifndef CONFIG_H_INCLUDED
+#define CONFIG_H_INCLUDED
 
 /* use BSD daemon() ? */
 #define USE_DAEMON
diff --git a/minissdpd/daemonize.h b/minissdpd/daemonize.h
index 202ffb9..818ce73 100644
--- a/minissdpd/daemonize.h
+++ b/minissdpd/daemonize.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __DAEMONIZE_H__
-#define __DAEMONIZE_H__
+#ifndef DAEMONIZE_H_INCLUDED
+#define DAEMONIZE_H_INCLUDED
 
 #include "config.h"
 
diff --git a/minissdpd/ifacewatch.h b/minissdpd/ifacewatch.h
index 5b430e5..0046f55 100644
--- a/minissdpd/ifacewatch.h
+++ b/minissdpd/ifacewatch.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __IFACEWATCH_H__
-#define __IFACEWATCH_H__
+#ifndef IFACEWATCH_H_INCLUDED
+#define IFACEWATCH_H_INCLUDED
 
 int
 OpenAndConfInterfaceWatchSocket(void);
diff --git a/minissdpd/openssdpsocket.h b/minissdpd/openssdpsocket.h
index 2248af0..52439c3 100644
--- a/minissdpd/openssdpsocket.h
+++ b/minissdpd/openssdpsocket.h
@@ -4,8 +4,8 @@
  * (c) 2006-2011 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
-#ifndef __OPENSSDPSOCKET_H__
-#define __OPENSSDPSOCKET_H__
+#ifndef OPENSSDPSOCKET_H_INCLUDED
+#define OPENSSDPSOCKET_H_INCLUDED
 
 /**
  * Open a socket and configure it for receiving SSDP packets
diff --git a/minissdpd/upnputils.h b/minissdpd/upnputils.h
index 363debf..9652cc0 100644
--- a/minissdpd/upnputils.h
+++ b/minissdpd/upnputils.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPUTILS_H__
-#define __UPNPUTILS_H__
+#ifndef UPNPUTILS_H_INCLUDED
+#define UPNPUTILS_H_INCLUDED
 
 /**
  * convert a struct sockaddr to a human readable string.
diff --git a/miniupnpc/codelength.h b/miniupnpc/codelength.h
index e89aeb0..50d4606 100644
--- a/miniupnpc/codelength.h
+++ b/miniupnpc/codelength.h
@@ -4,8 +4,8 @@
  * copyright (c) 2005-2011 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENCE file. */
-#ifndef __CODELENGTH_H__
-#define __CODELENGTH_H__
+#ifndef CODELENGTH_H_INCLUDED
+#define CODELENGTH_H_INCLUDED
 
 /* Encode length by using 7bit per Byte :
  * Most significant bit of each byte specifies that the
diff --git a/miniupnpc/connecthostport.h b/miniupnpc/connecthostport.h
index b8aa883..f3b2d2a 100644
--- a/miniupnpc/connecthostport.h
+++ b/miniupnpc/connecthostport.h
@@ -5,8 +5,8 @@
  * Copyright (c) 2010-2012 Thomas Bernard
  * This software is subjects to the conditions detailed
  * in the LICENCE file provided within this distribution */
-#ifndef __CONNECTHOSTPORT_H__
-#define __CONNECTHOSTPORT_H__
+#ifndef CONNECTHOSTPORT_H_INCLUDED
+#define CONNECTHOSTPORT_H_INCLUDED
 
 /* connecthostport()
  * return a socket connected (TCP) to the host and port
diff --git a/miniupnpc/declspec.h b/miniupnpc/declspec.h
index 2638faa..f66b6d7 100644
--- a/miniupnpc/declspec.h
+++ b/miniupnpc/declspec.h
@@ -1,5 +1,5 @@
-#ifndef __DECLSPEC_H__
-#define __DECLSPEC_H__
+#ifndef DECLSPEC_H_INCLUDED
+#define DECLSPEC_H_INCLUDED
 
 #if defined(_WIN32) && !defined(STATICLIB)
 	#ifdef MINIUPNP_EXPORTS
diff --git a/miniupnpc/minisoap.h b/miniupnpc/minisoap.h
index 696725f..60554f5 100644
--- a/miniupnpc/minisoap.h
+++ b/miniupnpc/minisoap.h
@@ -4,8 +4,8 @@
  * Copyright (c) 2005 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution. */
-#ifndef __MINISOAP_H__
-#define __MINISOAP_H__
+#ifndef MINISOAP_H_INCLUDED
+#define MINISOAP_H_INCLUDED
 
 /*int httpWrite(int, const char *, int, const char *);*/
 int soapPostSubmit(int, const char *, const char *, unsigned short,
diff --git a/miniupnpc/minissdpc.h b/miniupnpc/minissdpc.h
index 25e91ce..2516f48 100644
--- a/miniupnpc/minissdpc.h
+++ b/miniupnpc/minissdpc.h
@@ -5,8 +5,8 @@
  * Copyright (c) 2005-2007 Thomas Bernard
  * This software is subjects to the conditions detailed
  * in the LICENCE file provided within this distribution */
-#ifndef __MINISSDPC_H__
-#define __MINISSDPC_H__
+#ifndef MINISSDPC_H_INCLUDED
+#define MINISSDPC_H_INCLUDED
 
 struct UPNPDev *
 getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath);
diff --git a/miniupnpc/miniupnpc.h b/miniupnpc/miniupnpc.h
index d526a21..b85a6f6 100644
--- a/miniupnpc/miniupnpc.h
+++ b/miniupnpc/miniupnpc.h
@@ -5,8 +5,8 @@
  * Copyright (c) 2005-2012 Thomas Bernard
  * This software is subjects to the conditions detailed
  * in the LICENCE file provided within this distribution */
-#ifndef __MINIUPNPC_H__
-#define __MINIUPNPC_H__
+#ifndef MINIUPNPC_H_INCLUDED
+#define MINIUPNPC_H_INCLUDED
 
 #include "declspec.h"
 #include "igd_desc_parse.h"
diff --git a/miniupnpc/miniupnpctypes.h b/miniupnpc/miniupnpctypes.h
index 86081c3..307ce39 100644
--- a/miniupnpc/miniupnpctypes.h
+++ b/miniupnpc/miniupnpctypes.h
@@ -4,8 +4,8 @@
  * Copyright (c) 2011 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided within this distribution */
-#ifndef __MINIUPNPCTYPES_H__
-#define __MINIUPNPCTYPES_H__
+#ifndef MINIUPNPCTYPES_H_INCLUDED
+#define MINIUPNPCTYPES_H_INCLUDED
 
 #if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
 #define UNSIGNED_INTEGER unsigned long long
diff --git a/miniupnpc/miniwget.h b/miniupnpc/miniwget.h
index ed277ee..cddfdb8 100644
--- a/miniupnpc/miniwget.h
+++ b/miniupnpc/miniwget.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
  * */
-#ifndef __MINIWGET_H__
-#define __MINIWGET_H__
+#ifndef MINIWGET_H_INCLUDED
+#define MINIWGET_H_INCLUDED
 
 #include "declspec.h"
 
diff --git a/miniupnpc/minixml.h b/miniupnpc/minixml.h
index 857c70e..19e6f51 100644
--- a/miniupnpc/minixml.h
+++ b/miniupnpc/minixml.h
@@ -8,8 +8,8 @@
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
  * */
-#ifndef __MINIXML_H__
-#define __MINIXML_H__
+#ifndef MINIXML_H_INCLUDED
+#define MINIXML_H_INCLUDED
 #define IS_WHITE_SPACE(c) ((c==' ') || (c=='\t') || (c=='\r') || (c=='\n'))
 
 /* if a callback function pointer is set to NULL,
diff --git a/miniupnpc/portlistingparse.h b/miniupnpc/portlistingparse.h
index 035f20a..97780a5 100644
--- a/miniupnpc/portlistingparse.h
+++ b/miniupnpc/portlistingparse.h
@@ -4,8 +4,8 @@
  * (c) 2011-2012 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
-#ifndef __PORTLISTINGPARSE_H__
-#define __PORTLISTINGPARSE_H__
+#ifndef PORTLISTINGPARSE_H_INCLUDED
+#define PORTLISTINGPARSE_H_INCLUDED
 
 #include "declspec.h"
 /* for the definition of UNSIGNED_INTEGER */
diff --git a/miniupnpc/receivedata.h b/miniupnpc/receivedata.h
index 35f531c..cb85c33 100644
--- a/miniupnpc/receivedata.h
+++ b/miniupnpc/receivedata.h
@@ -5,8 +5,8 @@
  * Copyright (c) 2011-2012 Thomas Bernard
  * This software is subjects to the conditions detailed
  * in the LICENCE file provided within this distribution */
-#ifndef __RECEIVEDATA_H__
-#define __RECEIVEDATA_H__
+#ifndef RECEIVEDATA_H_INCLUDED
+#define RECEIVEDATA_H_INCLUDED
 
 /* Reads data from the specified socket.
  * Returns the number of bytes read if successful, zero if no bytes were
diff --git a/miniupnpc/upnpcommands.h b/miniupnpc/upnpcommands.h
index 4767538..ee68dfd 100644
--- a/miniupnpc/upnpcommands.h
+++ b/miniupnpc/upnpcommands.h
@@ -4,8 +4,8 @@
  * Copyright (c) 2005-2011 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided within this distribution */
-#ifndef __UPNPCOMMANDS_H__
-#define __UPNPCOMMANDS_H__
+#ifndef UPNPCOMMANDS_H_INCLUDED
+#define UPNPCOMMANDS_H_INCLUDED
 
 #include "upnpreplyparse.h"
 #include "portlistingparse.h"
diff --git a/miniupnpc/upnperrors.h b/miniupnpc/upnperrors.h
index 3a6aaa7..9557820 100644
--- a/miniupnpc/upnperrors.h
+++ b/miniupnpc/upnperrors.h
@@ -5,8 +5,8 @@
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * This software is subjet to the conditions detailed in the
  * provided LICENCE file. */
-#ifndef __UPNPERRORS_H__
-#define __UPNPERRORS_H__
+#ifndef UPNPERRORS_H_INCLUDED
+#define UPNPERRORS_H_INCLUDED
 
 #include "declspec.h"
 
diff --git a/miniupnpc/upnpreplyparse.h b/miniupnpc/upnpreplyparse.h
index 3b302ba..c18c7d2 100644
--- a/miniupnpc/upnpreplyparse.h
+++ b/miniupnpc/upnpreplyparse.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPREPLYPARSE_H__
-#define __UPNPREPLYPARSE_H__
+#ifndef UPNPREPLYPARSE_H_INCLUDED
+#define UPNPREPLYPARSE_H_INCLUDED
 
 #if defined(NO_SYS_QUEUE_H) || defined(_WIN32) || defined(__HAIKU__)
 #include "bsdqueue.h"
diff --git a/miniupnpd/codelength.h b/miniupnpd/codelength.h
index e89aeb0..50d4606 100644
--- a/miniupnpd/codelength.h
+++ b/miniupnpd/codelength.h
@@ -4,8 +4,8 @@
  * copyright (c) 2005-2011 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENCE file. */
-#ifndef __CODELENGTH_H__
-#define __CODELENGTH_H__
+#ifndef CODELENGTH_H_INCLUDED
+#define CODELENGTH_H_INCLUDED
 
 /* Encode length by using 7bit per Byte :
  * Most significant bit of each byte specifies that the
diff --git a/miniupnpd/commonrdr.h b/miniupnpd/commonrdr.h
index 6b42200..dd5cf62 100644
--- a/miniupnpd/commonrdr.h
+++ b/miniupnpd/commonrdr.h
@@ -4,8 +4,8 @@
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
-#ifndef __COMMONRDR_H__
-#define __COMMONRDR_H__
+#ifndef COMMONRDR_H_INCLUDED
+#define COMMONRDR_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/daemonize.h b/miniupnpd/daemonize.h
index 202ffb9..818ce73 100644
--- a/miniupnpd/daemonize.h
+++ b/miniupnpd/daemonize.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __DAEMONIZE_H__
-#define __DAEMONIZE_H__
+#ifndef DAEMONIZE_H_INCLUDED
+#define DAEMONIZE_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/genconfig.sh b/miniupnpd/genconfig.sh
index ad15034..bce40ea 100755
--- a/miniupnpd/genconfig.sh
+++ b/miniupnpd/genconfig.sh
@@ -30,7 +30,7 @@ done
 
 RM="rm -f"
 CONFIGFILE="config.h"
-CONFIGMACRO="__CONFIG_H__"
+CONFIGMACRO="CONFIG_H_INCLUDED"
 
 # version reported in XML descriptions
 #UPNP_VERSION=20070827
diff --git a/miniupnpd/getconnstatus.h b/miniupnpd/getconnstatus.h
index 215913a..5b5da61 100644
--- a/miniupnpd/getconnstatus.h
+++ b/miniupnpd/getconnstatus.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __GETCONNSTATUS_H__
-#define __GETCONNSTATUS_H__
+#ifndef GETCONNSTATUS_H_INCLUDED
+#define GETCONNSTATUS_H_INCLUDED
 
 /**
  * get the connection status
diff --git a/miniupnpd/getifaddr.h b/miniupnpd/getifaddr.h
index ccc6f64..471f9e2 100644
--- a/miniupnpd/getifaddr.h
+++ b/miniupnpd/getifaddr.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __GETIFADDR_H__
-#define __GETIFADDR_H__
+#ifndef GETIFADDR_H_INCLUDED
+#define GETIFADDR_H_INCLUDED
 
 /* getifaddr()
  * take a network interface name and write the
diff --git a/miniupnpd/getifstats.h b/miniupnpd/getifstats.h
index 2ffcb34..e14b853 100644
--- a/miniupnpd/getifstats.h
+++ b/miniupnpd/getifstats.h
@@ -4,8 +4,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __GETIFSTATS_H__
-#define __GETIFSTATS_H__
+#ifndef GETIFSTATS_H_INCLUDED
+#define GETIFSTATS_H_INCLUDED
 
 struct ifdata {
 	unsigned long opackets;
diff --git a/miniupnpd/getroute.h b/miniupnpd/getroute.h
index fcf77a4..a556efd 100644
--- a/miniupnpd/getroute.h
+++ b/miniupnpd/getroute.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef  __GETROUTE_H__
-#define  __GETROUTE_H__
+#ifndef  GETROUTE_H_INCLUDED
+#define  GETROUTE_H_INCLUDED
 
 int
 get_src_for_route_to(const struct sockaddr * dst,
diff --git a/miniupnpd/ifacewatcher.h b/miniupnpd/ifacewatcher.h
index ffbf867..4b2e15a 100644
--- a/miniupnpd/ifacewatcher.h
+++ b/miniupnpd/ifacewatcher.h
@@ -35,8 +35,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE. */
 
-#ifndef __IFACEWATCHER_H__
-#define __IFACEWATCHER_H__
+#ifndef IFACEWATCHER_H_INCLUDED
+#define IFACEWATCHER_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/ipf/ipfrdr.h b/miniupnpd/ipf/ipfrdr.h
index 3b8a41a..f48b083 100644
--- a/miniupnpd/ipf/ipfrdr.h
+++ b/miniupnpd/ipf/ipfrdr.h
@@ -4,8 +4,8 @@
  * (c) 2006-2007 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
-#ifndef __IPFRDR_H__
-#define __IPFRDR_H__
+#ifndef IPFRDR_H_INCLUDED
+#define IPFRDR_H_INCLUDED
 
 #include "../commonrdr.h"
 
diff --git a/miniupnpd/ipfw/ipfwrdr.h b/miniupnpd/ipfw/ipfwrdr.h
index 20fc471..9e55038 100644
--- a/miniupnpd/ipfw/ipfwrdr.h
+++ b/miniupnpd/ipfw/ipfwrdr.h
@@ -7,8 +7,8 @@
  * in the LICENCE file provided within the distribution
  */
 
-#ifndef __IPFWRDR_H__
-#define __IPFWRDR_H__
+#ifndef IPFWRDR_H_INCLUDED
+#define IPFWRDR_H_INCLUDED
 
 #include "../commonrdr.h"
 
diff --git a/miniupnpd/macros.h b/miniupnpd/macros.h
index ceafd08..f6f7c16 100644
--- a/miniupnpd/macros.h
+++ b/miniupnpd/macros.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __MACROS_H__
-#define __MACROS_H__
+#ifndef MACROS_H_INCLUDED
+#define MACROS_H_INCLUDED
 
 #define UNUSED(arg)	(void)(arg)
 
diff --git a/miniupnpd/minissdp.h b/miniupnpd/minissdp.h
index c080a4e..e175ea5 100644
--- a/miniupnpd/minissdp.h
+++ b/miniupnpd/minissdp.h
@@ -4,8 +4,8 @@
  * (c) 2006-2007 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
-#ifndef __MINISSDP_H__
-#define __MINISSDP_H__
+#ifndef MINISSDP_H_INCLUDED
+#define MINISSDP_H_INCLUDED
 
 #include "miniupnpdtypes.h"
 
diff --git a/miniupnpd/miniupnpdpath.h b/miniupnpd/miniupnpdpath.h
index 59a0790..a728ec1 100644
--- a/miniupnpd/miniupnpdpath.h
+++ b/miniupnpd/miniupnpdpath.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __MINIUPNPDPATH_H__
-#define __MINIUPNPDPATH_H__
+#ifndef MINIUPNPDPATH_H_INCLUDED
+#define MINIUPNPDPATH_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/miniupnpdtypes.h b/miniupnpd/miniupnpdtypes.h
index 938406b..6e112b8 100644
--- a/miniupnpd/miniupnpdtypes.h
+++ b/miniupnpd/miniupnpdtypes.h
@@ -4,8 +4,8 @@
  * (c) 2006-2012 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
-#ifndef __MINIUPNPDTYPES_H__
-#define __MINIUPNPDTYPES_H__
+#ifndef MINIUPNPDTYPES_H_INCLUDED
+#define MINIUPNPDTYPES_H_INCLUDED
 
 #include "config.h"
 #include <netinet/in.h>
diff --git a/miniupnpd/minixml.h b/miniupnpd/minixml.h
index 857c70e..19e6f51 100644
--- a/miniupnpd/minixml.h
+++ b/miniupnpd/minixml.h
@@ -8,8 +8,8 @@
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
  * */
-#ifndef __MINIXML_H__
-#define __MINIXML_H__
+#ifndef MINIXML_H_INCLUDED
+#define MINIXML_H_INCLUDED
 #define IS_WHITE_SPACE(c) ((c==' ') || (c=='\t') || (c=='\r') || (c=='\n'))
 
 /* if a callback function pointer is set to NULL,
diff --git a/miniupnpd/natpmp.h b/miniupnpd/natpmp.h
index 207fdb6..1f40a2c 100644
--- a/miniupnpd/natpmp.h
+++ b/miniupnpd/natpmp.h
@@ -3,8 +3,8 @@
  * author : Thomas Bernard
  * website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  */
-#ifndef __NATPMP_H__
-#define __NATPMP_H__
+#ifndef NATPMP_H_INCLUDED
+#define NATPMP_H_INCLUDED
 
 /* The NAT-PMP specification which can be found at the url :
  * http://files.dns-sd.org/draft-cheshire-nat-pmp.txt
diff --git a/miniupnpd/netfilter/iptcrdr.h b/miniupnpd/netfilter/iptcrdr.h
index f26bbc5..861b51e 100644
--- a/miniupnpd/netfilter/iptcrdr.h
+++ b/miniupnpd/netfilter/iptcrdr.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __IPTCRDR_H__
-#define __IPTCRDR_H__
+#ifndef IPTCRDR_H_INCLUDED
+#define IPTCRDR_H_INCLUDED
 
 #include "../commonrdr.h"
 
diff --git a/miniupnpd/netfilter/iptpinhole.h b/miniupnpd/netfilter/iptpinhole.h
index d132712..9d764ef 100644
--- a/miniupnpd/netfilter/iptpinhole.h
+++ b/miniupnpd/netfilter/iptpinhole.h
@@ -4,8 +4,8 @@
  * (c) 2012 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
-#ifndef __IPTPINHOLE_H__
-#define __IPTPINHOLE_H__
+#ifndef IPTPINHOLE_H_INCLUDED
+#define IPTPINHOLE_H_INCLUDED
 
 #ifdef ENABLE_6FC_SERVICE
 int add_pinhole(const char * ifname,
diff --git a/miniupnpd/options.h b/miniupnpd/options.h
index 528efb1..270ce00 100644
--- a/miniupnpd/options.h
+++ b/miniupnpd/options.h
@@ -6,8 +6,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __OPTIONS_H__
-#define __OPTIONS_H__
+#ifndef OPTIONS_H_INCLUDED
+#define OPTIONS_H_INCLUDED
 
 #include "config.h"
 
@@ -74,5 +74,5 @@ extern unsigned int num_options;
 
 #endif /* DISABLE_CONFIG_FILE */
 
-#endif /* __OPTIONS_H__ */
+#endif /* OPTIONS_H_INCLUDED */
 
diff --git a/miniupnpd/pf/obsdrdr.h b/miniupnpd/pf/obsdrdr.h
index 4386cc5..59225fd 100644
--- a/miniupnpd/pf/obsdrdr.h
+++ b/miniupnpd/pf/obsdrdr.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __OBSDRDR_H__
-#define __OBSDRDR_H__
+#ifndef OBSDRDR_H_INCLUDED
+#define OBSDRDR_H_INCLUDED
 
 #include "../commonrdr.h"
 
diff --git a/miniupnpd/pf/pfpinhole.h b/miniupnpd/pf/pfpinhole.h
index 48bd1a0..a5a0e83 100644
--- a/miniupnpd/pf/pfpinhole.h
+++ b/miniupnpd/pf/pfpinhole.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __PFPINHOLE_H__
-#define __PFPINHOLE_H__
+#ifndef PFPINHOLE_H_INCLUDED
+#define PFPINHOLE_H_INCLUDED
 
 #ifdef ENABLE_6FC_SERVICE
 int add_pinhole(const char * ifname,
diff --git a/miniupnpd/upnpdescgen.h b/miniupnpd/upnpdescgen.h
index 8a39088..deaed69 100644
--- a/miniupnpd/upnpdescgen.h
+++ b/miniupnpd/upnpdescgen.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPDESCGEN_H__
-#define __UPNPDESCGEN_H__
+#ifndef UPNPDESCGEN_H_INCLUDED
+#define UPNPDESCGEN_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/upnpdescstrings.h b/miniupnpd/upnpdescstrings.h
index f57ea2f..d2b2868 100644
--- a/miniupnpd/upnpdescstrings.h
+++ b/miniupnpd/upnpdescstrings.h
@@ -4,8 +4,8 @@
  * (c) 2006-2012 Thomas Bernard
  * This software is subject to the coditions detailed in
  * the LICENCE file provided within the distribution */
-#ifndef __UPNPDESCSTRINGS_H__
-#define __UPNPDESCSTRINGS_H__
+#ifndef UPNPDESCSTRINGS_H_INCLUDED
+#define UPNPDESCSTRINGS_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/upnpevents.h b/miniupnpd/upnpevents.h
index 712d58c..3bd2df2 100644
--- a/miniupnpd/upnpevents.h
+++ b/miniupnpd/upnpevents.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPEVENTS_H__
-#define __UPNPEVENTS_H__
+#ifndef UPNPEVENTS_H_INCLUDED
+#define UPNPEVENTS_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/upnpglobalvars.h b/miniupnpd/upnpglobalvars.h
index 8caf66b..686e6af 100644
--- a/miniupnpd/upnpglobalvars.h
+++ b/miniupnpd/upnpglobalvars.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPGLOBALVARS_H__
-#define __UPNPGLOBALVARS_H__
+#ifndef UPNPGLOBALVARS_H_INCLUDED
+#define UPNPGLOBALVARS_H_INCLUDED
 
 #include <time.h>
 #include "upnppermissions.h"
diff --git a/miniupnpd/upnphttp.h b/miniupnpd/upnphttp.h
index 85cb525..30cdbbe 100644
--- a/miniupnpd/upnphttp.h
+++ b/miniupnpd/upnphttp.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPHTTP_H__
-#define __UPNPHTTP_H__
+#ifndef UPNPHTTP_H_INCLUDED
+#define UPNPHTTP_H_INCLUDED
 
 #include <netinet/in.h>
 #include <sys/queue.h>
diff --git a/miniupnpd/upnppermissions.h b/miniupnpd/upnppermissions.h
index f095f00..dea551e 100644
--- a/miniupnpd/upnppermissions.h
+++ b/miniupnpd/upnppermissions.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPPERMISSIONS_H__
-#define __UPNPPERMISSIONS_H__
+#ifndef UPNPPERMISSIONS_H_INCLUDED
+#define UPNPPERMISSIONS_H_INCLUDED
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/miniupnpd/upnppinhole.h b/miniupnpd/upnppinhole.h
index fbfe1f2..9953a3a 100644
--- a/miniupnpd/upnppinhole.h
+++ b/miniupnpd/upnppinhole.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPPINHOLE_H__
-#define __UPNPPINHOLE_H__
+#ifndef UPNPPINHOLE_H_INCLUDED
+#define UPNPPINHOLE_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/upnpredirect.h b/miniupnpd/upnpredirect.h
index 9be7eca..9870e44 100644
--- a/miniupnpd/upnpredirect.h
+++ b/miniupnpd/upnpredirect.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPREDIRECT_H__
-#define __UPNPREDIRECT_H__
+#ifndef UPNPREDIRECT_H_INCLUDED
+#define UPNPREDIRECT_H_INCLUDED
 
 /* for u_int64_t */
 #include <sys/types.h>
diff --git a/miniupnpd/upnpreplyparse.h b/miniupnpd/upnpreplyparse.h
index 3b302ba..c18c7d2 100644
--- a/miniupnpd/upnpreplyparse.h
+++ b/miniupnpd/upnpreplyparse.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPREPLYPARSE_H__
-#define __UPNPREPLYPARSE_H__
+#ifndef UPNPREPLYPARSE_H_INCLUDED
+#define UPNPREPLYPARSE_H_INCLUDED
 
 #if defined(NO_SYS_QUEUE_H) || defined(_WIN32) || defined(__HAIKU__)
 #include "bsdqueue.h"
diff --git a/miniupnpd/upnpsoap.h b/miniupnpd/upnpsoap.h
index b3c8e91..5dda29f 100644
--- a/miniupnpd/upnpsoap.h
+++ b/miniupnpd/upnpsoap.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPSOAP_H__
-#define __UPNPSOAP_H__
+#ifndef UPNPSOAP_H_INCLUDED
+#define UPNPSOAP_H_INCLUDED
 
 /* ExecuteSoapAction():
  * this method executes the requested Soap Action */
diff --git a/miniupnpd/upnpurns.h b/miniupnpd/upnpurns.h
index 43011c5..db10664 100644
--- a/miniupnpd/upnpurns.h
+++ b/miniupnpd/upnpurns.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPURNS_H__
-#define __UPNPURNS_H__
+#ifndef UPNPURNS_H_INCLUDED
+#define UPNPURNS_H_INCLUDED
 
 #include "config.h"
 
diff --git a/miniupnpd/upnputils.h b/miniupnpd/upnputils.h
index 363debf..9652cc0 100644
--- a/miniupnpd/upnputils.h
+++ b/miniupnpd/upnputils.h
@@ -5,8 +5,8 @@
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
-#ifndef __UPNPUTILS_H__
-#define __UPNPUTILS_H__
+#ifndef UPNPUTILS_H_INCLUDED
+#define UPNPUTILS_H_INCLUDED
 
 /**
  * convert a struct sockaddr to a human readable string.