--- iodev/eth_tap.cc.orig	2004-01-27 12:00:49.921496528 +0100
+++ iodev/eth_tap.cc	2004-01-27 12:02:00.181584599 +0100
@@ -100,7 +100,7 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
-#if defined(__FreeBSD__) || defined(__APPLE__)  // Should be fixed for other *BSD
+#if !defined(__LINUX__)  // Should be more carefully written
 #include <net/if.h>
 #else
 #include <asm/types.h>
Index: reg_ld_str.c
--- fpu/reg_ld_str.c.orig	2004-06-03 14:34:47.000000000 +0200
+++ fpu/reg_ld_str.c	2004-06-03 14:34:53.000000000 +0200
@@ -315,7 +315,7 @@
 
 
 /* Get a short from user memory */
-int  BX_CPP_AttrRegparmN(1)
+int  BX_CPP_AttrRegparmN(2)
 FPU_load_int16(bx_address _s, FPU_REG *loaded_data)
 {
   s16 s, negative;
Index: Makefile.in
--- Makefile.in.orig	2004-06-09 15:52:12.955255102 +0200
+++ Makefile.in	2004-06-09 15:52:37.847987737 +0200
@@ -100,7 +100,7 @@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 XPM_LIB = @XPM_LIB@
-GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XPM_LIB)
+GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 
 GUI_LINK_OPTS_SDL = `sdl-config --cflags --libs`
 GUI_LINK_OPTS_SVGA =  -lvga -lvgagl
 GUI_LINK_OPTS_BEOS = -lbe