diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index caecb7a115..f2168c1b94 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2541,6 +2541,7 @@ generic/evas/xcf/pixelfuncs.c \
 generic/evas/common/shmfile.c \
 generic/evas/common/timeout.c
 generic_evas_xcf_evas_image_loader_xcf_CFLAGS = \
+@EVAS_CFLAGS@ \
 -I$(top_srcdir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
diff --git a/src/generic/evas/common/shmfile.c b/src/generic/evas/common/shmfile.c
index 538a3149a7..9beb1161d8 100644
--- a/src/generic/evas/common/shmfile.c
+++ b/src/generic/evas/common/shmfile.c
@@ -7,7 +7,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <math.h>
-#include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
 #include <time.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/src/generic/evas/xcf/common.h b/src/generic/evas/xcf/common.h
index 5abaab8677..34b0cad692 100644
--- a/src/generic/evas/xcf/common.h
+++ b/src/generic/evas/xcf/common.h
@@ -10,7 +10,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <math.h>
-#include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
 #include <time.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/src/generic/evas/xcf/main.c b/src/generic/evas/xcf/main.c
index 8ffa099488..4de03f8be8 100644
--- a/src/generic/evas/xcf/main.c
+++ b/src/generic/evas/xcf/main.c
@@ -49,6 +49,10 @@
 #include "shmfile.h"
 #include "timeout.h"
 
+#ifdef _WIN32
+# include <winsock2.h> /* for ntohl() */
+#endif
+
 #define FREE(X) { free(X); X = NULL; }
 
 #define TILE_WIDTH   64