diff --git a/Modules/addrinfo.h b/Modules/addrinfo.h
index d781c0d..6f67a2e 100644
--- a/Modules/addrinfo.h
+++ b/Modules/addrinfo.h
@@ -53,7 +53,7 @@
 #undef EAI_MAX
 #undef getaddrinfo
 #define getaddrinfo fake_getaddrinfo
-#endif
+#endif /* EAI_ADDRFAMILY */
 
 #define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
 #define	EAI_AGAIN	 2	/* temporary failure in name resolution */
@@ -83,7 +83,7 @@
 #undef AI_ADDRCONFIG
 #undef AI_V4MAPPED
 #undef AI_DEFAULT
-#endif
+#endif /* AI_PASSIVE */
 
 #define	AI_PASSIVE	0x00000001 /* get address to use bind() */
 #define	AI_CANONNAME	0x00000002 /* fill ai_canonname */
@@ -98,7 +98,7 @@
 /* special recommended flags for getipnodebyname */
 #define	AI_DEFAULT	(AI_V4MAPPED_CFG | AI_ADDRCONFIG)
 
-#endif /* HAVE_GETADDRINFO */
+#endif /* !HAVE_GETADDRINFO */
 
 #ifndef HAVE_GETNAMEINFO
 
@@ -108,7 +108,7 @@
 #ifndef NI_MAXHOST
 #define	NI_MAXHOST	1025
 #define	NI_MAXSERV	32
-#endif
+#endif /* !NI_MAXHOST */
 
 /*
  * Flag values for getnameinfo()
@@ -119,9 +119,9 @@
 #define	NI_NAMEREQD	0x00000004
 #define	NI_NUMERICSERV	0x00000008
 #define	NI_DGRAM	0x00000010
-#endif
+#endif /* !NI_NOFQDN */
 
-#endif /* HAVE_GETNAMEINFO */
+#endif /* !HAVE_GETNAMEINFO */
 
 #ifndef HAVE_ADDRINFO
 struct addrinfo {
@@ -134,7 +134,7 @@
 	struct sockaddr *ai_addr;	/* binary address */
 	struct addrinfo *ai_next;	/* next structure in linked list */
 };
-#endif
+#endif /* !HAVE_ADDRINFO */
 
 #ifndef HAVE_SOCKADDR_STORAGE
 /*
@@ -145,7 +145,7 @@
 #define _SS_ALIGNSIZE	(sizeof(PY_LONG_LONG))
 #else
 #define _SS_ALIGNSIZE	(sizeof(double))
-#endif
+#endif /* HAVE_LONG_LONG */
 #define _SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(u_char) * 2)
 #define _SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(u_char) * 2 - \
 				_SS_PAD1SIZE - _SS_ALIGNSIZE)
@@ -156,16 +156,16 @@
 	unsigned char ss_family;	/* address family */
 #else
 	unsigned short ss_family;	/* address family */
-#endif
+#endif /* HAVE_SOCKADDR_SA_LEN */
 	char	__ss_pad1[_SS_PAD1SIZE];
 #ifdef HAVE_LONG_LONG
 	PY_LONG_LONG __ss_align;	/* force desired structure storage alignment */
 #else
 	double __ss_align;	/* force desired structure storage alignment */
-#endif
+#endif /* HAVE_LONG_LONG */
 	char	__ss_pad2[_SS_PAD2SIZE];
 };
-#endif
+#endif /* !HAVE_SOCKADDR_STORAGE */
 
 #ifdef __cplusplus
 extern "C" {