--- a/src/x86dasm/i386-dis.c	Mon Dec 21 08:23:54 2009 +1000
+++ b/src/x86dasm/i386-dis.c	Tue Mar 06 09:04:34 2012 +1000
@@ -33,7 +33,7 @@
 
 #include "x86dasm/dis-asm.h"
 #include "x86dasm/sysdep.h"
-#include "x86dasm/x86dasm.h"
+#include "xlat/xlatdasm.h"
 #include "gettext.h"
 
 #define MAXLEN 20
@@ -3175,7 +3175,7 @@
       if (!intel_syntax)
 	if (mod != 0 || (base & 7) == 5)
 	  {
-	    x86_print_symbolic_operand (scratchbuf, !riprel, disp);
+	    xlat_print_symbolic_operand (scratchbuf, !riprel, disp);
 	    oappend (scratchbuf);
 	    if (riprel)
 	      {
@@ -3281,7 +3281,7 @@
 			*obufp = '\0';
 		      }
 
-		    x86_print_symbolic_operand (scratchbuf, 0, disp);
+		    xlat_print_symbolic_operand (scratchbuf, 0, disp);
 		    oappend (scratchbuf);
 		  }
 	      }
@@ -3301,7 +3301,7 @@
 		  oappend (names_seg[ds_reg - es_reg]);
 		  oappend (":");
 		}
-	      x86_print_symbolic_operand (scratchbuf, 1, disp);
+	      xlat_print_symbolic_operand (scratchbuf, 1, disp);
 	      oappend (scratchbuf);
 	    }
 	}
@@ -3334,7 +3334,7 @@
       if (!intel_syntax)
 	if (mod != 0 || (rm & 7) == 6)
 	  {
-	    x86_print_symbolic_operand (scratchbuf, 0, disp);
+	    xlat_print_symbolic_operand (scratchbuf, 0, disp);
 	    oappend (scratchbuf);
 	  }
 
@@ -3632,7 +3632,7 @@
 
   op &= mask;
   scratchbuf[0] = '$';
-  x86_print_symbolic_operand (scratchbuf + 1, 1, op);
+  xlat_print_symbolic_operand (scratchbuf + 1, 1, op);
   oappend (scratchbuf + intel_syntax);
   scratchbuf[0] = '\0';
 }
@@ -3683,7 +3683,7 @@
 
   op &= mask;
   scratchbuf[0] = '$';
-  x86_print_symbolic_operand (scratchbuf + 1, 1, op);
+  xlat_print_symbolic_operand (scratchbuf + 1, 1, op);
   oappend (scratchbuf + intel_syntax);
   scratchbuf[0] = '\0';
 }
@@ -3733,7 +3733,7 @@
     }
 
   scratchbuf[0] = '$';
-  x86_print_symbolic_operand (scratchbuf + 1, 1, op);
+  xlat_print_symbolic_operand (scratchbuf + 1, 1, op);
   oappend (scratchbuf + intel_syntax);
 }
 
@@ -3769,7 +3769,7 @@
     }
   disp = (start_pc + codep - start_codep + disp) & mask;
   set_op (disp, 0);
-  x86_print_symbolic_operand (scratchbuf, 1, disp);
+  xlat_print_symbolic_operand (scratchbuf, 1, disp);
   oappend (scratchbuf);
 }
 
@@ -3823,7 +3823,7 @@
 	  oappend (":");
 	}
     }
-  x86_print_symbolic_operand (scratchbuf, 1, off);
+  xlat_print_symbolic_operand (scratchbuf, 1, off);
   oappend (scratchbuf);
 }
 
@@ -3851,7 +3851,7 @@
 	  oappend (":");
 	}
     }
-  x86_print_symbolic_operand (scratchbuf, 1, off);
+  xlat_print_symbolic_operand (scratchbuf, 1, off);
   oappend (scratchbuf);
 }