*** ./xaw/xboard.c.ORIG	Fri Dec 11 23:12:25 2009
--- ./xaw/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
*** ./xaw/xoptions.c.ORIG	Fri Dec 11 22:36:08 2009
--- ./xaw/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>
*** ./xaw/xoptions.c.ORIG	Tue Mar 13 17:13:28 2012
--- ./xaw/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)
  {
*** ./xaw/xboard.c.ORIG	Mon Nov 10 09:54:30 2014
--- ./xaw/xboard.c	Mon Nov 10 11:30:42 2014
***************
*** 2046,2051 ****
--- 2046,2070 ----
      QuitProc();
  }
  
+ #ifndef XK_Shift_L
+ #define XK_Shift_L                       0xffe1  /* Left shift */
+ #endif
+ #ifndef XK_Shift_R
+ #define XK_Shift_R                       0xffe2  /* Right shift */
+ #endif
+ #ifndef XK_Control_L
+ #define XK_Control_L                     0xffe3  /* Left control */
+ #endif
+ #ifndef XK_Control_R
+ #define XK_Control_R                     0xffe4  /* Right control */
+ #endif
+ #ifndef XK_Meta_L
+ #define XK_Meta_L                        0xffe7  /* Left meta */
+ #endif
+ #ifndef XK_Meta_R
+ #define XK_Meta_R                        0xffe8  /* Right meta */
+ #endif
+ 
  int
  ShiftKeys ()
  {   // bassic primitive for determining if modifier keys are pressed
*** ./Makefile.in.ORIG	Mon Nov 10 11:33:49 2014
--- ./Makefile.in	Mon Nov 10 11:34:01 2014
***************
*** 532,538 ****
  
  ###
  SUBDIRS = po
! xboard_LDADD = -ldl -lm @FRONTEND_LIBS@ @X_LIBS@ @LIBINTL@ @CAIRO_LIBS@
  EXTRA_DIST = pixmaps themes png sounds winboard \
  	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop xboard-config.desktop \
  	xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop xboard.xml \
--- 532,538 ----
  
  ###
  SUBDIRS = po
! xboard_LDADD = -ldl -lm -lbsd @FRONTEND_LIBS@ @X_LIBS@ @LIBINTL@ @CAIRO_LIBS@
  EXTRA_DIST = pixmaps themes png sounds winboard \
  	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop xboard-config.desktop \
  	xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop xboard.xml \
*** ./dialogs.c.ORIG	Mon Nov 10 09:46:04 2014
--- ./dialogs.c	Mon Nov 10 09:46:45 2014
***************
*** 45,51 ****
--- 45,55 ----
  #if HAVE_UNISTD_H
  # include <unistd.h>
  #endif
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  
  #include "common.h"
  #include "frontend.h"
*** ./gtk/xoptions.c.ORIG	Fri Nov 28 14:29:04 2014
--- ./gtk/xoptions.c	Fri Nov 28 14:29:31 2014
***************
*** 45,51 ****
--- 45,55 ----
  #if HAVE_UNISTD_H
  # include <unistd.h>
  #endif
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  
  #include <cairo/cairo.h>
  #include <cairo/cairo-xlib.h>