*** ./cli/wavpack.c.ORIG	Mon Jan  4 16:00:26 2016
--- ./cli/wavpack.c	Mon Jan  4 16:00:39 2016
***************
*** 37,43 ****
  #include "utils.h"
  #include "md5.h"
  
! #if (defined(__GNUC__) || defined(__sun)) && !defined(_WIN32)
  #include <unistd.h>
  #include <glob.h>
  #include <sys/time.h>
--- 37,43 ----
  #include "utils.h"
  #include "md5.h"
  
! #if (defined(__GNUC__) || defined(_AIX) || defined(__sun)) && !defined(_WIN32)
  #include <unistd.h>
  #include <glob.h>
  #include <sys/time.h>
*** ./cli/utils.c.ORIG	Mon Jan  4 16:00:55 2016
--- ./cli/utils.c	Mon Jan  4 16:03:22 2016
***************
*** 17,23 ****
  #include <io.h>
  #include <conio.h>
  #include <shlobj.h>
! #elif defined(__GNUC__) || defined(__sun)
  #include <glob.h>
  #include <unistd.h>
  #endif
--- 17,23 ----
  #include <io.h>
  #include <conio.h>
  #include <shlobj.h>
! #elif defined(__GNUC__) || defined(_AIX) || defined(__sun)
  #include <glob.h>
  #include <unistd.h>
  #endif
***************
*** 159,165 ****
  // returned.                                                                //
  //////////////////////////////////////////////////////////////////////////////
  
! #if (defined(__GNUC__) || defined(__sun)) && !defined(_WIN32)
  
  char *filespec_path (char *filespec)
  {
--- 159,165 ----
  // returned.                                                                //
  //////////////////////////////////////////////////////////////////////////////
  
! #if (defined(__GNUC__) || defined(_AIX) || defined(__sun)) && !defined(_WIN32)
  
  char *filespec_path (char *filespec)
  {
*** ./include/wavpack.h.ORIG	Mon Jan  4 15:58:11 2016
--- ./include/wavpack.h	Mon Jan  4 15:59:28 2016
***************
*** 26,32 ****
--- 26,36 ----
  typedef __int16 int16_t;
  typedef __int8  int8_t;
  #else
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #endif
  
  // RIFF / wav header formats (these occur at the beginning of both wav files
*** ./src/wavpack_local.h.ORIG	Mon Jan  4 15:55:55 2016
--- ./src/wavpack_local.h	Mon Jan  4 15:57:08 2016
***************
*** 39,45 ****
--- 39,49 ----
  typedef __int16 int16_t;
  typedef __int8  int8_t;
  #else
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #endif
  
  // Because the C99 specification states that "The order of allocation of