diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index dea5608a0d..29bcea3f06 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -271,7 +271,8 @@ endif
 
 if BUILD_ECORE_EVAS_VNC_SERVER
 VNCSERVERSOURCES = \
-modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
+modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c \
+modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c
 ecoreevasenginevncserverpkgdir = $(libdir)/ecore_evas/vnc_server/$(MODULE_ARCH)
 ecoreevasenginevncserverpkg_LTLIBRARIES = modules/ecore_evas/vnc_server/module.la
 
@@ -282,26 +283,16 @@ $(install_ecoreevasenginevncserverpkgLTLIBRARIES): install-libLTLIBRARIES
 
 modules_ecore_evas_vnc_server_module_la_SOURCES = $(VNCSERVERSOURCES)
 modules_ecore_evas_vnc_server_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-@ECORE_EVAS_CFLAGS@ \
-@LIBVNCSERVER_CFLAGS@
+-I$(top_builddir)/src/lib/ecore_fb \
+@LIBVNCSERVER_CFLAGS@ \
+@ECORE_EVAS_CFLAGS@
 modules_ecore_evas_vnc_server_module_la_LIBADD = \
-@USE_ECORE_EVAS_LIBS@ \
-@LIBVNCSERVER_LIBS@
+@LIBVNCSERVER_LIBS@ \
+@USE_ECORE_EVAS_LIBS@
 modules_ecore_evas_vnc_server_module_la_DEPENDENCIES = \
 @USE_ECORE_EVAS_INTERNAL_LIBS@
 modules_ecore_evas_vnc_server_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 modules_ecore_evas_vnc_server_module_la_LIBTOOLFLAGS = --tag=disable-static
-if BUILD_ECORE_EVAS_FB
-modules_ecore_evas_vnc_server_module_la_CPPFLAGS += @ECORE_FB_CFLAGS@ -I$(top_srcdir)/src/modules/evas/engines/fb
-modules_ecore_evas_vnc_server_module_la_LIBADD += @USE_ECORE_FB_LIBS@
-VNCSERVERSOURCES += \
-modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c \
-modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.h
-endif
-if BUILD_ECORE_EVAS_X11
-modules_ecore_evas_vnc_server_module_la_LIBADD += @USE_ECORE_X_LIBS@
-modules_ecore_evas_vnc_server_module_la_CPPFLAGS += @ECORE_X_CFLAGS@ -I$(top_srcdir)/src/modules/evas/engines/software_x11
-endif
 endif
 
 ### Binary
diff --git a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
index 3b43c607af..c2a392400c 100644
--- a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
+++ b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
@@ -12,16 +12,6 @@
 #include <Evas.h>
 #include <Ecore_Evas.h>
 
-#ifdef BUILD_ENGINE_SOFTWARE_X11
-# include <Evas_Engine_Software_X11.h>
-# include <Ecore_X.h>
-#endif
-
-#ifdef BUILD_ENGINE_FB
-# include <Evas_Engine_FB.h>
-# include "ecore_evas_vnc_server_fb_keymap.h"
-#endif
-
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,6 +19,7 @@
 
 #include "ecore_private.h"
 #include "ecore_evas_private.h"
+#include "ecore_evas_vnc_server_fb_keymap.h"
 
 static int _ecore_evas_vnc_server_log_dom;
 static unsigned int _available_seat = 1;
diff --git a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c
index 393693cd98..636026f4b1 100644
--- a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c
+++ b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c
@@ -6,7 +6,7 @@
 
 static const char *_ecore_fb_li_kbd_syms[144 * 7] =
 {
-#include <ecore_fb_keytable.h>
+#include "ecore_fb_keytable.h"
 };
 
 #include "ecore_evas_vnc_server_fb_keymap.h"