--- a/fake-rfc2553.h	Mon Mar 27 08:36:44 2006 +0000
+++ b/fake-rfc2553.h	Tue Mar 28 16:04:11 2006 +0000
@@ -64,19 +64,19 @@
 #endif /* !IN6_IS_ADDR_LOOPBACK */
 
 #ifndef HAVE_STRUCT_IN6_ADDR
-// struct in6_addr {
-//	u_int8_t	s6_addr[16];
-// };
+struct in6_addr {
+	u_int8_t	s6_addr[16];
+};
 #endif /* !HAVE_STRUCT_IN6_ADDR */
 
-// #ifndef HAVE_STRUCT_SOCKADDR_IN6
-// struct sockaddr_in6 {
-// 	unsigned short	sin6_family;
-// 	u_int16_t	sin6_port;
-// 	u_int32_t	sin6_flowinfo;
-// 	struct in6_addr	sin6_addr;
-// };
-// #endif /* !HAVE_STRUCT_SOCKADDR_IN6 */
+#ifndef HAVE_STRUCT_SOCKADDR_IN6
+struct sockaddr_in6 {
+	unsigned short	sin6_family;
+	u_int16_t	sin6_port;
+	u_int32_t	sin6_flowinfo;
+	struct in6_addr	sin6_addr;
+};
+#endif /* !HAVE_STRUCT_SOCKADDR_IN6 */
 
 #ifndef AF_INET6
 /* Define it to something that should never appear */
@@ -120,18 +120,18 @@
 # define EAI_NONAME	3
 #endif
 
-// #ifndef HAVE_STRUCT_ADDRINFO
-// struct addrinfo {
-// 	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME */
-// 	int	ai_family;	/* PF_xxx */
-// 	int	ai_socktype;	/* SOCK_xxx */
-// 	int	ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-// 	size_t	ai_addrlen;	/* length of ai_addr */
-// 	char	*ai_canonname;	/* canonical name for hostname */
-// 	struct sockaddr *ai_addr;	/* binary address */
-// 	struct addrinfo *ai_next;	/* next structure in linked list */
-// };
-// #endif /* !HAVE_STRUCT_ADDRINFO */
+#ifndef HAVE_STRUCT_ADDRINFO
+struct addrinfo {
+	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME */
+	int	ai_family;	/* PF_xxx */
+	int	ai_socktype;	/* SOCK_xxx */
+	int	ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+	size_t	ai_addrlen;	/* length of ai_addr */
+	char	*ai_canonname;	/* canonical name for hostname */
+	struct sockaddr *ai_addr;	/* binary address */
+	struct addrinfo *ai_next;	/* next structure in linked list */
+};
+#endif /* !HAVE_STRUCT_ADDRINFO */
 
 #ifndef HAVE_GETADDRINFO
 #ifdef getaddrinfo