*** ./other/pamx/window.c.ORIG	Tue Jan 11 13:38:28 2011
--- ./other/pamx/window.c	Tue Jan 11 13:38:41 2011
***************
*** 15,21 ****
--- 15,23 ----
  #include <sys/types.h>
  #include <X11/cursorfont.h>
  #include <X11/Xatom.h>
+ #ifndef _AIX
  #include <X11/Xdefs.h>  /* Needed by Xutil.h */
+ #endif
  #include <X11/X.h>      /* Needed by Xutil.h */
  #include <X11/Xlib.h>   /* Needed by Xutil.h */
  #include <X11/Xutil.h>
*** ./converter/pbm/cmuwmtopbm.c.ORIG	Tue Jan 11 13:24:39 2011
--- ./converter/pbm/cmuwmtopbm.c	Tue Jan 11 13:24:50 2011
***************
*** 18,24 ****
--- 18,26 ----
     This program does not check the pad bits at the end of each row.
  */
  
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include "pbm.h"
  #include "cmuwm.h"
  
*** ./config.mk.in.ORIG	Tue Jan 11 13:46:20 2011
--- ./config.mk.in	Tue Jan 11 13:46:51 2011
***************
*** 450,461 ****
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
  
! JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
! JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
  
  # The Jasper JPEG-2000 image compression library (aka JasPer):
! JASPERLIB = $(INTERNAL_JASPERLIB)
! JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.
--- 450,461 ----
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
  
! JBIGLIB = -L/opt/freeware/lib -ljbig
! JBIGHDR_DIR =
  
  # The Jasper JPEG-2000 image compression library (aka JasPer):
! JASPERLIB = -L/opt/freeware/lib -ljasper
! JASPERHDR_DIR =
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.