diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 0989171..7efb890 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -61,6 +61,10 @@
 
 */
 
+#if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI
+#define _BSD_TYPES
+#endif
+
 #include "Python.h"
 
 #undef MAX
@@ -192,8 +196,18 @@
 
 /* XXX Using _SGIAPI is the wrong thing, 
    but I don't know what the right thing is. */
+#undef _SGIAPI /* to avoid warning */
 #define _SGIAPI 1
 
+#undef _XOPEN_SOURCE
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#ifdef _SS_ALIGNSIZE
+#define HAVE_GETADDRINFO 1
+#define HAVE_GETNAMEINFO 1
+#endif
+
 #define HAVE_INET_PTON
 #include <netdb.h>
 #endif
@@ -257,7 +271,12 @@
 # define O_NONBLOCK O_NDELAY
 #endif
 
+#if defined(__sgi) && _COMPILER_VERSION>700 \
+ && !defined(_SS_ALIGNSIZE) /* defined in sys/socket.h            */
+                            /* by some newer versions of IRIX     */
+                            /* (e.g. not by 6.5.10 but by 6.5.21) */
 #include "addrinfo.h"
+#endif
 
 #ifndef HAVE_INET_PTON
 int inet_pton(int af, const char *src, void *dst);