diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am
index 0543f6edd9..1c256b3895 100644
--- a/legacy/evas/Makefile.am
+++ b/legacy/evas/Makefile.am
@@ -30,7 +30,8 @@ dist-hook:
 
 bin_SCRIPTS = evas-config
 
-EXTRA_DIST = TODO README AUTHORS COPYING COPYING-PLAIN evas.spec evas.c.in gendoc Doxyfile evas_docs.tar.gz evas.pc.in
+EXTRA_DIST = TODO README AUTHORS COPYING COPYING-PLAIN evas.spec evas.c.in gendoc Doxyfile evas_docs.tar.gz evas.pc.in \
+make_cross_compile_arm.sh
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = evas.pc
diff --git a/legacy/evas/make_cross_compile_arm.sh b/legacy/evas/make_cross_compile_arm.sh
new file mode 100755
index 0000000000..c09e751ff2
--- /dev/null
+++ b/legacy/evas/make_cross_compile_arm.sh
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+make clean distclean
+./configure \
+--enable-fb \
+--enable-image-loader-png \
+--enable-image-loader-jpeg \
+--enable-image-loader-eet \
+--enable-small-dither-mask \
+--enable-cpu-c \
+--enable-scale-smooth \
+--enable-scale-sample \
+--enable-convert-16-rgb-ipq \
+--enable-convert-16-rgb-rot-270
+
+CC="/skiff/local/bin/arm-linux-gcc"
+ST="/skiff/local/bin/arm-linux-strip"
+CFLAGS="-O2"
+
+rm -rf "build"
+mkdir "build"
+DST=`pwd`"/build";
+
+mkdir $DST"/lib";
+mkdir $DST"/bin";
+mkdir $DST"/include";
+mkdir $DST"/share";
+mkdir $DST"/share/evas";
+
+pushd src
+
+ pushd lib
+  LIB="evas"
+  $CC \
+  canvas/*.c data/*.c engines/fb/*.c file/*.c \
+  engines/common/evas_blend_alpha_color_pixel.c \
+  engines/common/evas_blend_color_pixel.c \
+  engines/common/evas_blend_main.c \
+  engines/common/evas_blend_pixel_cmod_pixel.c \
+  engines/common/evas_blend_pixel_mul_pixel.c \
+  engines/common/evas_blend_pixel_pixel.c \
+  engines/common/evas_blit_main.c \
+  engines/common/evas_convert_color.c \
+  engines/common/evas_convert_gry_1.c \
+  engines/common/evas_convert_gry_4.c \
+  engines/common/evas_convert_gry_8.c \
+  engines/common/evas_convert_main.c \
+  engines/common/evas_convert_rgb_16.c \
+  engines/common/evas_convert_rgb_24.c \
+  engines/common/evas_convert_rgb_32.c \
+  engines/common/evas_convert_rgb_8.c \
+  engines/common/evas_cpu.c \
+  engines/common/evas_draw_main.c \
+  engines/common/evas_font_draw.c \
+  engines/common/evas_font_load.c \
+  engines/common/evas_font_main.c \
+  engines/common/evas_font_query.c \
+  engines/common/evas_gradient_main.c \
+  engines/common/evas_image_load.c \
+  engines/common/evas_image_main.c \
+  engines/common/evas_line_main.c \
+  engines/common/evas_polygon_main.c \
+  engines/common/evas_rectangle_main.c \
+  engines/common/evas_scale_main.c \
+  engines/common/evas_scale_sample.c \
+  engines/common/evas_scale_smooth.c \
+  engines/common/evas_tiler.c \
+  $CFLAGS \
+  -I. -Icanvas -Idata -Iengines/common -Iengines/fb -Ifile -Iinclude \
+  -I/skiff/local/include/freetype2 \
+  -I../.. \
+  -I/skiff/local/include \
+  -shared -fPIC -DPIC \
+  -Wl,-soname -Wl,"lib"$LIB".so.1" \
+  -o "lib"$LIB".so.1.0.0"
+  $ST -g "lib"$LIB".so.1.0.0"
+  rm -f "lib"$LIB".so"
+  ln -s "lib"$LIB".so.1.0.0" "lib"$LIB".so"
+  rm -f "lib"$LIB".so.1"
+  ln -s "lib"$LIB".so.1.0.0" "lib"$LIB".so.1"
+  rm -f "lib"$LIB".so.1.0"
+  ln -s "lib"$LIB".so.1.0.0" "lib"$LIB".so.1.0"
+  cp -a "lib"$LIB".so"* $DST"/lib";
+  cp -a Evas.h Evas_Engine_FB.h $DST"/include";
+ popd
+
+ pushd bin
+  BIN="evas_fb_test"
+   $CC evas_fb_main.c evas_test_main.c \
+   -I../.. -I../lib \
+   -I. \
+   -I/skiff/local/include \
+   -L. -L../lib \
+   -levas -leet -ljpeg -lpng -lfreetype -lm -lz \
+   -o $BIN
+   $ST $BIN
+   cp -a $BIN $DST"/bin";
+ popd
+popd
+
+cp -ar data $DST"/share/evas"
+
+PD=`pwd`
+pushd "build"
+ tar zcvf $PD"/data.tar.gz" *
+ pushd "/skiff/local"
+  sudo tar zxvf $PD"/data.tar.gz"
+ popd
+popd
diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index 9ddb9704ae..1b45d000cf 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -17,8 +17,10 @@
 
 /*****************************************************************************/
 
+#undef MIN
 #define MIN(_x, _y) \
 (((_x) < (_y)) ? (_x) : (_y))
+#undef MAX
 #define MAX(_x, _y) \
 (((_x) > (_y)) ? (_x) : (_y))