diff --git a/Makefile b/Makefile
index cc17c12a..7538f6c8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,20 @@
 .PHONY : all clean 
 
 CFLAGS = -g -Wall 
-LDFLAGS = -lpthread -llua -ldl -lm
+LDFLAGS = -lpthread -llua -lm
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 ifeq ($(uname_S), Darwin)
 	SHARED = -fPIC -dynamiclib -Wl,-undefined,dynamic_lookup
 else
-	LDFLAGS += -ldl -lrt -Wl,-E
+	LDFLAGS += -lrt -Wl,-E
 	SHARED = -fPIC --shared
 endif
 
+ifneq ($(uname_S), FreeBSD)
+	LDFLAGS += -ldl
+endif
+
 all : \
   skynet \
   service/snlua.so \
diff --git a/client-src/client.c b/client-src/client.c
index 1c5f1c87..11d8bc82 100644
--- a/client-src/client.c
+++ b/client-src/client.c
@@ -1,4 +1,5 @@
 #include <pthread.h>
+#include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
diff --git a/connection/lua-socket.c b/connection/lua-socket.c
index 41d35e04..47b052ae 100644
--- a/connection/lua-socket.c
+++ b/connection/lua-socket.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include <netinet/in.h>
 #include <sys/uio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/gate/main.c b/gate/main.c
index 35cb5b49..91aa990c 100644
--- a/gate/main.c
+++ b/gate/main.c
@@ -1,6 +1,7 @@
 #include "skynet.h"
 #include "mread.h"
 
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/gate/mread.c b/gate/mread.c
index 665264e6..cdeeaaee 100644
--- a/gate/mread.c
+++ b/gate/mread.c
@@ -15,13 +15,16 @@
 #endif
 /* ! Test for polling API */
 
+
+#include <sys/types.h>
+
 #ifdef HAVE_EPOLL
 #include <sys/epoll.h>
 #elif HAVE_KQUEUE
 #include <sys/event.h>
 #endif
 
-#include <sys/types.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <unistd.h>
diff --git a/service-src/service_harbor.c b/service-src/service_harbor.c
index bf27b529..3ff9c0e7 100644
--- a/service-src/service_harbor.c
+++ b/service-src/service_harbor.c
@@ -1,6 +1,7 @@
 #include "skynet.h"
 #include "skynet_harbor.h"
 
+#include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
diff --git a/service-src/service_master.c b/service-src/service_master.c
index eaaffcd0..025e9bba 100644
--- a/service-src/service_master.c
+++ b/service-src/service_master.c
@@ -1,6 +1,7 @@
 #include "skynet.h"
 #include "skynet_harbor.h"
 
+#include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>