*** ./xboard.c.ORIG	Fri Dec 11 23:12:25 2009
--- ./xboard.c	Fri Dec 11 23:15:09 2009
***************
*** 1980,1985 ****
--- 1980,1997 ----
      NULL
    };
  
+ #if defined(_AIX51) || defined(_AIX52) || defined(_AIX53)
+ Atom
+ XA_UTF8_STRING(Display * dpy)
+ {
+     static AtomPtr p = NULL;
+ 
+     if (p == NULL)
+       p = XmuMakeAtom("UTF8_STRING");
+ 
+     return XmuInternAtom(dpy, p);
+ }
+ #endif
  
  /* Max possible square size */
  #define MAXSQSIZE 256
*** ./xoptions.c.ORIG	Fri Dec 11 22:36:08 2009
--- ./xoptions.c	Fri Dec 11 22:36:22 2009
***************
*** 45,51 ****
--- 45,53 ----
  #if HAVE_UNISTD_H
  # include <unistd.h>
  #endif
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  #include <X11/Intrinsic.h>
  #include <X11/StringDefs.h>
*** ./filebrowser/path.c.ORIG	Wed Feb  2 09:58:27 2011
--- ./filebrowser/path.c	Wed Feb  2 10:00:56 2011
***************
*** 69,74 ****
--- 69,76 ----
  
  static int SFtwiddle = 0;
  
+ void SFsetText(char *);
+ 
  int
  SFchdir(path)
  	char	*path;
*** ./xoptions.c.ORIG	Tue Mar 13 17:13:28 2012
--- ./xoptions.c	Tue Mar 13 17:14:08 2012
***************
*** 1680,1685 ****
--- 1680,1692 ----
  	XtOverrideTranslations(boxOptions[0].handle, XtParseTranslationTable(moveTypeInTranslations));
  }
  
+ #ifndef XK_Meta_L
+ #define XK_Meta_L                        0xffe7  /* Left meta */
+ #endif
+ #ifndef XK_Meta_R
+ #define XK_Meta_R                        0xffe8  /* Right meta */
+ #endif
+ 
  void
  MoveTypeInProc (Widget widget, caddr_t unused, XEvent *event)
  {
*** ./Makefile.in.ORIG	Tue Mar 13 17:22:35 2012
--- ./Makefile.in	Tue Mar 13 17:22:54 2012
***************
*** 359,365 ****
  		 $(ZPY)
  
  SUBDIRS = po
! xboard_LDADD = -lm @XAW_LIBS@ @X_LIBS@ @LIBINTL@
  EXTRA_DIST = pixmaps bitmaps sounds winboard filebrowser/README \
  	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop \
  	xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop xboard.xml \
--- 359,365 ----
  		 $(ZPY)
  
  SUBDIRS = po
! xboard_LDADD = -lm -lbsd @XAW_LIBS@ @X_LIBS@ @LIBINTL@
  EXTRA_DIST = pixmaps bitmaps sounds winboard filebrowser/README \
  	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop \
  	xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop xboard.xml \
