diff --git a/src/inet.h b/src/inet.h
index 5618b61..5b7b68e 100644
--- a/src/inet.h
+++ b/src/inet.h
@@ -18,6 +18,10 @@
 #include "socket.h"
 #include "timeout.h"
 
+#ifndef HAVE_GETADDRINFO
+#include "getaddrinfo.h"
+#endif
+
 #ifdef _WIN32
 #define LUASOCKET_INET_ATON
 #endif
diff --git a/src/makefile b/src/makefile
index 25b293c..5b09a34 100755
--- a/src/makefile
+++ b/src/makefile
@@ -285,7 +285,7 @@ SOCKET=$(SOCKET_$(PLAT))
 #
 CC=$(CC_$(PLAT))
 DEF=$(DEF_$(PLAT))
-CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
+CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT)) -DSTDC_HEADERS -DHAVE_STDLIB_H
 LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
 LD=$(LD_$(PLAT))
 LUAINC= $(LUAINC_$(PLAT))
@@ -295,6 +295,7 @@ LUALIB= $(LUALIB_$(PLAT))
 # Modules belonging to socket-core
 #
 SOCKET_OBJS= \
+	getaddrinfo.$(O) \
 	luasocket.$(O) \
 	timeout.$(O) \
 	buffer.$(O) \
@@ -459,3 +460,4 @@ unix.$(O): unix.c auxiliar.h socket.h io.h timeout.h usocket.h \
 	options.h unix.h buffer.h
 usocket.$(O): usocket.c socket.h io.h timeout.h usocket.h
 wsocket.$(O): wsocket.c socket.h io.h timeout.h usocket.h
+getaddrinfo.$(O): getaddrinfo.c getaddrinfo.h
diff --git a/src/usocket.h b/src/usocket.h
index 45f2f99..54a4ffc 100644
--- a/src/usocket.h
+++ b/src/usocket.h
@@ -31,6 +31,10 @@
 #include <netinet/tcp.h>
 #include <net/if.h>
 
+#ifndef HAVE_GETADDRINFO
+#include "getaddrinfo.h"
+#endif
+
 #ifndef SO_REUSEPORT
 #define SO_REUSEPORT SO_REUSEADDR
 #endif