*** ./epan/wslua/lua_bitop.c.ORIG	Sat Oct 29 10:08:04 2011
--- ./epan/wslua/lua_bitop.c	Sat Oct 29 10:09:04 2011
***************
*** 40,46 ****
--- 40,50 ----
  typedef unsigned __int32 uint32_t;
  typedef unsigned __int64 uint64_t;
  #else
+ #ifdef _AIX51
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #endif
  
  typedef int32_t SBits;
*** ./ui/gtk/hostlist_table.c.ORIG	Fri Jun 22 12:08:59 2012
--- ./ui/gtk/hostlist_table.c	Fri Jun 22 12:09:48 2012
***************
*** 932,938 ****
      FILE              *out_file;
      gboolean           hosts_written;
      hostlist_table    *talkers;
! } map_t;
  
  /* XXX output in C locale */
  static gboolean
--- 932,938 ----
      FILE              *out_file;
      gboolean           hosts_written;
      hostlist_table    *talkers;
! } my_map_t;
  
  /* XXX output in C locale */
  static gboolean
***************
*** 939,945 ****
  map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
                gpointer data)
  {
!     map_t   *map = (map_t *)data;
      gchar   *table_entry, *esc_entry;
      guint64  value;
      /* Add the column values to the TSV data */
--- 939,945 ----
  map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
                gpointer data)
  {
!     my_map_t   *map = (my_map_t *)data;
      gchar   *table_entry, *esc_entry;
      guint64  value;
      /* Add the column values to the TSV data */
***************
*** 1048,1054 ****
      GList             *columns, *list;
      GtkTreeViewColumn *column;
      GtkListStore      *store;
!     map_t              map;
      FILE              *tpl_file;
  
      map.talkers =g_object_get_data(G_OBJECT(copy_bt), HOST_PTR_KEY);
--- 1048,1054 ----
      GList             *columns, *list;
      GtkTreeViewColumn *column;
      GtkListStore      *store;
!     my_map_t           map;
      FILE              *tpl_file;
  
      map.talkers =g_object_get_data(G_OBJECT(copy_bt), HOST_PTR_KEY);
*** ./epan/dissectors/packet-atn-ulcs.c.ORIG	Wed Aug 13 14:27:01 2014
--- ./epan/dissectors/packet-atn-ulcs.c	Wed Aug 13 14:27:28 2014
***************
*** 131,137 ****
--- 131,141 ----
  
  #include <stdio.h>
  #include <string.h>
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  
  #include "packet-atn-ulcs.h"
  
*** ./epan/nghttp2/nghttp2.h.ORIG	Wed Aug 13 13:54:21 2014
--- ./epan/nghttp2/nghttp2.h	Wed Aug 13 13:54:54 2014
***************
*** 32,38 ****
--- 32,42 ----
  #endif
  
  #include <stdlib.h>
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #include <sys/types.h>
  
  #include "nghttp2ver.h"
*** ./asn1/atn-ulcs/packet-atn-ulcs-template.c.ORIG	Wed Aug 13 14:13:52 2014
--- ./asn1/atn-ulcs/packet-atn-ulcs-template.c	Wed Aug 13 14:24:10 2014
***************
*** 123,129 ****
--- 123,133 ----
  
  #include <stdio.h>
  #include <string.h>
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  
  #include "packet-atn-ulcs.h"
  
*** ./tshark.c.ORIG	Wed Aug 13 15:19:39 2014
--- ./tshark.c	Wed Aug 13 15:27:33 2014
***************
*** 51,58 ****
  # include <sys/stat.h>
  #endif
  
! #ifndef HAVE_GETOPT
  #include "wsutil/wsgetopt.h"
  #endif
  
  #include <glib.h>
--- 51,59 ----
  # include <sys/stat.h>
  #endif
  
! #ifdef _AIX
  #include "wsutil/wsgetopt.h"
+ #include "wsutil/wsgetopt.c"
  #endif
  
  #include <glib.h>
*** ./dumpcap.c.ORIG	Wed Aug 13 15:28:25 2014
--- ./dumpcap.c	Wed Aug 13 15:28:51 2014
***************
*** 69,76 ****
  
  #include <wsutil/crash_info.h>
  
! #ifndef HAVE_GETOPT
  #include "wsutil/wsgetopt.h"
  #endif
  
  #ifdef HAVE_NETDB_H
--- 69,77 ----
  
  #include <wsutil/crash_info.h>
  
! #ifdef _AIX
  #include "wsutil/wsgetopt.h"
+ #include "wsutil/wsgetopt.c"
  #endif
  
  #ifdef HAVE_NETDB_H