Export elfutils headers and lose the version number from the path.

Having the version number in the path just means that diffs for updates
are completely unusable.

perf refers to libdw.h, libdwfl.h, and version.h as <elfutils/libdw.h> and
so on, so we do still need to do some manual work there, but let's use
symlinks rather than duplicating the header files.

Change-Id: I9fd3c5f5024bde12747fdb1c06d21cdcb3418f03

650 files changed, 19 insertions, 1520 deletions

diff --git a/elfutils/libdw.h b/elfutils/libdw.h
deleted file mode 100644
index e001b7a4..00000000
--- a/elfutils/libdw.h
+++ /dev/null
@@ -1,875 +0,0 @@
-/* Interfaces for libdw.
-   Copyright (C) 2002-2010 Red Hat, Inc.
-   This file is part of Red Hat elfutils.
-
-   Red Hat elfutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by the
-   Free Software Foundation; version 2 of the License.
-
-   Red Hat elfutils is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with Red Hat elfutils; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
-
-   In addition, as a special exception, Red Hat, Inc. gives You the
-   additional right to link the code of Red Hat elfutils with code licensed
-   under any Open Source Initiative certified open source license
-   (http://www.opensource.org/licenses/index.php) which requires the
-   distribution of source code with any binary distribution and to
-   distribute linked combinations of the two.  Non-GPL Code permitted under
-   this exception must only link to the code of Red Hat elfutils through
-   those well defined interfaces identified in the file named EXCEPTION
-   found in the source code files (the "Approved Interfaces").  The files
-   of Non-GPL Code may instantiate templates or use macros or inline
-   functions from the Approved Interfaces without causing the resulting
-   work to be covered by the GNU General Public License.  Only Red Hat,
-   Inc. may make changes or additions to the list of Approved Interfaces.
-   Red Hat's grant of this exception is conditioned upon your not adding
-   any new exceptions.  If you wish to add a new Approved Interface or
-   exception, please contact Red Hat.  You must obey the GNU General Public
-   License in all respects for all of the Red Hat elfutils code and other
-   code used in conjunction with Red Hat elfutils except the Non-GPL Code
-   covered by this exception.  If you modify this file, you may extend this
-   exception to your version of the file, but you are not obligated to do
-   so.  If you do not wish to provide this exception without modification,
-   you must delete this exception statement from your version and license
-   this file solely under the GPL without exception.
-
-   Red Hat elfutils is an included package of the Open Invention Network.
-   An included package of the Open Invention Network is a package for which
-   Open Invention Network licensees cross-license their patents.  No patent
-   license is granted, either expressly or impliedly, by designation as an
-   included package.  Should you wish to participate in the Open Invention
-   Network licensing program, please visit www.openinventionnetwork.com
-   <http://www.openinventionnetwork.com>.  */
-
-#ifndef _LIBDW_H
-#define _LIBDW_H	1
-
-#include <gelf.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-# define __nonnull_attribute__(...) __attribute__ ((__nonnull__ (__VA_ARGS__)))
-# define __deprecated_attribute__ __attribute__ ((__deprecated__))
-#else
-# define __nonnull_attribute__(args...)
-# define __deprecated_attribute__
-#endif
-
-
-#ifdef __GNUC_STDC_INLINE__
-# define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__))
-#else
-# define __libdw_extern_inline extern __inline
-#endif
-
-
-/* Mode for the session.  */
-typedef enum
-  {
-    DWARF_C_READ,		/* Read .. */
-    DWARF_C_RDWR,		/* Read and write .. */
-    DWARF_C_WRITE,		/* Write .. */
-  }
-Dwarf_Cmd;
-
-
-/* Callback results.  */
-enum
-{
-  DWARF_CB_OK = 0,
-  DWARF_CB_ABORT
-};
-
-
-/* Error values.  */
-enum
-  {
-    DW_TAG_invalid = 0
-#define DW_TAG_invalid	DW_TAG_invalid
-  };
-
-
-/* Type for offset in DWARF file.  */
-typedef GElf_Off Dwarf_Off;
-
-/* Type for address in DWARF file.  */
-typedef GElf_Addr Dwarf_Addr;
-
-/* Integer types.  Big enough to hold any numeric value.  */
-typedef GElf_Xword Dwarf_Word;
-typedef GElf_Sxword Dwarf_Sword;
-/* For the times we know we do not need that much.  */
-typedef GElf_Half Dwarf_Half;
-
-
-/* DWARF abbreviation record.  */
-typedef struct Dwarf_Abbrev Dwarf_Abbrev;
-
-/* Returned to show the last DIE has be returned.  */
-#define DWARF_END_ABBREV ((Dwarf_Abbrev *) -1l)
-
-/* Source code line information for CU.  */
-typedef struct Dwarf_Lines_s Dwarf_Lines;
-
-/* One source code line information.  */
-typedef struct Dwarf_Line_s Dwarf_Line;
-
-/* Source file information.  */
-typedef struct Dwarf_Files_s Dwarf_Files;
-
-/* One address range record.  */
-typedef struct Dwarf_Arange_s Dwarf_Arange;
-
-/* Address ranges of a file.  */
-typedef struct Dwarf_Aranges_s Dwarf_Aranges;
-
-/* CU representation.  */
-struct Dwarf_CU;
-
-/* Macro information.  */
-typedef struct Dwarf_Macro_s Dwarf_Macro;
-
-/* Attribute representation.  */
-typedef struct
-{
-  unsigned int code;
-  unsigned int form;
-  unsigned char *valp;
-  struct Dwarf_CU *cu;
-} Dwarf_Attribute;
-
-
-/* Data block representation.  */
-typedef struct
-{
-  Dwarf_Word length;
-  unsigned char *data;
-} Dwarf_Block;
-
-
-/* DIE information.  */
-typedef struct
-{
-  /* The offset can be computed from the address.  */
-  void *addr;
-  struct Dwarf_CU *cu;
-  Dwarf_Abbrev *abbrev;
-  // XXX We'll see what other information will be needed.
-  long int padding__;
-} Dwarf_Die;
-
-/* Returned to show the last DIE has be returned.  */
-#define DWARF_END_DIE ((Dwarf_Die *) -1l)
-
-
-/* Global symbol information.  */
-typedef struct
-{
-  Dwarf_Off cu_offset;
-  Dwarf_Off die_offset;
-  const char *name;
-} Dwarf_Global;
-
-
-/* One operation in a DWARF location expression.
-   A location expression is an array of these.  */
-typedef struct
-{
-  uint8_t atom;			/* Operation */
-  Dwarf_Word number;		/* Operand */
-  Dwarf_Word number2;		/* Possible second operand */
-  Dwarf_Word offset;		/* Offset in location expression */
-} Dwarf_Op;
-
-
-/* This describes one Common Information Entry read from a CFI section.
-   Pointers here point into the DATA->d_buf block passed to dwarf_next_cfi.  */
-typedef struct
-{
-  Dwarf_Off CIE_id;	 /* Always DW_CIE_ID_64 in Dwarf_CIE structures.  */
-
-  /* Instruction stream describing initial state used by FDEs.  If
-     we did not understand the whole augmentation string and it did
-     not use 'z', then there might be more augmentation data here
-     (and in FDEs) before the actual instructions.  */
-  const uint8_t *initial_instructions;
-  const uint8_t *initial_instructions_end;
-
-  Dwarf_Word code_alignment_factor;
-  Dwarf_Sword data_alignment_factor;
-  Dwarf_Word return_address_register;
-
-  const char *augmentation;	/* Augmentation string.  */
-
-  /* Augmentation data, might be NULL.  The size is correct only if
-     we understood the augmentation string sufficiently.  */
-  const uint8_t *augmentation_data;
-  size_t augmentation_data_size;
-  size_t fde_augmentation_data_size;
-} Dwarf_CIE;
-
-/* This describes one Frame Description Entry read from a CFI section.
-   Pointers here point into the DATA->d_buf block passed to dwarf_next_cfi.  */
-typedef struct
-{
-  /* Section offset of CIE this FDE refers to.  This will never be
-     DW_CIE_ID_64 in an FDE.  If this value is DW_CIE_ID_64, this is
-     actually a Dwarf_CIE structure.  */
-  Dwarf_Off CIE_pointer;
-
-  /* We can't really decode anything further without looking up the CIE
-     and checking its augmentation string.  Here follows the encoded
-     initial_location and address_range, then any augmentation data,
-     then the instruction stream.  This FDE describes PC locations in
-     the byte range [initial_location, initial_location+address_range).
-     When the CIE augmentation string uses 'z', the augmentation data is
-     a DW_FORM_block (self-sized).  Otherwise, when we understand the
-     augmentation string completely, fde_augmentation_data_size gives
-     the number of bytes of augmentation data before the instructions.  */
-  const uint8_t *start;
-  const uint8_t *end;
-} Dwarf_FDE;
-
-/* Each entry in a CFI section is either a CIE described by Dwarf_CIE or
-   an FDE described by Dward_FDE.  Check CIE_id to see which you have.  */
-typedef union
-{
-  Dwarf_Off CIE_id;	 /* Always DW_CIE_ID_64 in Dwarf_CIE structures.  */
-  Dwarf_CIE cie;
-  Dwarf_FDE fde;
-} Dwarf_CFI_Entry;
-
-#define dwarf_cfi_cie_p(entry)	((entry)->cie.CIE_id == DW_CIE_ID_64)
-
-/* Opaque type representing a frame state described by CFI.  */
-typedef struct Dwarf_Frame_s Dwarf_Frame;
-
-/* Opaque type representing a CFI section found in a DWARF or ELF file.  */
-typedef struct Dwarf_CFI_s Dwarf_CFI;
-
-
-/* Handle for debug sessions.  */
-typedef struct Dwarf Dwarf;
-
-
-/* Out-Of-Memory handler.  */
-#if __GNUC__ < 4
-typedef void (*Dwarf_OOM) (void);
-#else
-typedef void (*__attribute__ ((noreturn)) Dwarf_OOM) (void);
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Create a handle for a new debug session.  */
-extern Dwarf *dwarf_begin (int fildes, Dwarf_Cmd cmd);
-
-/* Create a handle for a new debug session for an ELF file.  */
-extern Dwarf *dwarf_begin_elf (Elf *elf, Dwarf_Cmd cmd, Elf_Scn *scngrp);
-
-/* Retrieve ELF descriptor used for DWARF access.  */
-extern Elf *dwarf_getelf (Dwarf *dwarf);
-
-/* Release debugging handling context.  */
-extern int dwarf_end (Dwarf *dwarf);
-
-
-/* Get the data block for the .debug_info section.  */
-extern Elf_Data *dwarf_getscn_info (Dwarf *dwarf);
-
-/* Read the header for the DWARF CU.  */
-extern int dwarf_nextcu (Dwarf *dwarf, Dwarf_Off off, Dwarf_Off *next_off,
-			 size_t *header_sizep, Dwarf_Off *abbrev_offsetp,
-			 uint8_t *address_sizep, uint8_t *offset_sizep)
-     __nonnull_attribute__ (3);
-
-/* Read the header of a DWARF CU or type unit.  If TYPE_SIGNATUREP is not
-   null, this reads a type unit from the .debug_types section; otherwise
-   this reads a CU from the .debug_info section.  */
-extern int dwarf_next_unit (Dwarf *dwarf, Dwarf_Off off, Dwarf_Off *next_off,
-			    size_t *header_sizep, Dwarf_Half *versionp,
-			    Dwarf_Off *abbrev_offsetp,
-			    uint8_t *address_sizep, uint8_t *offset_sizep,
-			    uint64_t *type_signaturep, Dwarf_Off *type_offsetp)
-     __nonnull_attribute__ (3);
-
-
-/* Decode one DWARF CFI entry (CIE or FDE) from the raw section data.
-   The E_IDENT from the originating ELF file indicates the address
-   size and byte order used in the CFI section contained in DATA;
-   EH_FRAME_P should be true for .eh_frame format and false for
-   .debug_frame format.  OFFSET is the byte position in the section
-   to start at; on return *NEXT_OFFSET is filled in with the byte
-   position immediately after this entry.
-
-   On success, returns 0 and fills in *ENTRY; use dwarf_cfi_cie_p to
-   see whether ENTRY->cie or ENTRY->fde is valid.
-
-   On errors, returns -1.  Some format errors will permit safely
-   skipping to the next CFI entry though the current one is unusable.
-   In that case, *NEXT_OFF will be updated before a -1 return.
-
-   If there are no more CFI entries left in the section,
-   returns 1 and sets *NEXT_OFFSET to (Dwarf_Off) -1.  */
-extern int dwarf_next_cfi (const unsigned char e_ident[],
-			   Elf_Data *data, bool eh_frame_p,
-			   Dwarf_Off offset, Dwarf_Off *next_offset,
-			   Dwarf_CFI_Entry *entry)
-  __nonnull_attribute__ (1, 2, 5, 6);
-
-/* Use the CFI in the DWARF .debug_frame section.
-   Returns NULL if there is no such section (not an error).
-   The pointer returned can be used until dwarf_end is called on DWARF,
-   and must not be passed to dwarf_cfi_end.
-   Calling this more than once returns the same pointer.  */
-extern Dwarf_CFI *dwarf_getcfi (Dwarf *dwarf);
-
-/* Use the CFI in the ELF file's exception-handling data.
-   Returns NULL if there is no such data.
-   The pointer returned can be used until elf_end is called on ELF,
-   and must be passed to dwarf_cfi_end before then.
-   Calling this more than once allocates independent data structures.  */
-extern Dwarf_CFI *dwarf_getcfi_elf (Elf *elf);
-
-/* Release resources allocated by dwarf_getcfi_elf.  */
-extern int dwarf_cfi_end (Dwarf_CFI *cache);
-
-
-/* Return DIE at given offset in .debug_info section.  */
-extern Dwarf_Die *dwarf_offdie (Dwarf *dbg, Dwarf_Off offset,
-				Dwarf_Die *result) __nonnull_attribute__ (3);
-
-/* Return DIE at given offset in .debug_types section.  */
-extern Dwarf_Die *dwarf_offdie_types (Dwarf *dbg, Dwarf_Off offset,
-				      Dwarf_Die *result)
-     __nonnull_attribute__ (3);
-
-/* Return offset of DIE.  */
-extern Dwarf_Off dwarf_dieoffset (Dwarf_Die *die);
-
-/* Return offset of DIE in CU.  */
-extern Dwarf_Off dwarf_cuoffset (Dwarf_Die *die);
-
-/* Return CU DIE containing given DIE.  */
-extern Dwarf_Die *dwarf_diecu (Dwarf_Die *die, Dwarf_Die *result,
-			       uint8_t *address_sizep, uint8_t *offset_sizep)
-     __nonnull_attribute__ (2);
-
-/* Return CU DIE containing given address.  */
-extern Dwarf_Die *dwarf_addrdie (Dwarf *dbg, Dwarf_Addr addr,
-				 Dwarf_Die *result) __nonnull_attribute__ (3);
-
-/* Return child of current DIE.  */
-extern int dwarf_child (Dwarf_Die *die, Dwarf_Die *result)
-     __nonnull_attribute__ (2);
-
-/* Locates the first sibling of DIE and places it in RESULT.
-   Returns 0 if a sibling was found, -1 if something went wrong.
-   Returns 1 if no sibling could be found and, if RESULT is not
-   the same as DIE, it sets RESULT->addr to the address of the
-   (non-sibling) DIE that follows this one, or NULL if this DIE
-   was the last one in the compilation unit.  */
-extern int dwarf_siblingof (Dwarf_Die *die, Dwarf_Die *result)
-     __nonnull_attribute__ (2);
-
-/* Check whether the DIE has children.  */
-extern int dwarf_haschildren (Dwarf_Die *die) __nonnull_attribute__ (1);
-
-/* Walks the attributes of DIE, starting at the one OFFSET bytes in,
-   calling the CALLBACK function for each one.  Stops if the callback
-   function ever returns a value other than DWARF_CB_OK and returns the
-   offset of the offending attribute.  If the end of the attributes
-   is reached 1 is returned.  If something goes wrong -1 is returned and
-   the dwarf error number is set.  */
-extern ptrdiff_t dwarf_getattrs (Dwarf_Die *die,
-				 int (*callback) (Dwarf_Attribute *, void *),
-				 void *arg, ptrdiff_t offset)
-     __nonnull_attribute__ (2);
-
-/* Return tag of given DIE.  */
-extern int dwarf_tag (Dwarf_Die *die) __nonnull_attribute__ (1);
-
-
-/* Return specific attribute of DIE.  */
-extern Dwarf_Attribute *dwarf_attr (Dwarf_Die *die, unsigned int search_name,
-				    Dwarf_Attribute *result)
-     __nonnull_attribute__ (3);
-
-/* Check whether given DIE has specific attribute.  */
-extern int dwarf_hasattr (Dwarf_Die *die, unsigned int search_name);
-
-/* These are the same as dwarf_attr and dwarf_hasattr, respectively,
-   but they resolve an indirect attribute through DW_AT_abstract_origin.  */
-extern Dwarf_Attribute *dwarf_attr_integrate (Dwarf_Die *die,
-					      unsigned int search_name,
-					      Dwarf_Attribute *result)
-     __nonnull_attribute__ (3);
-extern int dwarf_hasattr_integrate (Dwarf_Die *die, unsigned int search_name);
-
-
-
-
-/* Check whether given attribute has specific form.  */
-extern int dwarf_hasform (Dwarf_Attribute *attr, unsigned int search_form);
-
-/* Return attribute code of given attribute.  */
-extern unsigned int dwarf_whatattr (Dwarf_Attribute *attr);
-
-/* Return form code of given attribute.  */
-extern unsigned int dwarf_whatform (Dwarf_Attribute *attr);
-
-
-/* Return string associated with given attribute.  */
-extern const char *dwarf_formstring (Dwarf_Attribute *attrp);
-
-/* Return unsigned constant represented by attribute.  */
-extern int dwarf_formudata (Dwarf_Attribute *attr, Dwarf_Word *return_uval)
-     __nonnull_attribute__ (2);
-
-/* Return signed constant represented by attribute.  */
-extern int dwarf_formsdata (Dwarf_Attribute *attr, Dwarf_Sword *return_uval)
-     __nonnull_attribute__ (2);
-
-/* Return address represented by attribute.  */
-extern int dwarf_formaddr (Dwarf_Attribute *attr, Dwarf_Addr *return_addr)
-     __nonnull_attribute__ (2);
-
-/* This function is deprecated.  Always use dwarf_formref_die instead.
-   Return reference offset represented by attribute.  */
-extern int dwarf_formref (Dwarf_Attribute *attr, Dwarf_Off *return_offset)
-     __nonnull_attribute__ (2) __deprecated_attribute__;
-
-/* Look up the DIE in a reference-form attribute.  */
-extern Dwarf_Die *dwarf_formref_die (Dwarf_Attribute *attr, Dwarf_Die *die_mem)
-     __nonnull_attribute__ (2);
-
-/* Return block represented by attribute.  */
-extern int dwarf_formblock (Dwarf_Attribute *attr, Dwarf_Block *return_block)
-     __nonnull_attribute__ (2);
-
-/* Return flag represented by attribute.  */
-extern int dwarf_formflag (Dwarf_Attribute *attr, bool *return_bool)
-     __nonnull_attribute__ (2);
-
-
-/* Simplified attribute value access functions.  */
-
-/* Return string in name attribute of DIE.  */
-extern const char *dwarf_diename (Dwarf_Die *die);
-
-/* Return high PC attribute of DIE.  */
-extern int dwarf_highpc (Dwarf_Die *die, Dwarf_Addr *return_addr)
-     __nonnull_attribute__ (2);
-
-/* Return low PC attribute of DIE.  */
-extern int dwarf_lowpc (Dwarf_Die *die, Dwarf_Addr *return_addr)
-     __nonnull_attribute__ (2);
-
-/* Return entry_pc or low_pc attribute of DIE.  */
-extern int dwarf_entrypc (Dwarf_Die *die, Dwarf_Addr *return_addr)
-     __nonnull_attribute__ (2);
-
-/* Return 1 if DIE's lowpc/highpc or ranges attributes match the PC address,
-   0 if not, or -1 for errors.  */
-extern int dwarf_haspc (Dwarf_Die *die, Dwarf_Addr pc);
-
-/* Enumerate the PC address ranges covered by this DIE, covering all
-   addresses where dwarf_haspc returns true.  In the first call OFFSET
-   should be zero and *BASEP need not be initialized.  Returns -1 for
-   errors, zero when there are no more address ranges to report, or a
-   nonzero OFFSET value to pass to the next call.  Each subsequent call
-   must preserve *BASEP from the prior call.  Successful calls fill in
-   *STARTP and *ENDP with a contiguous address range.  */
-extern ptrdiff_t dwarf_ranges (Dwarf_Die *die,
-			       ptrdiff_t offset, Dwarf_Addr *basep,
-			       Dwarf_Addr *startp, Dwarf_Addr *endp);
-
-
-/* Return byte size attribute of DIE.  */
-extern int dwarf_bytesize (Dwarf_Die *die);
-
-/* Return bit size attribute of DIE.  */
-extern int dwarf_bitsize (Dwarf_Die *die);
-
-/* Return bit offset attribute of DIE.  */
-extern int dwarf_bitoffset (Dwarf_Die *die);
-
-/* Return array order attribute of DIE.  */
-extern int dwarf_arrayorder (Dwarf_Die *die);
-
-/* Return source language attribute of DIE.  */
-extern int dwarf_srclang (Dwarf_Die *die);
-
-
-/* Get abbreviation at given offset for given DIE.  */
-extern Dwarf_Abbrev *dwarf_getabbrev (Dwarf_Die *die, Dwarf_Off offset,
-				      size_t *lengthp);
-
-/* Get abbreviation at given offset in .debug_abbrev section.  */
-extern int dwarf_offabbrev (Dwarf *dbg, Dwarf_Off offset, size_t *lengthp,
-			    Dwarf_Abbrev *abbrevp)
-     __nonnull_attribute__ (4);
-
-/* Get abbreviation code.  */
-extern unsigned int dwarf_getabbrevcode (Dwarf_Abbrev *abbrev);
-
-/* Get abbreviation tag.  */
-extern unsigned int dwarf_getabbrevtag (Dwarf_Abbrev *abbrev);
-
-/* Return true if abbreviation is children flag set.  */
-extern int dwarf_abbrevhaschildren (Dwarf_Abbrev *abbrev);
-
-/* Get number of attributes of abbreviation.  */
-extern int dwarf_getattrcnt (Dwarf_Abbrev *abbrev, size_t *attrcntp)
-     __nonnull_attribute__ (2);
-
-/* Get specific attribute of abbreviation.  */
-extern int dwarf_getabbrevattr (Dwarf_Abbrev *abbrev, size_t idx,
-				unsigned int *namep, unsigned int *formp,
-				Dwarf_Off *offset);
-
-
-/* Get string from-debug_str section.  */
-extern const char *dwarf_getstring (Dwarf *dbg, Dwarf_Off offset,
-				    size_t *lenp);
-
-
-/* Get public symbol information.  */
-extern ptrdiff_t dwarf_getpubnames (Dwarf *dbg,
-				    int (*callback) (Dwarf *, Dwarf_Global *,
-						     void *),
-				    void *arg, ptrdiff_t offset)
-     __nonnull_attribute__ (2);
-
-
-/* Get source file information for CU.  */
-extern int dwarf_getsrclines (Dwarf_Die *cudie, Dwarf_Lines **lines,
-			      size_t *nlines) __nonnull_attribute__ (2, 3);
-
-/* Return one of the source lines of the CU.  */
-extern Dwarf_Line *dwarf_onesrcline (Dwarf_Lines *lines, size_t idx);
-
-/* Get the file source files used in the CU.  */
-extern int dwarf_getsrcfiles (Dwarf_Die *cudie, Dwarf_Files **files,
-			      size_t *nfiles)
-     __nonnull_attribute__ (2);
-
-
-/* Get source for address in CU.  */
-extern Dwarf_Line *dwarf_getsrc_die (Dwarf_Die *cudie, Dwarf_Addr addr);
-
-/* Get source for file and line number.  */
-extern int dwarf_getsrc_file (Dwarf *dbg, const char *fname, int line, int col,
-			      Dwarf_Line ***srcsp, size_t *nsrcs)
-     __nonnull_attribute__ (2, 5, 6);
-
-
-/* Return line address.  */
-extern int dwarf_lineaddr (Dwarf_Line *line, Dwarf_Addr *addrp);
-
-/* Return line VLIW operation index.  */
-extern int dwarf_lineop_index (Dwarf_Line *line, unsigned int *op_indexp);
-
-/* Return line number.  */
-extern int dwarf_lineno (Dwarf_Line *line, int *linep)
-     __nonnull_attribute__ (2);
-
-/* Return column in line.  */
-extern int dwarf_linecol (Dwarf_Line *line, int *colp)
-     __nonnull_attribute__ (2);
-
-/* Return true if record is for beginning of a statement.  */
-extern int dwarf_linebeginstatement (Dwarf_Line *line, bool *flagp)
-     __nonnull_attribute__ (2);
-
-/* Return true if record is for end of sequence.  */
-extern int dwarf_lineendsequence (Dwarf_Line *line, bool *flagp)
-     __nonnull_attribute__ (2);
-
-/* Return true if record is for beginning of a basic block.  */
-extern int dwarf_lineblock (Dwarf_Line *line, bool *flagp)
-     __nonnull_attribute__ (2);
-
-/* Return true if record is for end of prologue.  */
-extern int dwarf_lineprologueend (Dwarf_Line *line, bool *flagp)
-     __nonnull_attribute__ (2);
-
-/* Return true if record is for beginning of epilogue.  */
-extern int dwarf_lineepiloguebegin (Dwarf_Line *line, bool *flagp)
-     __nonnull_attribute__ (2);
-
-/* Return instruction-set architecture in this record.  */
-extern int dwarf_lineisa (Dwarf_Line *line, unsigned int *isap)
-     __nonnull_attribute__ (2);
-
-/* Return code path discriminator in this record.  */
-extern int dwarf_linediscriminator (Dwarf_Line *line, unsigned int *discp)
-     __nonnull_attribute__ (2);
-
-
-/* Find line information for address.  */
-extern const char *dwarf_linesrc (Dwarf_Line *line,
-				  Dwarf_Word *mtime, Dwarf_Word *length);
-
-/* Return file information.  */
-extern const char *dwarf_filesrc (Dwarf_Files *file, size_t idx,
-				  Dwarf_Word *mtime, Dwarf_Word *length);
-
-/* Return the directory list used in the file information extracted.
-   (*RESULT)[0] is the CU's DW_AT_comp_dir value, and may be null.
-   (*RESULT)[0..*NDIRS-1] are the compile-time include directory path
-   encoded by the compiler.  */
-extern int dwarf_getsrcdirs (Dwarf_Files *files,
-			     const char *const **result, size_t *ndirs)
-  __nonnull_attribute__ (2, 3);
-
-
-/* Return location expression, decoded as a list of operations.  */
-extern int dwarf_getlocation (Dwarf_Attribute *attr, Dwarf_Op **expr,
-			      size_t *exprlen) __nonnull_attribute__ (2, 3);
-
-/* Return location expressions.  If the attribute uses a location list,
-   ADDRESS selects the relevant location expressions from the list.
-   There can be multiple matches, resulting in multiple expressions to
-   return.  EXPRS and EXPRLENS are parallel arrays of NLOCS slots to
-   fill in.  Returns the number of locations filled in, or -1 for
-   errors.  If EXPRS is a null pointer, stores nothing and returns the
-   total number of locations.  A return value of zero means that the
-   location list indicated no value is accessible.  */
-extern int dwarf_getlocation_addr (Dwarf_Attribute *attr, Dwarf_Addr address,
-				   Dwarf_Op **exprs, size_t *exprlens,
-				   size_t nlocs);
-
-/* Return the block associated with a DW_OP_implicit_value operation.
-   The OP pointer must point into an expression that dwarf_getlocation
-   or dwarf_getlocation_addr has returned given the same ATTR.  */
-extern int dwarf_getlocation_implicit_value (Dwarf_Attribute *attr,
-					     const Dwarf_Op *op,
-					     Dwarf_Block *return_block)
-  __nonnull_attribute__ (2, 3);
-
-/* Return the attribute indicated by a DW_OP_GNU_implicit_pointer operation.
-   The OP pointer must point into an expression that dwarf_getlocation
-   or dwarf_getlocation_addr has returned given the same ATTR.
-   The result is the DW_AT_location or DW_AT_const_value attribute
-   of the OP->number DIE.  */
-extern int dwarf_getlocation_implicit_pointer (Dwarf_Attribute *attr,
-					       const Dwarf_Op *op,
-					       Dwarf_Attribute *result)
-  __nonnull_attribute__ (2, 3);
-
-
-/* Compute the byte-size of a type DIE according to DWARF rules.
-   For most types, this is just DW_AT_byte_size.
-   For DW_TAG_array_type it can apply much more complex rules.  */
-extern int dwarf_aggregate_size (Dwarf_Die *die, Dwarf_Word *size);
-
-
-/* Return scope DIEs containing PC address.
-   Sets *SCOPES to a malloc'd array of Dwarf_Die structures,
-   and returns the number of elements in the array.
-   (*SCOPES)[0] is the DIE for the innermost scope containing PC,
-   (*SCOPES)[1] is the DIE for the scope containing that scope, and so on.
-   Returns -1 for errors or 0 if no scopes match PC.  */
-extern int dwarf_getscopes (Dwarf_Die *cudie, Dwarf_Addr pc,
-			    Dwarf_Die **scopes);
-
-/* Return scope DIEs containing the given DIE.
-   Sets *SCOPES to a malloc'd array of Dwarf_Die structures,
-   and returns the number of elements in the array.
-   (*SCOPES)[0] is a copy of DIE.
-   (*SCOPES)[1] is the DIE for the scope containing that scope, and so on.
-   Returns -1 for errors or 0 if DIE is not found in any scope entry.  */
-extern int dwarf_getscopes_die (Dwarf_Die *die, Dwarf_Die **scopes);
-
-
-/* Search SCOPES[0..NSCOPES-1] for a variable called NAME.
-   Ignore the first SKIP_SHADOWS scopes that match the name.
-   If MATCH_FILE is not null, accept only declaration in that source file;
-   if MATCH_LINENO or MATCH_LINECOL are also nonzero, accept only declaration
-   at that line and column.
-
-   If successful, fill in *RESULT with the DIE of the variable found,
-   and return N where SCOPES[N] is the scope defining the variable.
-   Return -1 for errors or -2 for no matching variable found.  */
-extern int dwarf_getscopevar (Dwarf_Die *scopes, int nscopes,
-			      const char *name, int skip_shadows,
-			      const char *match_file,
-			      int match_lineno, int match_linecol,
-			      Dwarf_Die *result);
-
-
-
-/* Return list address ranges.  */
-extern int dwarf_getaranges (Dwarf *dbg, Dwarf_Aranges **aranges,
-			     size_t *naranges)
-     __nonnull_attribute__ (2);
-
-/* Return one of the address range entries.  */
-extern Dwarf_Arange *dwarf_onearange (Dwarf_Aranges *aranges, size_t idx);
-
-/* Return information in address range record.  */
-extern int dwarf_getarangeinfo (Dwarf_Arange *arange, Dwarf_Addr *addrp,
-				Dwarf_Word *lengthp, Dwarf_Off *offsetp);
-
-/* Get address range which includes given address.  */
-extern Dwarf_Arange *dwarf_getarange_addr (Dwarf_Aranges *aranges,
-					   Dwarf_Addr addr);
-
-
-
-/* Get functions in CUDIE.  */
-extern ptrdiff_t dwarf_getfuncs (Dwarf_Die *cudie,
-				 int (*callback) (Dwarf_Die *, void *),
-				 void *arg, ptrdiff_t offset);
-
-
-/* Return file name containing definition of the given declaration.  */
-extern const char *dwarf_decl_file (Dwarf_Die *decl);
-
-/* Get line number of beginning of given declaration.  */
-extern int dwarf_decl_line (Dwarf_Die *decl, int *linep)
-     __nonnull_attribute__ (2);
-
-/* Get column number of beginning of given declaration.  */
-extern int dwarf_decl_column (Dwarf_Die *decl, int *colp)
-     __nonnull_attribute__ (2);
-
-
-/* Return nonzero if given function is an abstract inline definition.  */
-extern int dwarf_func_inline (Dwarf_Die *func);
-
-/* Find each concrete inlined instance of the abstract inline definition.  */
-extern int dwarf_func_inline_instances (Dwarf_Die *func,
-					int (*callback) (Dwarf_Die *, void *),
-					void *arg);
-
-
-/* Find the appropriate PC location or locations for function entry
-   breakpoints for the given DW_TAG_subprogram DIE.  Returns -1 for errors.
-   On success, returns the number of breakpoint locations (never zero)
-   and sets *BKPTS to a malloc'd vector of addresses.  */
-extern int dwarf_entry_breakpoints (Dwarf_Die *die, Dwarf_Addr **bkpts);
-
-
-/* Call callback function for each of the macro information entry for
-   the CU.  */
-extern ptrdiff_t dwarf_getmacros (Dwarf_Die *cudie,
-				  int (*callback) (Dwarf_Macro *, void *),
-				  void *arg, ptrdiff_t offset)
-     __nonnull_attribute__ (2);
-
-/* Return macro opcode.  */
-extern int dwarf_macro_opcode (Dwarf_Macro *macro, unsigned int *opcodep)
-     __nonnull_attribute__ (2);
-
-/* Return first macro parameter.  */
-extern int dwarf_macro_param1 (Dwarf_Macro *macro, Dwarf_Word *paramp)
-     __nonnull_attribute__ (2);
-
-/* Return second macro parameter.  */
-extern int dwarf_macro_param2 (Dwarf_Macro *macro, Dwarf_Word *paramp,
-			       const char **strp);
-
-
-/* Compute what's known about a call frame when the PC is at ADDRESS.
-   Returns 0 for success or -1 for errors.
-   On success, *FRAME is a malloc'd pointer.  */
-extern int dwarf_cfi_addrframe (Dwarf_CFI *cache,
-				Dwarf_Addr address, Dwarf_Frame **frame)
-  __nonnull_attribute__ (3);
-
-/* Return the DWARF register number used in FRAME to denote
-   the return address in FRAME's caller frame.  The remaining
-   arguments can be non-null to fill in more information.
-
-   Fill [*START, *END) with the PC range to which FRAME's information applies.
-   Fill in *SIGNALP to indicate whether this is a signal-handling frame.
-   If true, this is the implicit call frame that calls a signal handler.
-   This frame's "caller" is actually the interrupted state, not a call;
-   its return address is an exact PC, not a PC after a call instruction.  */
-extern int dwarf_frame_info (Dwarf_Frame *frame,
-			     Dwarf_Addr *start, Dwarf_Addr *end, bool *signalp);
-
-/* Return a DWARF expression that yields the Canonical Frame Address at
-   this frame state.  Returns -1 for errors, or zero for success, with
-   *NOPS set to the number of operations stored at *OPS.  That pointer
-   can be used only as long as FRAME is alive and unchanged.  *NOPS is
-   zero if the CFA cannot be determined here.  Note that if nonempty,
-   *OPS is a DWARF expression, not a location description--append
-   DW_OP_stack_value to a get a location description for the CFA.  */
-extern int dwarf_frame_cfa (Dwarf_Frame *frame, Dwarf_Op **ops, size_t *nops)
-  __nonnull_attribute__ (2);
-
-/* Deliver a DWARF location description that yields the location or
-   value of DWARF register number REGNO in the state described by FRAME.
-
-   Returns -1 for errors or zero for success, setting *NOPS to the
-   number of operations in the array stored at *OPS.  Note the last
-   operation is DW_OP_stack_value if there is no mutable location but
-   only a computable value.
-
-   *NOPS zero with *OPS set to OPS_MEM means CFI says the caller's
-   REGNO is "undefined", i.e. it's call-clobbered and cannot be recovered.
-
-   *NOPS zero with *OPS set to a null pointer means CFI says the
-   caller's REGNO is "same_value", i.e. this frame did not change it;
-   ask the caller frame where to find it.
-
-   For common simple expressions *OPS is OPS_MEM.  For arbitrary DWARF
-   expressions in the CFI, *OPS is an internal pointer that can be used as
-   long as the Dwarf_CFI used to create FRAME remains alive.  */
-extern int dwarf_frame_register (Dwarf_Frame *frame, int regno,
-				 Dwarf_Op ops_mem[3],
-				 Dwarf_Op **ops, size_t *nops)
-  __nonnull_attribute__ (3, 4, 5);
-
-
-/* Return error code of last failing function call.  This value is kept
-   separately for each thread.  */
-extern int dwarf_errno (void);
-
-/* Return error string for ERROR.  If ERROR is zero, return error string
-   for most recent error or NULL is none occurred.  If ERROR is -1 the
-   behaviour is similar to the last case except that not NULL but a legal
-   string is returned.  */
-extern const char *dwarf_errmsg (int err);
-
-
-/* Register new Out-Of-Memory handler.  The old handler is returned.  */
-extern Dwarf_OOM dwarf_new_oom_handler (Dwarf *dbg, Dwarf_OOM handler);
-
-
-/* Inline optimizations.  */
-#ifdef __OPTIMIZE__
-/* Return attribute code of given attribute.  */
-__libdw_extern_inline unsigned int
-dwarf_whatattr (Dwarf_Attribute *attr)
-{
-  return attr == NULL ? 0 : attr->code;
-}
-
-/* Return attribute code of given attribute.  */
-__libdw_extern_inline unsigned int
-dwarf_whatform (Dwarf_Attribute *attr)
-{
-  return attr == NULL ? 0 : attr->form;
-}
-#endif	/* Optimize.  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* libdw.h */
diff --git a/elfutils/libdwfl.h b/elfutils/libdwfl.h
deleted file mode 100644
index 4ea2796c..00000000
--- a/elfutils/libdwfl.h
+++ /dev/null
@@ -1,585 +0,0 @@
-/* Interfaces for libdwfl.
-   Copyright (C) 2005-2010 Red Hat, Inc.
-   This file is part of Red Hat elfutils.
-
-   Red Hat elfutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by the
-   Free Software Foundation; version 2 of the License.
-
-   Red Hat elfutils is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with Red Hat elfutils; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
-
-   In addition, as a special exception, Red Hat, Inc. gives You the
-   additional right to link the code of Red Hat elfutils with code licensed
-   under any Open Source Initiative certified open source license
-   (http://www.opensource.org/licenses/index.php) which requires the
-   distribution of source code with any binary distribution and to
-   distribute linked combinations of the two.  Non-GPL Code permitted under
-   this exception must only link to the code of Red Hat elfutils through
-   those well defined interfaces identified in the file named EXCEPTION
-   found in the source code files (the "Approved Interfaces").  The files
-   of Non-GPL Code may instantiate templates or use macros or inline
-   functions from the Approved Interfaces without causing the resulting
-   work to be covered by the GNU General Public License.  Only Red Hat,
-   Inc. may make changes or additions to the list of Approved Interfaces.
-   Red Hat's grant of this exception is conditioned upon your not adding
-   any new exceptions.  If you wish to add a new Approved Interface or
-   exception, please contact Red Hat.  You must obey the GNU General Public
-   License in all respects for all of the Red Hat elfutils code and other
-   code used in conjunction with Red Hat elfutils except the Non-GPL Code
-   covered by this exception.  If you modify this file, you may extend this
-   exception to your version of the file, but you are not obligated to do
-   so.  If you do not wish to provide this exception without modification,
-   you must delete this exception statement from your version and license
-   this file solely under the GPL without exception.
-
-   Red Hat elfutils is an included package of the Open Invention Network.
-   An included package of the Open Invention Network is a package for which
-   Open Invention Network licensees cross-license their patents.  No patent
-   license is granted, either expressly or impliedly, by designation as an
-   included package.  Should you wish to participate in the Open Invention
-   Network licensing program, please visit www.openinventionnetwork.com
-   <http://www.openinventionnetwork.com>.  */
-
-#ifndef _LIBDWFL_H
-#define _LIBDWFL_H	1
-
-#include "libdw.h"
-#include <stdio.h>
-
-/* Handle for a session using the library.  */
-typedef struct Dwfl Dwfl;
-
-/* Handle for a module.  */
-typedef struct Dwfl_Module Dwfl_Module;
-
-/* Handle describing a line record.  */
-typedef struct Dwfl_Line Dwfl_Line;
-
-/* Callbacks.  */
-typedef struct
-{
-  int (*find_elf) (Dwfl_Module *mod, void **userdata,
-		   const char *modname, Dwarf_Addr base,
-		   char **file_name, Elf **elfp);
-
-  int (*find_debuginfo) (Dwfl_Module *mod, void **userdata,
-			 const char *modname, Dwarf_Addr base,
-			 const char *file_name,
-			 const char *debuglink_file, GElf_Word debuglink_crc,
-			 char **debuginfo_file_name);
-
-  /* Fill *ADDR with the loaded address of the section called SECNAME in
-     the given module.  Use (Dwarf_Addr) -1 if this section is omitted from
-     accessible memory.  This is called exactly once for each SHF_ALLOC
-     section that relocations affecting DWARF data refer to, so it can
-     easily be used to collect state about the sections referenced.  */
-  int (*section_address) (Dwfl_Module *mod, void **userdata,
-			  const char *modname, Dwarf_Addr base,
-			  const char *secname,
-			  GElf_Word shndx, const GElf_Shdr *shdr,
-			  Dwarf_Addr *addr);
-
-  char **debuginfo_path;	/* See dwfl_standard_find_debuginfo.  */
-} Dwfl_Callbacks;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Start a new session with the library.  */
-extern Dwfl *dwfl_begin (const Dwfl_Callbacks *callbacks)
-  __nonnull_attribute__ (1);
-
-
-/* End a session.  */
-extern void dwfl_end (Dwfl *);
-
-/* Return implementation's version string suitable for printing.  */
-extern const char *dwfl_version (Dwfl *);
-
-/* Return error code of last failing function call.  This value is kept
-   separately for each thread.  */
-extern int dwfl_errno (void);
-
-/* Return error string for ERROR.  If ERROR is zero, return error string
-   for most recent error or NULL if none occurred.  If ERROR is -1 the
-   behaviour is similar to the last case except that not NULL but a legal
-   string is returned.  */
-extern const char *dwfl_errmsg (int err);
-
-
-/* Start reporting the current set of segments and modules to the library.
-   All existing segments are wiped.  Existing modules are marked to be
-   deleted, and will not be found via dwfl_addrmodule et al if they are not
-   re-reported before dwfl_report_end is called.  */
-extern void dwfl_report_begin (Dwfl *dwfl);
-
-/* Report that segment NDX begins at PHDR->p_vaddr + BIAS.
-   If NDX is < 0, the value succeeding the last call's NDX
-   is used instead (zero on the first call).
-
-   If nonzero, the smallest PHDR->p_align value seen sets the
-   effective page size for the address space DWFL describes.
-   This is the granularity at which reported module boundary
-   addresses will be considered to fall in or out of a segment.
-
-   Returns -1 for errors, or NDX (or its assigned replacement) on success.
-
-   When NDX is the value succeeding the last call's NDX (or is implicitly
-   so as above), IDENT is nonnull and matches the value in the last call,
-   and the PHDR and BIAS values reflect a segment that would be contiguous,
-   in both memory and file, with the last segment reported, then this
-   segment may be coalesced internally with preceding segments.  When given
-   an address inside this segment, dwfl_addrsegment may return the NDX of a
-   preceding contiguous segment.  To prevent coalesced segments, always
-   pass a null pointer for IDENT.
-
-   The values passed are not stored (except to track coalescence).
-   The only information that can be extracted from DWFL later is the
-   mapping of an address to a segment index that starts at or below
-   it.  Reporting segments at all is optional.  Its only benefit to
-   the caller is to offer this quick lookup via dwfl_addrsegment,
-   or use other segment-based calls.  */
-extern int dwfl_report_segment (Dwfl *dwfl, int ndx,
-				const GElf_Phdr *phdr, GElf_Addr bias,
-				const void *ident);
-
-/* Report that a module called NAME spans addresses [START, END).
-   Returns the module handle, either existing or newly allocated,
-   or returns a null pointer for an allocation error.  */
-extern Dwfl_Module *dwfl_report_module (Dwfl *dwfl, const char *name,
-					Dwarf_Addr start, Dwarf_Addr end);
-
-/* Report a module with start and end addresses computed from the ELF
-   program headers in the given file, plus BASE.  For an ET_REL file,
-   does a simple absolute section layout starting at BASE.
-   FD may be -1 to open FILE_NAME.  On success, FD is consumed by the
-   library, and the `find_elf' callback will not be used for this module.  */
-extern Dwfl_Module *dwfl_report_elf (Dwfl *dwfl, const char *name,
-				     const char *file_name, int fd,
-				     GElf_Addr base);
-
-/* Similar, but report the module for offline use.  All ET_EXEC files
-   being reported must be reported before any relocatable objects.
-   If this is used, dwfl_report_module and dwfl_report_elf may not be
-   used in the same reporting session.  */
-extern Dwfl_Module *dwfl_report_offline (Dwfl *dwfl, const char *name,
-					 const char *file_name, int fd);
-
-
-/* Finish reporting the current set of modules to the library.
-   If REMOVED is not null, it's called for each module that
-   existed before but was not included in the current report.
-   Returns a nonzero return value from the callback.
-   The callback may call dwfl_report_module; doing so with the
-   details of the module being removed prevents its removal.
-   DWFL cannot be used until this function has returned zero.  */
-extern int dwfl_report_end (Dwfl *dwfl,
-			    int (*removed) (Dwfl_Module *, void *,
-					    const char *, Dwarf_Addr,
-					    void *arg),
-			    void *arg);
-
-/* Start reporting additional modules to the library.  No calls but
-   dwfl_report_* can be made on DWFL until dwfl_report_end is called.
-   This is like dwfl_report_begin, but all the old modules are kept on.
-   More dwfl_report_* calls can follow to add more modules.
-   When dwfl_report_end is called, no old modules will be removed.  */
-extern void dwfl_report_begin_add (Dwfl *dwfl);
-
-
-/* Return the name of the module, and for each non-null argument store
-   interesting details: *USERDATA is a location for storing your own
-   pointer, **USERDATA is initially null; *START and *END give the address
-   range covered by the module; *DWBIAS is the address bias for debugging
-   information, and *SYMBIAS for symbol table entries (either is -1 if not
-   yet accessed); *MAINFILE is the name of the ELF file, and *DEBUGFILE the
-   name of the debuginfo file (might be equal to *MAINFILE; either is null
-   if not yet accessed).  */
-extern const char *dwfl_module_info (Dwfl_Module *mod, void ***userdata,
-				     Dwarf_Addr *start, Dwarf_Addr *end,
-				     Dwarf_Addr *dwbias, Dwarf_Addr *symbias,
-				     const char **mainfile,
-				     const char **debugfile);
-
-/* Iterate through the modules, starting the walk with OFFSET == 0.
-   Calls *CALLBACK for each module as long as it returns DWARF_CB_OK.
-   When *CALLBACK returns another value, the walk stops and the
-   return value can be passed as OFFSET to resume it.  Returns 0 when
-   there are no more modules, or -1 for errors.  */
-extern ptrdiff_t dwfl_getmodules (Dwfl *dwfl,
-				  int (*callback) (Dwfl_Module *, void **,
-						   const char *, Dwarf_Addr,
-						   void *arg),
-				  void *arg,
-				  ptrdiff_t offset);
-
-/* Find the module containing the given address.  */
-extern Dwfl_Module *dwfl_addrmodule (Dwfl *dwfl, Dwarf_Addr address);
-
-/* Find the segment, if any, and module, if any, containing ADDRESS.
-   Returns a segment index returned by dwfl_report_segment, or -1
-   if no segment matches the address.  Regardless of the return value,
-   *MOD is always set to the module containing ADDRESS, or to null.  */
-extern int dwfl_addrsegment (Dwfl *dwfl, Dwarf_Addr address, Dwfl_Module **mod);
-
-
-
-/* Report the known build ID bits associated with a module.
-   If VADDR is nonzero, it gives the absolute address where those
-   bits are found within the module.  This can be called at any
-   time, but is usually used immediately after dwfl_report_module.
-   Once the module's main ELF file is opened, the ID note found
-   there takes precedence and cannot be changed.  */
-extern int dwfl_module_report_build_id (Dwfl_Module *mod,
-					const unsigned char *bits, size_t len,
-					GElf_Addr vaddr)
-  __nonnull_attribute__ (2);
-
-/* Extract the build ID bits associated with a module.
-   Returns -1 for errors, 0 if no ID is known, or the number of ID bytes.
-   When an ID is found, *BITS points to it; *VADDR is the absolute address
-   at which the ID bits are found within the module, or 0 if unknown.
-
-   This returns 0 when the module's main ELF file has not yet been loaded
-   and its build ID bits were not reported.  To ensure the ID is always
-   returned when determinable, call dwfl_module_getelf first.  */
-extern int dwfl_module_build_id (Dwfl_Module *mod,
-				 const unsigned char **bits, GElf_Addr *vaddr)
-  __nonnull_attribute__ (2, 3);
-
-
-/*** Standard callbacks ***/
-
-/* These standard find_elf and find_debuginfo callbacks are
-   controlled by a string specifying directories to look in.
-   If `debuginfo_path' is set in the Dwfl_Callbacks structure
-   and the char * it points to is not null, that supplies the
-   string.  Otherwise a default path is used.
-
-   If the first character of the string is + or - that enables or
-   disables CRC32 checksum validation when it's necessary.  The
-   remainder of the string is composed of elements separated by
-   colons.  Each element can start with + or - to override the
-   global checksum behavior.  This flag is never relevant when
-   working with build IDs, but it's always parsed in the path
-   string.  The remainder of the element indicates a directory.
-
-   Searches by build ID consult only the elements naming absolute
-   directory paths.  They look under those directories for a link
-   named ".build-id/xx/yy" or ".build-id/xx/yy.debug", where "xxyy"
-   is the lower-case hexadecimal representation of the ID bytes.
-
-   In searches for debuginfo by name, if the remainder of the
-   element is empty, the directory containing the main file is
-   tried; if it's an absolute path name, the absolute directory path
-   containing the main file is taken as a subdirectory of this path;
-   a relative path name is taken as a subdirectory of the directory
-   containing the main file.  Hence for /bin/ls, the default string
-   ":.debug:/usr/lib/debug" says to look in /bin, then /bin/.debug,
-   then /usr/lib/debug/bin, for the file name in the .gnu_debuglink
-   section (or "ls.debug" if none was found).  */
-
-/* Standard find_elf callback function working solely on build ID.
-   This can be tried first by any find_elf callback, to use the
-   bits passed to dwfl_module_report_build_id, if any.  */
-extern int dwfl_build_id_find_elf (Dwfl_Module *, void **,
-				   const char *, Dwarf_Addr,
-				   char **, Elf **);
-
-/* Standard find_debuginfo callback function working solely on build ID.
-   This can be tried first by any find_debuginfo callback,
-   to use the build ID bits from the main file when present.  */
-extern int dwfl_build_id_find_debuginfo (Dwfl_Module *, void **,
-					 const char *, Dwarf_Addr,
-					 const char *, const char *,
-					 GElf_Word, char **);
-
-/* Standard find_debuginfo callback function.
-   If a build ID is available, this tries first to use that.
-   If there is no build ID or no valid debuginfo found by ID,
-   it searches the debuginfo path by name, as described above.
-   Any file found in the path is validated by build ID if possible,
-   or else by CRC32 checksum if enabled, and skipped if it does not match.  */
-extern int dwfl_standard_find_debuginfo (Dwfl_Module *, void **,
-					 const char *, Dwarf_Addr,
-					 const char *, const char *,
-					 GElf_Word, char **);
-
-
-/* This callback must be used when using dwfl_offline_* to report modules,
-   if ET_REL is to be supported.  */
-extern int dwfl_offline_section_address (Dwfl_Module *, void **,
-					 const char *, Dwarf_Addr,
-					 const char *, GElf_Word,
-					 const GElf_Shdr *,
-					 Dwarf_Addr *addr);
-
-
-/* Callbacks for working with kernel modules in the running Linux kernel.  */
-extern int dwfl_linux_kernel_find_elf (Dwfl_Module *, void **,
-				       const char *, Dwarf_Addr,
-				       char **, Elf **);
-extern int dwfl_linux_kernel_module_section_address (Dwfl_Module *, void **,
-						     const char *, Dwarf_Addr,
-						     const char *, GElf_Word,
-						     const GElf_Shdr *,
-						     Dwarf_Addr *addr);
-
-/* Call dwfl_report_elf for the running Linux kernel.
-   Returns zero on success, -1 if dwfl_report_module failed,
-   or an errno code if opening the kernel binary failed.  */
-extern int dwfl_linux_kernel_report_kernel (Dwfl *dwfl);
-
-/* Call dwfl_report_module for each kernel module in the running Linux kernel.
-   Returns zero on success, -1 if dwfl_report_module failed,
-   or an errno code if reading the list of modules failed.  */
-extern int dwfl_linux_kernel_report_modules (Dwfl *dwfl);
-
-/* Report a kernel and its modules found on disk, for offline use.
-   If RELEASE starts with '/', it names a directory to look in;
-   if not, it names a directory to find under /lib/modules/;
-   if null, /lib/modules/`uname -r` is used.
-   Returns zero on success, -1 if dwfl_report_module failed,
-   or an errno code if finding the files on disk failed.
-
-   If PREDICATE is not null, it is called with each module to be reported;
-   its arguments are the module name, and the ELF file name or null if unknown,
-   and its return value should be zero to skip the module, one to report it,
-   or -1 to cause the call to fail and return errno.  */
-extern int dwfl_linux_kernel_report_offline (Dwfl *dwfl, const char *release,
-					     int (*predicate) (const char *,
-							       const char *));
-
-/* Examine an ET_CORE file and report modules based on its contents.
-   This can follow a dwfl_report_offline call to bootstrap the
-   DT_DEBUG method of following the dynamic linker link_map chain, in
-   case the core file does not contain enough of the executable's text
-   segment to locate its PT_DYNAMIC in the dump.  This might call
-   dwfl_report_elf on file names found in the dump if reading some
-   link_map files is the only way to ascertain those modules' addresses.
-   Returns the number of modules reported, or -1 for errors.  */
-extern int dwfl_core_file_report (Dwfl *dwfl, Elf *elf);
-
-/* Call dwfl_report_module for each file mapped into the address space of PID.
-   Returns zero on success, -1 if dwfl_report_module failed,
-   or an errno code if opening the kernel binary failed.  */
-extern int dwfl_linux_proc_report (Dwfl *dwfl, pid_t pid);
-
-/* Similar, but reads an input stream in the format of Linux /proc/PID/maps
-   files giving module layout, not the file for a live process.  */
-extern int dwfl_linux_proc_maps_report (Dwfl *dwfl, FILE *);
-
-/* Trivial find_elf callback for use with dwfl_linux_proc_report.
-   This uses the module name as a file name directly and tries to open it
-   if it begin with a slash, or handles the magic string "[vdso]".  */
-extern int dwfl_linux_proc_find_elf (Dwfl_Module *mod, void **userdata,
-				     const char *module_name, Dwarf_Addr base,
-				     char **file_name, Elf **);
-
-/* Standard argument parsing for using a standard callback set.  */
-struct argp;
-extern const struct argp *dwfl_standard_argp (void) __attribute__ ((const));
-
-
-/*** Relocation of addresses from Dwfl ***/
-
-/* Return the number of relocatable bases associated with the module,
-   which is zero for ET_EXEC and one for ET_DYN.  Returns -1 for errors.  */
-extern int dwfl_module_relocations (Dwfl_Module *mod);
-
-/* Return the relocation base index associated with the *ADDRESS location,
-   and adjust *ADDRESS to be an offset relative to that base.
-   Returns -1 for errors.  */
-extern int dwfl_module_relocate_address (Dwfl_Module *mod,
-					 Dwarf_Addr *address);
-
-/* Return the ELF section name for the given relocation base index;
-   if SHNDXP is not null, set *SHNDXP to the ELF section index.
-   For ET_DYN, returns "" and sets *SHNDXP to SHN_ABS; the relocation
-   base is the runtime start address reported for the module.
-   Returns null for errors.  */
-extern const char *dwfl_module_relocation_info (Dwfl_Module *mod,
-						unsigned int idx,
-						GElf_Word *shndxp);
-
-/* Validate that ADDRESS and ADDRESS+OFFSET lie in a known module
-   and both within the same contiguous region for relocation purposes.
-   Returns zero for success and -1 for errors.  */
-extern int dwfl_validate_address (Dwfl *dwfl,
-				  Dwarf_Addr address, Dwarf_Sword offset);
-
-
-/*** ELF access functions ***/
-
-/* Fetch the module main ELF file (where the allocated sections
-   are found) for use with libelf.  If successful, fills in *BIAS
-   with the difference between addresses within the loaded module
-   and those in symbol tables or Dwarf information referring to it.  */
-extern Elf *dwfl_module_getelf (Dwfl_Module *, GElf_Addr *bias);
-
-/* Return the number of symbols in the module's symbol table,
-   or -1 for errors.  */
-extern int dwfl_module_getsymtab (Dwfl_Module *mod);
-
-/* Fetch one entry from the module's symbol table.  On errors, returns
-   NULL.  If successful, fills in *SYM and returns the string for st_name.
-   This works like gelf_getsym except that st_value is always adjusted to
-   an absolute value based on the module's location, when the symbol is in
-   an SHF_ALLOC section.  If SHNDXP is non-null, it's set with the section
-   index (whether from st_shndx or extended index table); in case of a
-   symbol in a non-allocated section, *SHNDXP is instead set to -1.  */
-extern const char *dwfl_module_getsym (Dwfl_Module *mod, int ndx,
-				       GElf_Sym *sym, GElf_Word *shndxp)
-  __nonnull_attribute__ (3);
-
-/* Find the symbol that ADDRESS lies inside, and return its name.  */
-extern const char *dwfl_module_addrname (Dwfl_Module *mod, GElf_Addr address);
-
-/* Find the symbol that ADDRESS lies inside, and return detailed
-   information as for dwfl_module_getsym (above).  */
-extern const char *dwfl_module_addrsym (Dwfl_Module *mod, GElf_Addr address,
-					GElf_Sym *sym, GElf_Word *shndxp)
-  __nonnull_attribute__ (3);
-
-/* Find the ELF section that *ADDRESS lies inside and return it.
-   On success, adjusts *ADDRESS to be relative to the section,
-   and sets *BIAS to the difference between addresses used in
-   the returned section's headers and run-time addresses.  */
-extern Elf_Scn *dwfl_module_address_section (Dwfl_Module *mod,
-					     Dwarf_Addr *address,
-					     Dwarf_Addr *bias)
-  __nonnull_attribute__ (2, 3);
-
-
-/*** Dwarf access functions ***/
-
-/* Fetch the module's debug information for use with libdw.
-   If successful, fills in *BIAS with the difference between
-   addresses within the loaded module and those  to use with libdw.  */
-extern Dwarf *dwfl_module_getdwarf (Dwfl_Module *, Dwarf_Addr *bias)
-     __nonnull_attribute__ (2);
-
-/* Get the libdw handle for each module.  */
-extern ptrdiff_t dwfl_getdwarf (Dwfl *,
-				int (*callback) (Dwfl_Module *, void **,
-						 const char *, Dwarf_Addr,
-						 Dwarf *, Dwarf_Addr, void *),
-				void *arg, ptrdiff_t offset);
-
-/* Look up the module containing ADDR and return its debugging information,
-   loading it if necessary.  */
-extern Dwarf *dwfl_addrdwarf (Dwfl *dwfl, Dwarf_Addr addr, Dwarf_Addr *bias)
-     __nonnull_attribute__ (3);
-
-
-/* Find the CU containing ADDR and return its DIE.  */
-extern Dwarf_Die *dwfl_addrdie (Dwfl *dwfl, Dwarf_Addr addr, Dwarf_Addr *bias)
-     __nonnull_attribute__ (3);
-extern Dwarf_Die *dwfl_module_addrdie (Dwfl_Module *mod,
-				       Dwarf_Addr addr, Dwarf_Addr *bias)
-     __nonnull_attribute__ (3);
-
-/* Iterate through the CUs, start with null for LASTCU.  */
-extern Dwarf_Die *dwfl_nextcu (Dwfl *dwfl, Dwarf_Die *lastcu, Dwarf_Addr *bias)
-     __nonnull_attribute__ (3);
-extern Dwarf_Die *dwfl_module_nextcu (Dwfl_Module *mod,
-				      Dwarf_Die *lastcu, Dwarf_Addr *bias)
-     __nonnull_attribute__ (3);
-
-/* Return the module containing the CU DIE.  */
-extern Dwfl_Module *dwfl_cumodule (Dwarf_Die *cudie);
-
-
-/* Cache the source line information fo the CU and return the
-   number of Dwfl_Line entries it has.  */
-extern int dwfl_getsrclines (Dwarf_Die *cudie, size_t *nlines);
-
-/* Access one line number entry within the CU.  */
-extern Dwfl_Line *dwfl_onesrcline (Dwarf_Die *cudie, size_t idx);
-
-/* Get source for address.  */
-extern Dwfl_Line *dwfl_module_getsrc (Dwfl_Module *mod, Dwarf_Addr addr);
-extern Dwfl_Line *dwfl_getsrc (Dwfl *dwfl, Dwarf_Addr addr);
-
-/* Get address for source.  */
-extern int dwfl_module_getsrc_file (Dwfl_Module *mod,
-				    const char *fname, int lineno, int column,
-				    Dwfl_Line ***srcsp, size_t *nsrcs);
-
-/* Return the module containing this line record.  */
-extern Dwfl_Module *dwfl_linemodule (Dwfl_Line *line);
-
-/* Return the CU containing this line record.  */
-extern Dwarf_Die *dwfl_linecu (Dwfl_Line *line);
-
-/* Return the source file name and fill in other information.
-   Arguments may be null for unneeded fields.  */
-extern const char *dwfl_lineinfo (Dwfl_Line *line, Dwarf_Addr *addr,
-				  int *linep, int *colp,
-				  Dwarf_Word *mtime, Dwarf_Word *length);
-
-  /* Return the equivalent Dwarf_Line and the bias to apply to its address.  */
-extern Dwarf_Line *dwfl_dwarf_line (Dwfl_Line *line, Dwarf_Addr *bias);
-
-/* Return the compilation directory (AT_comp_dir) from this line's CU.  */
-extern const char *dwfl_line_comp_dir (Dwfl_Line *line);
-
-
-/*** Machine backend access functions ***/
-
-/* Return location expression to find return value given a
-   DW_TAG_subprogram, DW_TAG_subroutine_type, or similar DIE describing
-   function itself (whose DW_AT_type attribute describes its return type).
-   The given DIE must come from the given module.  Returns -1 for errors.
-   Returns zero if the function has no return value (e.g. "void" in C).
-   Otherwise, *LOCOPS gets a location expression to find the return value,
-   and returns the number of operations in the expression.  The pointer is
-   permanently allocated at least as long as the module is live.  */
-extern int dwfl_module_return_value_location (Dwfl_Module *mod,
-					      Dwarf_Die *functypedie,
-					      const Dwarf_Op **locops);
-
-/* Enumerate the DWARF register numbers and their names.
-   For each register, CALLBACK gets its DWARF number, a string describing
-   the register set (such as "integer" or "FPU"), a prefix used in
-   assembler syntax (such as "%" or "$", may be ""), and the name for the
-   register (contains identifier characters only, possibly all digits).
-   The REGNAME string is valid only during the callback. */
-extern int dwfl_module_register_names (Dwfl_Module *mod,
-				       int (*callback) (void *arg,
-							int regno,
-							const char *setname,
-							const char *prefix,
-							const char *regname,
-							int bits, int type),
-				       void *arg);
-
-
-/* Find the CFI for this module.  Returns NULL if there is no CFI.
-   On success, fills in *BIAS with the difference between addresses
-   within the loaded module and those in the CFI referring to it.
-   The pointer returned can be used until the module is cleaned up.
-   Calling these more than once returns the same pointers.
-
-   dwfl_module_dwarf_cfi gets the '.debug_frame' information found with the
-   rest of the DWARF information.  dwfl_module_eh_cfi gets the '.eh_frame'
-   information found linked into the text.  A module might have either or
-   both.  */
-extern Dwarf_CFI *dwfl_module_dwarf_cfi (Dwfl_Module *mod, Dwarf_Addr *bias);
-extern Dwarf_CFI *dwfl_module_eh_cfi (Dwfl_Module *mod, Dwarf_Addr *bias);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* libdwfl.h */
diff --git a/elfutils/version.h b/elfutils/version.h
deleted file mode 100644
index 684c0dd4..00000000
--- a/elfutils/version.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Version information about elfutils development libraries.
-   Copyright (C) 2008 Red Hat, Inc.
-   This file is part of Red Hat elfutils.
-
-   Red Hat elfutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by the
-   Free Software Foundation; version 2 of the License.
-
-   Red Hat elfutils is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with Red Hat elfutils; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
-
-   In addition, as a special exception, Red Hat, Inc. gives You the
-   additional right to link the code of Red Hat elfutils with code licensed
-   under any Open Source Initiative certified open source license
-   (http://www.opensource.org/licenses/index.php) which requires the
-   distribution of source code with any binary distribution and to
-   distribute linked combinations of the two.  Non-GPL Code permitted under
-   this exception must only link to the code of Red Hat elfutils through
-   those well defined interfaces identified in the file named EXCEPTION
-   found in the source code files (the "Approved Interfaces").  The files
-   of Non-GPL Code may instantiate templates or use macros or inline
-   functions from the Approved Interfaces without causing the resulting
-   work to be covered by the GNU General Public License.  Only Red Hat,
-   Inc. may make changes or additions to the list of Approved Interfaces.
-   Red Hat's grant of this exception is conditioned upon your not adding
-   any new exceptions.  If you wish to add a new Approved Interface or
-   exception, please contact Red Hat.  You must obey the GNU General Public
-   License in all respects for all of the Red Hat elfutils code and other
-   code used in conjunction with Red Hat elfutils except the Non-GPL Code
-   covered by this exception.  If you modify this file, you may extend this
-   exception to your version of the file, but you are not obligated to do
-   so.  If you do not wish to provide this exception without modification,
-   you must delete this exception statement from your version and license
-   this file solely under the GPL without exception.
-
-   Red Hat elfutils is an included package of the Open Invention Network.
-   An included package of the Open Invention Network is a package for which
-   Open Invention Network licensees cross-license their patents.  No patent
-   license is granted, either expressly or impliedly, by designation as an
-   included package.  Should you wish to participate in the Open Invention
-   Network licensing program, please visit www.openinventionnetwork.com
-   <http://www.openinventionnetwork.com>.  */
-
-#ifndef _ELFUTILS_VERSION_H
-#define _ELFUTILS_VERSION_H	1
-
-#define _ELFUTILS_VERSION	153
-
-#define _ELFUTILS_PREREQ(major, minor) \
-  (_ELFUTILS_VERSION >= ((major) * 1000 + (minor)))
-
-#endif	/* elfutils/version.h */
diff --git a/include/elfutils/libdw.h b/include/elfutils/libdw.h
new file mode 120000
index 00000000..804db278
--- /dev/null
+++ b/include/elfutils/libdw.h
@@ -0,0 +1 @@
+../../src/libdw/libdw.h
\ No newline at end of file
diff --git a/include/elfutils/libdwfl.h b/include/elfutils/libdwfl.h
new file mode 120000
index 00000000..0d7cdaf1
--- /dev/null
+++ b/include/elfutils/libdwfl.h
@@ -0,0 +1 @@
+../../src/libdwfl/libdwfl.h
\ No newline at end of file
diff --git a/include/elfutils/version.h b/include/elfutils/version.h
new file mode 120000
index 00000000..9e568cea
--- /dev/null
+++ b/include/elfutils/version.h
@@ -0,0 +1 @@
+../../src/version.h
\ No newline at end of file
diff --git a/0.153/ABOUT-NLS b/src/ABOUT-NLS
index 83bc72ec..83bc72ec 100644
--- a/0.153/ABOUT-NLS
+++ b/src/ABOUT-NLS
diff --git a/0.153/AUTHORS b/src/AUTHORS
index ef3c5430..ef3c5430 100644
--- a/0.153/AUTHORS
+++ b/src/AUTHORS
diff --git a/0.153/Android.mk b/src/Android.mk
index 260fae21..260fae21 100755
--- a/0.153/Android.mk
+++ b/src/Android.mk
diff --git a/0.153/COPYING b/src/COPYING
index 60549be5..60549be5 100644
--- a/0.153/COPYING
+++ b/src/COPYING
diff --git a/0.153/ChangeLog b/src/ChangeLog
index 5d755956..5d755956 100644
--- a/0.153/ChangeLog
+++ b/src/ChangeLog
diff --git a/0.153/EXCEPTION b/src/EXCEPTION
index 491c5764..491c5764 100644
--- a/0.153/EXCEPTION
+++ b/src/EXCEPTION
diff --git a/0.153/GPG-KEY b/src/GPG-KEY
index cd60f822..cd60f822 100644
--- a/0.153/GPG-KEY
+++ b/src/GPG-KEY
diff --git a/0.153/INSTALL b/src/INSTALL
index 7d1c323b..7d1c323b 100644
--- a/0.153/INSTALL
+++ b/src/INSTALL
diff --git a/0.153/Makefile.am b/src/Makefile.am
index 4decc55f..4decc55f 100644
--- a/0.153/Makefile.am
+++ b/src/Makefile.am
diff --git a/0.153/Makefile.in b/src/Makefile.in
index 97b7dd79..97b7dd79 100644
--- a/0.153/Makefile.in
+++ b/src/Makefile.in
diff --git a/0.153/NEWS b/src/NEWS
index aa660a85..aa660a85 100644
--- a/0.153/NEWS
+++ b/src/NEWS
diff --git a/0.153/NOTES b/src/NOTES
index 4f06b8d2..4f06b8d2 100644
--- a/0.153/NOTES
+++ b/src/NOTES
diff --git a/0.153/README b/src/README
index 33cac74f..33cac74f 100644
--- a/0.153/README
+++ b/src/README
diff --git a/0.153/THANKS b/src/THANKS
index 887c067a..887c067a 100644
--- a/0.153/THANKS
+++ b/src/THANKS
diff --git a/0.153/TODO b/src/TODO
index 0012a566..0012a566 100644
--- a/0.153/TODO
+++ b/src/TODO
diff --git a/0.153/aclocal.m4 b/src/aclocal.m4
index 94f714a3..94f714a3 100644
--- a/0.153/aclocal.m4
+++ b/src/aclocal.m4
diff --git a/0.153/backends/ChangeLog b/src/backends/ChangeLog
index 744d1d55..744d1d55 100644
--- a/0.153/backends/ChangeLog
+++ b/src/backends/ChangeLog
diff --git a/0.153/backends/Makefile.am b/src/backends/Makefile.am
index 3ce448a9..3ce448a9 100644
--- a/0.153/backends/Makefile.am
+++ b/src/backends/Makefile.am
diff --git a/0.153/backends/Makefile.in b/src/backends/Makefile.in
index b14a480f..b14a480f 100644
--- a/0.153/backends/Makefile.in
+++ b/src/backends/Makefile.in
diff --git a/0.153/backends/alpha_auxv.c b/src/backends/alpha_auxv.c
index 38a8bcdf..38a8bcdf 100644
--- a/0.153/backends/alpha_auxv.c
+++ b/src/backends/alpha_auxv.c
diff --git a/0.153/backends/alpha_corenote.c b/src/backends/alpha_corenote.c
index dcc62e9e..dcc62e9e 100644
--- a/0.153/backends/alpha_corenote.c
+++ b/src/backends/alpha_corenote.c
diff --git a/0.153/backends/alpha_init.c b/src/backends/alpha_init.c
index 30fe5c6c..30fe5c6c 100644
--- a/0.153/backends/alpha_init.c
+++ b/src/backends/alpha_init.c
diff --git a/0.153/backends/alpha_regs.c b/src/backends/alpha_regs.c
index 3bb9a6cd..3bb9a6cd 100644
--- a/0.153/backends/alpha_regs.c
+++ b/src/backends/alpha_regs.c
diff --git a/0.153/backends/alpha_reloc.def b/src/backends/alpha_reloc.def
index 347a483f..347a483f 100644
--- a/0.153/backends/alpha_reloc.def
+++ b/src/backends/alpha_reloc.def
diff --git a/0.153/backends/alpha_retval.c b/src/backends/alpha_retval.c
index 57ba867b..57ba867b 100644
--- a/0.153/backends/alpha_retval.c
+++ b/src/backends/alpha_retval.c
diff --git a/0.153/backends/alpha_symbol.c b/src/backends/alpha_symbol.c
index 5d25d3e4..5d25d3e4 100644
--- a/0.153/backends/alpha_symbol.c
+++ b/src/backends/alpha_symbol.c
diff --git a/0.153/backends/arm_attrs.c b/src/backends/arm_attrs.c
index 84f4d451..84f4d451 100644
--- a/0.153/backends/arm_attrs.c
+++ b/src/backends/arm_attrs.c
diff --git a/0.153/backends/arm_auxv.c b/src/backends/arm_auxv.c
index 728f940d..728f940d 100644
--- a/0.153/backends/arm_auxv.c
+++ b/src/backends/arm_auxv.c
diff --git a/0.153/backends/arm_corenote.c b/src/backends/arm_corenote.c
index 6f2d3a3e..6f2d3a3e 100644
--- a/0.153/backends/arm_corenote.c
+++ b/src/backends/arm_corenote.c
diff --git a/0.153/backends/arm_init.c b/src/backends/arm_init.c
index 15c0ee67..15c0ee67 100644
--- a/0.153/backends/arm_init.c
+++ b/src/backends/arm_init.c
diff --git a/0.153/backends/arm_regs.c b/src/backends/arm_regs.c
index 0a9536d4..0a9536d4 100644
--- a/0.153/backends/arm_regs.c
+++ b/src/backends/arm_regs.c
diff --git a/0.153/backends/arm_reloc.def b/src/backends/arm_reloc.def
index 4dc54b7e..4dc54b7e 100644
--- a/0.153/backends/arm_reloc.def
+++ b/src/backends/arm_reloc.def
diff --git a/0.153/backends/arm_retval.c b/src/backends/arm_retval.c
index 191cb174..191cb174 100644
--- a/0.153/backends/arm_retval.c
+++ b/src/backends/arm_retval.c
diff --git a/0.153/backends/arm_symbol.c b/src/backends/arm_symbol.c
index e08874bb..e08874bb 100644
--- a/0.153/backends/arm_symbol.c
+++ b/src/backends/arm_symbol.c
diff --git a/0.153/backends/common-reloc.c b/src/backends/common-reloc.c
index 191b22a2..191b22a2 100644
--- a/0.153/backends/common-reloc.c
+++ b/src/backends/common-reloc.c
diff --git a/0.153/backends/i386_auxv.c b/src/backends/i386_auxv.c
index 5f7b15ef..5f7b15ef 100644
--- a/0.153/backends/i386_auxv.c
+++ b/src/backends/i386_auxv.c
diff --git a/0.153/backends/i386_cfi.c b/src/backends/i386_cfi.c
index 77478f7e..77478f7e 100644
--- a/0.153/backends/i386_cfi.c
+++ b/src/backends/i386_cfi.c
diff --git a/0.153/backends/i386_corenote.c b/src/backends/i386_corenote.c
index 40b6a24e..40b6a24e 100644
--- a/0.153/backends/i386_corenote.c
+++ b/src/backends/i386_corenote.c
diff --git a/0.153/backends/i386_init.c b/src/backends/i386_init.c
index be9bbf90..be9bbf90 100644
--- a/0.153/backends/i386_init.c
+++ b/src/backends/i386_init.c
diff --git a/0.153/backends/i386_regs.c b/src/backends/i386_regs.c
index 5cf0d810..5cf0d810 100644
--- a/0.153/backends/i386_regs.c
+++ b/src/backends/i386_regs.c
diff --git a/0.153/backends/i386_reloc.def b/src/backends/i386_reloc.def
index 1befd1b6..1befd1b6 100644
--- a/0.153/backends/i386_reloc.def
+++ b/src/backends/i386_reloc.def
diff --git a/0.153/backends/i386_retval.c b/src/backends/i386_retval.c
index 67a090d5..67a090d5 100644
--- a/0.153/backends/i386_retval.c
+++ b/src/backends/i386_retval.c
diff --git a/0.153/backends/i386_symbol.c b/src/backends/i386_symbol.c
index 5d6c0efd..5d6c0efd 100644
--- a/0.153/backends/i386_symbol.c
+++ b/src/backends/i386_symbol.c
diff --git a/0.153/backends/i386_syscall.c b/src/backends/i386_syscall.c
index 4d6e438c..4d6e438c 100644
--- a/0.153/backends/i386_syscall.c
+++ b/src/backends/i386_syscall.c
diff --git a/0.153/backends/ia64_init.c b/src/backends/ia64_init.c
index 290c192c..290c192c 100644
--- a/0.153/backends/ia64_init.c
+++ b/src/backends/ia64_init.c
diff --git a/0.153/backends/ia64_regs.c b/src/backends/ia64_regs.c
index 0460739c..0460739c 100644
--- a/0.153/backends/ia64_regs.c
+++ b/src/backends/ia64_regs.c
diff --git a/0.153/backends/ia64_reloc.def b/src/backends/ia64_reloc.def
index a4234656..a4234656 100644
--- a/0.153/backends/ia64_reloc.def
+++ b/src/backends/ia64_reloc.def
diff --git a/0.153/backends/ia64_retval.c b/src/backends/ia64_retval.c
index 7645c3c8..7645c3c8 100644
--- a/0.153/backends/ia64_retval.c
+++ b/src/backends/ia64_retval.c
diff --git a/0.153/backends/ia64_symbol.c b/src/backends/ia64_symbol.c
index 1edef8b5..1edef8b5 100644
--- a/0.153/backends/ia64_symbol.c
+++ b/src/backends/ia64_symbol.c
diff --git a/0.153/backends/libebl_CPU.h b/src/backends/libebl_CPU.h
index b00e7231..b00e7231 100644
--- a/0.153/backends/libebl_CPU.h
+++ b/src/backends/libebl_CPU.h
diff --git a/0.153/backends/linux-core-note.c b/src/backends/linux-core-note.c
index 9d01219c..9d01219c 100644
--- a/0.153/backends/linux-core-note.c
+++ b/src/backends/linux-core-note.c
diff --git a/0.153/backends/ppc64_corenote.c b/src/backends/ppc64_corenote.c
index 9d6a6a44..9d6a6a44 100644
--- a/0.153/backends/ppc64_corenote.c
+++ b/src/backends/ppc64_corenote.c
diff --git a/0.153/backends/ppc64_init.c b/src/backends/ppc64_init.c
index 3060a605..3060a605 100644
--- a/0.153/backends/ppc64_init.c
+++ b/src/backends/ppc64_init.c
diff --git a/0.153/backends/ppc64_reloc.def b/src/backends/ppc64_reloc.def
index e51512be..e51512be 100644
--- a/0.153/backends/ppc64_reloc.def
+++ b/src/backends/ppc64_reloc.def
diff --git a/0.153/backends/ppc64_retval.c b/src/backends/ppc64_retval.c
index a5fc0dc8..a5fc0dc8 100644
--- a/0.153/backends/ppc64_retval.c
+++ b/src/backends/ppc64_retval.c
diff --git a/0.153/backends/ppc64_symbol.c b/src/backends/ppc64_symbol.c
index 49fde0ca..49fde0ca 100644
--- a/0.153/backends/ppc64_symbol.c
+++ b/src/backends/ppc64_symbol.c
diff --git a/0.153/backends/ppc_attrs.c b/src/backends/ppc_attrs.c
index 985df3f9..985df3f9 100644
--- a/0.153/backends/ppc_attrs.c
+++ b/src/backends/ppc_attrs.c
diff --git a/0.153/backends/ppc_auxv.c b/src/backends/ppc_auxv.c
index 1c0a5cfc..1c0a5cfc 100644
--- a/0.153/backends/ppc_auxv.c
+++ b/src/backends/ppc_auxv.c
diff --git a/0.153/backends/ppc_corenote.c b/src/backends/ppc_corenote.c
index af0c46aa..af0c46aa 100644
--- a/0.153/backends/ppc_corenote.c
+++ b/src/backends/ppc_corenote.c
diff --git a/0.153/backends/ppc_init.c b/src/backends/ppc_init.c
index 523c6583..523c6583 100644
--- a/0.153/backends/ppc_init.c
+++ b/src/backends/ppc_init.c
diff --git a/0.153/backends/ppc_regs.c b/src/backends/ppc_regs.c
index 637c25d1..637c25d1 100644
--- a/0.153/backends/ppc_regs.c
+++ b/src/backends/ppc_regs.c
diff --git a/0.153/backends/ppc_reloc.def b/src/backends/ppc_reloc.def
index 974c24fc..974c24fc 100644
--- a/0.153/backends/ppc_reloc.def
+++ b/src/backends/ppc_reloc.def
diff --git a/0.153/backends/ppc_retval.c b/src/backends/ppc_retval.c
index 15a0dba8..15a0dba8 100644
--- a/0.153/backends/ppc_retval.c
+++ b/src/backends/ppc_retval.c
diff --git a/0.153/backends/ppc_symbol.c b/src/backends/ppc_symbol.c
index 9540a3e9..9540a3e9 100644
--- a/0.153/backends/ppc_symbol.c
+++ b/src/backends/ppc_symbol.c
diff --git a/0.153/backends/ppc_syscall.c b/src/backends/ppc_syscall.c
index 23eff812..23eff812 100644
--- a/0.153/backends/ppc_syscall.c
+++ b/src/backends/ppc_syscall.c
diff --git a/0.153/backends/s390_init.c b/src/backends/s390_init.c
index 05ffce60..05ffce60 100644
--- a/0.153/backends/s390_init.c
+++ b/src/backends/s390_init.c
diff --git a/0.153/backends/s390_regs.c b/src/backends/s390_regs.c
index 7e8113a2..7e8113a2 100644
--- a/0.153/backends/s390_regs.c
+++ b/src/backends/s390_regs.c
diff --git a/0.153/backends/s390_reloc.def b/src/backends/s390_reloc.def
index b2bc9224..b2bc9224 100644
--- a/0.153/backends/s390_reloc.def
+++ b/src/backends/s390_reloc.def
diff --git a/0.153/backends/s390_retval.c b/src/backends/s390_retval.c
index 15bd97bf..15bd97bf 100644
--- a/0.153/backends/s390_retval.c
+++ b/src/backends/s390_retval.c
diff --git a/0.153/backends/s390_symbol.c b/src/backends/s390_symbol.c
index 98c76530..98c76530 100644
--- a/0.153/backends/s390_symbol.c
+++ b/src/backends/s390_symbol.c
diff --git a/0.153/backends/sh_corenote.c b/src/backends/sh_corenote.c
index 80bcd6f8..80bcd6f8 100644
--- a/0.153/backends/sh_corenote.c
+++ b/src/backends/sh_corenote.c
diff --git a/0.153/backends/sh_init.c b/src/backends/sh_init.c
index 7b36e7a3..7b36e7a3 100644
--- a/0.153/backends/sh_init.c
+++ b/src/backends/sh_init.c
diff --git a/0.153/backends/sh_regs.c b/src/backends/sh_regs.c
index fc6705e4..fc6705e4 100644
--- a/0.153/backends/sh_regs.c
+++ b/src/backends/sh_regs.c
diff --git a/0.153/backends/sh_reloc.def b/src/backends/sh_reloc.def
index e4f24427..e4f24427 100644
--- a/0.153/backends/sh_reloc.def
+++ b/src/backends/sh_reloc.def
diff --git a/0.153/backends/sh_retval.c b/src/backends/sh_retval.c
index 096d955d..096d955d 100644
--- a/0.153/backends/sh_retval.c
+++ b/src/backends/sh_retval.c
diff --git a/0.153/backends/sh_symbol.c b/src/backends/sh_symbol.c
index 9fb5db44..9fb5db44 100644
--- a/0.153/backends/sh_symbol.c
+++ b/src/backends/sh_symbol.c
diff --git a/0.153/backends/sparc64_corenote.c b/src/backends/sparc64_corenote.c
index cef6431e..cef6431e 100644
--- a/0.153/backends/sparc64_corenote.c
+++ b/src/backends/sparc64_corenote.c
diff --git a/0.153/backends/sparc_auxv.c b/src/backends/sparc_auxv.c
index a22b3cea..a22b3cea 100644
--- a/0.153/backends/sparc_auxv.c
+++ b/src/backends/sparc_auxv.c
diff --git a/0.153/backends/sparc_corenote.c b/src/backends/sparc_corenote.c
index 55aed8f4..55aed8f4 100644
--- a/0.153/backends/sparc_corenote.c
+++ b/src/backends/sparc_corenote.c
diff --git a/0.153/backends/sparc_init.c b/src/backends/sparc_init.c
index 856bd48c..856bd48c 100644
--- a/0.153/backends/sparc_init.c
+++ b/src/backends/sparc_init.c
diff --git a/0.153/backends/sparc_regs.c b/src/backends/sparc_regs.c
index b3e9e201..b3e9e201 100644
--- a/0.153/backends/sparc_regs.c
+++ b/src/backends/sparc_regs.c
diff --git a/0.153/backends/sparc_reloc.def b/src/backends/sparc_reloc.def
index a7ea52a3..a7ea52a3 100644
--- a/0.153/backends/sparc_reloc.def
+++ b/src/backends/sparc_reloc.def
diff --git a/0.153/backends/sparc_retval.c b/src/backends/sparc_retval.c
index dcff67a2..dcff67a2 100644
--- a/0.153/backends/sparc_retval.c
+++ b/src/backends/sparc_retval.c
diff --git a/0.153/backends/sparc_symbol.c b/src/backends/sparc_symbol.c
index 7896e9f4..7896e9f4 100644
--- a/0.153/backends/sparc_symbol.c
+++ b/src/backends/sparc_symbol.c
diff --git a/0.153/backends/x86_64_cfi.c b/src/backends/x86_64_cfi.c
index caaee44e..caaee44e 100644
--- a/0.153/backends/x86_64_cfi.c
+++ b/src/backends/x86_64_cfi.c
diff --git a/0.153/backends/x86_64_corenote.c b/src/backends/x86_64_corenote.c
index 552ac88b..552ac88b 100644
--- a/0.153/backends/x86_64_corenote.c
+++ b/src/backends/x86_64_corenote.c
diff --git a/0.153/backends/x86_64_init.c b/src/backends/x86_64_init.c
index 32f32e02..32f32e02 100644
--- a/0.153/backends/x86_64_init.c
+++ b/src/backends/x86_64_init.c
diff --git a/0.153/backends/x86_64_regs.c b/src/backends/x86_64_regs.c
index 8eb0d33f..8eb0d33f 100644
--- a/0.153/backends/x86_64_regs.c
+++ b/src/backends/x86_64_regs.c
diff --git a/0.153/backends/x86_64_reloc.def b/src/backends/x86_64_reloc.def
index ef302e55..ef302e55 100644
--- a/0.153/backends/x86_64_reloc.def
+++ b/src/backends/x86_64_reloc.def
diff --git a/0.153/backends/x86_64_retval.c b/src/backends/x86_64_retval.c
index ba772bb9..ba772bb9 100644
--- a/0.153/backends/x86_64_retval.c
+++ b/src/backends/x86_64_retval.c
diff --git a/0.153/backends/x86_64_symbol.c b/src/backends/x86_64_symbol.c
index 97fd15b3..97fd15b3 100644
--- a/0.153/backends/x86_64_symbol.c
+++ b/src/backends/x86_64_symbol.c
diff --git a/0.153/backends/x86_64_syscall.c b/src/backends/x86_64_syscall.c
index c3db715d..c3db715d 100644
--- a/0.153/backends/x86_64_syscall.c
+++ b/src/backends/x86_64_syscall.c
diff --git a/0.153/backends/x86_corenote.c b/src/backends/x86_corenote.c
index 78849a66..78849a66 100644
--- a/0.153/backends/x86_corenote.c
+++ b/src/backends/x86_corenote.c
diff --git a/0.153/bionic-fixup/AndroidFixup.h b/src/bionic-fixup/AndroidFixup.h
index e7e6daa0..e7e6daa0 100644
--- a/0.153/bionic-fixup/AndroidFixup.h
+++ b/src/bionic-fixup/AndroidFixup.h
diff --git a/0.153/bionic-fixup/argp.h b/src/bionic-fixup/argp.h
index 8a8e1bbe..8a8e1bbe 100644
--- a/0.153/bionic-fixup/argp.h
+++ b/src/bionic-fixup/argp.h
diff --git a/0.153/bionic-fixup/libintl.h b/src/bionic-fixup/libintl.h
index c35a06d4..c35a06d4 100644
--- a/0.153/bionic-fixup/libintl.h
+++ b/src/bionic-fixup/libintl.h
diff --git a/0.153/config.h b/src/config.h
index 19253335..19253335 100644
--- a/0.153/config.h
+++ b/src/config.h
diff --git a/0.153/config.h.in b/src/config.h.in
index b44f89d0..b44f89d0 100644
--- a/0.153/config.h.in
+++ b/src/config.h.in
diff --git a/0.153/config/ChangeLog b/src/config/ChangeLog
index 849d1b35..849d1b35 100644
--- a/0.153/config/ChangeLog
+++ b/src/config/ChangeLog
diff --git a/0.153/config/Makefile.am b/src/config/Makefile.am
index 45ddd73b..45ddd73b 100644
--- a/0.153/config/Makefile.am
+++ b/src/config/Makefile.am
diff --git a/0.153/config/Makefile.in b/src/config/Makefile.in
index f7d095ff..f7d095ff 100644
--- a/0.153/config/Makefile.in
+++ b/src/config/Makefile.in
diff --git a/0.153/config/config.guess b/src/config/config.guess
index dc84c68e..dc84c68e 100755
--- a/0.153/config/config.guess
+++ b/src/config/config.guess
diff --git a/0.153/config/config.sub b/src/config/config.sub
index 2a55a507..2a55a507 100755
--- a/0.153/config/config.sub
+++ b/src/config/config.sub
diff --git a/0.153/config/depcomp b/src/config/depcomp
index df8eea7e..df8eea7e 100755
--- a/0.153/config/depcomp
+++ b/src/config/depcomp
diff --git a/0.153/config/elfutils.spec.in b/src/config/elfutils.spec.in
index 2156d270..2156d270 100644
--- a/0.153/config/elfutils.spec.in
+++ b/src/config/elfutils.spec.in
diff --git a/0.153/config/eu.am b/src/config/eu.am
index f259c5bb..f259c5bb 100644
--- a/0.153/config/eu.am
+++ b/src/config/eu.am
diff --git a/0.153/config/install-sh b/src/config/install-sh
index 6781b987..6781b987 100755
--- a/0.153/config/install-sh
+++ b/src/config/install-sh
diff --git a/0.153/config/known-dwarf.awk b/src/config/known-dwarf.awk
index bd7f0261..bd7f0261 100644
--- a/0.153/config/known-dwarf.awk
+++ b/src/config/known-dwarf.awk
diff --git a/0.153/config/missing b/src/config/missing
index 28055d2a..28055d2a 100755
--- a/0.153/config/missing
+++ b/src/config/missing
diff --git a/0.153/config/version.h.in b/src/config/version.h.in
index 82c846e9..82c846e9 100644
--- a/0.153/config/version.h.in
+++ b/src/config/version.h.in
diff --git a/0.153/config/ylwrap b/src/config/ylwrap
index 84d56340..84d56340 100755
--- a/0.153/config/ylwrap
+++ b/src/config/ylwrap
diff --git a/0.153/configure b/src/configure
index 616d1615..616d1615 100755
--- a/0.153/configure
+++ b/src/configure
diff --git a/0.153/configure.ac b/src/configure.ac
index 2e36e7c6..2e36e7c6 100644
--- a/0.153/configure.ac
+++ b/src/configure.ac
diff --git a/0.153/elfutils.spec b/src/elfutils.spec
index 29462ff1..29462ff1 100644
--- a/0.153/elfutils.spec
+++ b/src/elfutils.spec
diff --git a/0.153/lib/ChangeLog b/src/lib/ChangeLog
index 47e831ea..47e831ea 100644
--- a/0.153/lib/ChangeLog
+++ b/src/lib/ChangeLog
diff --git a/0.153/lib/Makefile.am b/src/lib/Makefile.am
index 4ea14361..4ea14361 100644
--- a/0.153/lib/Makefile.am
+++ b/src/lib/Makefile.am
diff --git a/0.153/lib/Makefile.in b/src/lib/Makefile.in
index 54b04ade..54b04ade 100644
--- a/0.153/lib/Makefile.in
+++ b/src/lib/Makefile.in
diff --git a/0.153/lib/color.c b/src/lib/color.c
index ff824485..ff824485 100644
--- a/0.153/lib/color.c
+++ b/src/lib/color.c
diff --git a/0.153/lib/crc32.c b/src/lib/crc32.c
index e0ef2f63..e0ef2f63 100644
--- a/0.153/lib/crc32.c
+++ b/src/lib/crc32.c
diff --git a/0.153/lib/crc32_file.c b/src/lib/crc32_file.c
index 5946df96..5946df96 100644
--- a/0.153/lib/crc32_file.c
+++ b/src/lib/crc32_file.c
diff --git a/0.153/lib/dynamicsizehash.c b/src/lib/dynamicsizehash.c
index 24335d42..24335d42 100644
--- a/0.153/lib/dynamicsizehash.c
+++ b/src/lib/dynamicsizehash.c
diff --git a/0.153/lib/dynamicsizehash.h b/src/lib/dynamicsizehash.h
index f169d5e7..f169d5e7 100644
--- a/0.153/lib/dynamicsizehash.h
+++ b/src/lib/dynamicsizehash.h
diff --git a/0.153/lib/eu-config.h b/src/lib/eu-config.h
index f814604f..f814604f 100644
--- a/0.153/lib/eu-config.h
+++ b/src/lib/eu-config.h
diff --git a/0.153/lib/fixedsizehash.h b/src/lib/fixedsizehash.h
index a686051c..a686051c 100644
--- a/0.153/lib/fixedsizehash.h
+++ b/src/lib/fixedsizehash.h
diff --git a/0.153/lib/list.h b/src/lib/list.h
index c712c1f3..c712c1f3 100644
--- a/0.153/lib/list.h
+++ b/src/lib/list.h
diff --git a/0.153/lib/md5.c b/src/lib/md5.c
index 1f2d5d32..1f2d5d32 100644
--- a/0.153/lib/md5.c
+++ b/src/lib/md5.c
diff --git a/0.153/lib/md5.h b/src/lib/md5.h
index 3c8b8f31..3c8b8f31 100644
--- a/0.153/lib/md5.h
+++ b/src/lib/md5.h
diff --git a/0.153/lib/next_prime.c b/src/lib/next_prime.c
index 5d4fc3fc..5d4fc3fc 100644
--- a/0.153/lib/next_prime.c
+++ b/src/lib/next_prime.c
diff --git a/0.153/lib/sha1.c b/src/lib/sha1.c
index 53ddb782..53ddb782 100644
--- a/0.153/lib/sha1.c
+++ b/src/lib/sha1.c
diff --git a/0.153/lib/sha1.h b/src/lib/sha1.h
index 97617546..97617546 100644
--- a/0.153/lib/sha1.h
+++ b/src/lib/sha1.h
diff --git a/0.153/lib/system.h b/src/lib/system.h
index 3f9f0af5..3f9f0af5 100644
--- a/0.153/lib/system.h
+++ b/src/lib/system.h
diff --git a/0.153/lib/xmalloc.c b/src/lib/xmalloc.c
index b12b0591..b12b0591 100644
--- a/0.153/lib/xmalloc.c
+++ b/src/lib/xmalloc.c
diff --git a/0.153/lib/xstrdup.c b/src/lib/xstrdup.c
index c4e7a528..c4e7a528 100644
--- a/0.153/lib/xstrdup.c
+++ b/src/lib/xstrdup.c
diff --git a/0.153/lib/xstrndup.c b/src/lib/xstrndup.c
index 2082c17f..2082c17f 100644
--- a/0.153/lib/xstrndup.c
+++ b/src/lib/xstrndup.c
diff --git a/0.153/libasm/ChangeLog b/src/libasm/ChangeLog
index f9a863df..f9a863df 100644
--- a/0.153/libasm/ChangeLog
+++ b/src/libasm/ChangeLog
diff --git a/0.153/libasm/Makefile.am b/src/libasm/Makefile.am
index 52de7a3b..52de7a3b 100644
--- a/0.153/libasm/Makefile.am
+++ b/src/libasm/Makefile.am
diff --git a/0.153/libasm/Makefile.in b/src/libasm/Makefile.in
index b31c32cc..b31c32cc 100644
--- a/0.153/libasm/Makefile.in
+++ b/src/libasm/Makefile.in
diff --git a/0.153/libasm/asm_abort.c b/src/libasm/asm_abort.c
index d12c163d..d12c163d 100644
--- a/0.153/libasm/asm_abort.c
+++ b/src/libasm/asm_abort.c
diff --git a/0.153/libasm/asm_addint16.c b/src/libasm/asm_addint16.c
index 5aa8d60e..5aa8d60e 100644
--- a/0.153/libasm/asm_addint16.c
+++ b/src/libasm/asm_addint16.c
diff --git a/0.153/libasm/asm_addint32.c b/src/libasm/asm_addint32.c
index 25c50cea..25c50cea 100644
--- a/0.153/libasm/asm_addint32.c
+++ b/src/libasm/asm_addint32.c
diff --git a/0.153/libasm/asm_addint64.c b/src/libasm/asm_addint64.c
index 9116d94c..9116d94c 100644
--- a/0.153/libasm/asm_addint64.c
+++ b/src/libasm/asm_addint64.c
diff --git a/0.153/libasm/asm_addint8.c b/src/libasm/asm_addint8.c
index ff4376b8..ff4376b8 100644
--- a/0.153/libasm/asm_addint8.c
+++ b/src/libasm/asm_addint8.c
diff --git a/0.153/libasm/asm_addsleb128.c b/src/libasm/asm_addsleb128.c
index 614ba69c..614ba69c 100644
--- a/0.153/libasm/asm_addsleb128.c
+++ b/src/libasm/asm_addsleb128.c
diff --git a/0.153/libasm/asm_addstrz.c b/src/libasm/asm_addstrz.c
index ddd03541..ddd03541 100644
--- a/0.153/libasm/asm_addstrz.c
+++ b/src/libasm/asm_addstrz.c
diff --git a/0.153/libasm/asm_adduint16.c b/src/libasm/asm_adduint16.c
index 063e5d42..063e5d42 100644
--- a/0.153/libasm/asm_adduint16.c
+++ b/src/libasm/asm_adduint16.c
diff --git a/0.153/libasm/asm_adduint32.c b/src/libasm/asm_adduint32.c
index 6dc814f8..6dc814f8 100644
--- a/0.153/libasm/asm_adduint32.c
+++ b/src/libasm/asm_adduint32.c
diff --git a/0.153/libasm/asm_adduint64.c b/src/libasm/asm_adduint64.c
index 71bb16a0..71bb16a0 100644
--- a/0.153/libasm/asm_adduint64.c
+++ b/src/libasm/asm_adduint64.c
diff --git a/0.153/libasm/asm_adduint8.c b/src/libasm/asm_adduint8.c
index c8801537..c8801537 100644
--- a/0.153/libasm/asm_adduint8.c
+++ b/src/libasm/asm_adduint8.c
diff --git a/0.153/libasm/asm_adduleb128.c b/src/libasm/asm_adduleb128.c
index 042c76b3..042c76b3 100644
--- a/0.153/libasm/asm_adduleb128.c
+++ b/src/libasm/asm_adduleb128.c
diff --git a/0.153/libasm/asm_align.c b/src/libasm/asm_align.c
index b5a573b2..b5a573b2 100644
--- a/0.153/libasm/asm_align.c
+++ b/src/libasm/asm_align.c
diff --git a/0.153/libasm/asm_begin.c b/src/libasm/asm_begin.c
index b8094dcd..b8094dcd 100644
--- a/0.153/libasm/asm_begin.c
+++ b/src/libasm/asm_begin.c
diff --git a/0.153/libasm/asm_end.c b/src/libasm/asm_end.c
index 1d815fa6..1d815fa6 100644
--- a/0.153/libasm/asm_end.c
+++ b/src/libasm/asm_end.c
diff --git a/0.153/libasm/asm_error.c b/src/libasm/asm_error.c
index 4d249e9f..4d249e9f 100644
--- a/0.153/libasm/asm_error.c
+++ b/src/libasm/asm_error.c
diff --git a/0.153/libasm/asm_fill.c b/src/libasm/asm_fill.c
index 66f7134b..66f7134b 100644
--- a/0.153/libasm/asm_fill.c
+++ b/src/libasm/asm_fill.c
diff --git a/0.153/libasm/asm_getelf.c b/src/libasm/asm_getelf.c
index df5cffda..df5cffda 100644
--- a/0.153/libasm/asm_getelf.c
+++ b/src/libasm/asm_getelf.c
diff --git a/0.153/libasm/asm_newabssym.c b/src/libasm/asm_newabssym.c
index 1dacb012..1dacb012 100644
--- a/0.153/libasm/asm_newabssym.c
+++ b/src/libasm/asm_newabssym.c
diff --git a/0.153/libasm/asm_newcomsym.c b/src/libasm/asm_newcomsym.c
index 4a7144ec..4a7144ec 100644
--- a/0.153/libasm/asm_newcomsym.c
+++ b/src/libasm/asm_newcomsym.c
diff --git a/0.153/libasm/asm_newscn.c b/src/libasm/asm_newscn.c
index dd48d2b2..dd48d2b2 100644
--- a/0.153/libasm/asm_newscn.c
+++ b/src/libasm/asm_newscn.c
diff --git a/0.153/libasm/asm_newscn_ingrp.c b/src/libasm/asm_newscn_ingrp.c
index c17e22e9..c17e22e9 100644
--- a/0.153/libasm/asm_newscn_ingrp.c
+++ b/src/libasm/asm_newscn_ingrp.c
diff --git a/0.153/libasm/asm_newscngrp.c b/src/libasm/asm_newscngrp.c
index 1eed25cd..1eed25cd 100644
--- a/0.153/libasm/asm_newscngrp.c
+++ b/src/libasm/asm_newscngrp.c
diff --git a/0.153/libasm/asm_newsubscn.c b/src/libasm/asm_newsubscn.c
index d1a86dd7..d1a86dd7 100644
--- a/0.153/libasm/asm_newsubscn.c
+++ b/src/libasm/asm_newsubscn.c
diff --git a/0.153/libasm/asm_newsym.c b/src/libasm/asm_newsym.c
index e2727b15..e2727b15 100644
--- a/0.153/libasm/asm_newsym.c
+++ b/src/libasm/asm_newsym.c
diff --git a/0.153/libasm/asm_scngrp_newsignature.c b/src/libasm/asm_scngrp_newsignature.c
index 9908e403..9908e403 100644
--- a/0.153/libasm/asm_scngrp_newsignature.c
+++ b/src/libasm/asm_scngrp_newsignature.c
diff --git a/0.153/libasm/disasm_begin.c b/src/libasm/disasm_begin.c
index 5b98b2a3..5b98b2a3 100644
--- a/0.153/libasm/disasm_begin.c
+++ b/src/libasm/disasm_begin.c
diff --git a/0.153/libasm/disasm_cb.c b/src/libasm/disasm_cb.c
index 56101258..56101258 100644
--- a/0.153/libasm/disasm_cb.c
+++ b/src/libasm/disasm_cb.c
diff --git a/0.153/libasm/disasm_end.c b/src/libasm/disasm_end.c
index ee8b2f98..ee8b2f98 100644
--- a/0.153/libasm/disasm_end.c
+++ b/src/libasm/disasm_end.c
diff --git a/0.153/libasm/disasm_str.c b/src/libasm/disasm_str.c
index 856fd11d..856fd11d 100644
--- a/0.153/libasm/disasm_str.c
+++ b/src/libasm/disasm_str.c
diff --git a/0.153/libasm/libasm.h b/src/libasm/libasm.h
index 307c7349..307c7349 100644
--- a/0.153/libasm/libasm.h
+++ b/src/libasm/libasm.h
diff --git a/0.153/libasm/libasm.map b/src/libasm/libasm.map
index a36cdbfe..a36cdbfe 100644
--- a/0.153/libasm/libasm.map
+++ b/src/libasm/libasm.map
diff --git a/0.153/libasm/libasmP.h b/src/libasm/libasmP.h
index ee7005f5..ee7005f5 100644
--- a/0.153/libasm/libasmP.h
+++ b/src/libasm/libasmP.h
diff --git a/0.153/libasm/symbolhash.c b/src/libasm/symbolhash.c
index e3aa5dda..e3aa5dda 100644
--- a/0.153/libasm/symbolhash.c
+++ b/src/libasm/symbolhash.c
diff --git a/0.153/libasm/symbolhash.h b/src/libasm/symbolhash.h
index 28768da7..28768da7 100644
--- a/0.153/libasm/symbolhash.h
+++ b/src/libasm/symbolhash.h
diff --git a/0.153/libcpu/ChangeLog b/src/libcpu/ChangeLog
index 76340a13..76340a13 100644
--- a/0.153/libcpu/ChangeLog
+++ b/src/libcpu/ChangeLog
diff --git a/0.153/libcpu/Makefile.am b/src/libcpu/Makefile.am
index 7dd25610..7dd25610 100644
--- a/0.153/libcpu/Makefile.am
+++ b/src/libcpu/Makefile.am
diff --git a/0.153/libcpu/Makefile.in b/src/libcpu/Makefile.in
index 1565505e..1565505e 100644
--- a/0.153/libcpu/Makefile.in
+++ b/src/libcpu/Makefile.in
diff --git a/0.153/libcpu/defs/i386 b/src/libcpu/defs/i386
index e0db28dc..e0db28dc 100644
--- a/0.153/libcpu/defs/i386
+++ b/src/libcpu/defs/i386
diff --git a/0.153/libcpu/i386_data.h b/src/libcpu/i386_data.h
index 42e66500..42e66500 100644
--- a/0.153/libcpu/i386_data.h
+++ b/src/libcpu/i386_data.h
diff --git a/0.153/libcpu/i386_dis.h b/src/libcpu/i386_dis.h
index a5cc01f9..a5cc01f9 100644
--- a/0.153/libcpu/i386_dis.h
+++ b/src/libcpu/i386_dis.h
diff --git a/0.153/libcpu/i386_disasm.c b/src/libcpu/i386_disasm.c
index 6d58f0ea..6d58f0ea 100644
--- a/0.153/libcpu/i386_disasm.c
+++ b/src/libcpu/i386_disasm.c
diff --git a/0.153/libcpu/i386_gendis.c b/src/libcpu/i386_gendis.c
index a8570f19..a8570f19 100644
--- a/0.153/libcpu/i386_gendis.c
+++ b/src/libcpu/i386_gendis.c
diff --git a/0.153/libcpu/i386_lex.c b/src/libcpu/i386_lex.c
index a4540b92..a4540b92 100644
--- a/0.153/libcpu/i386_lex.c
+++ b/src/libcpu/i386_lex.c
diff --git a/0.153/libcpu/i386_lex.l b/src/libcpu/i386_lex.l
index 828c5589..828c5589 100644
--- a/0.153/libcpu/i386_lex.l
+++ b/src/libcpu/i386_lex.l
diff --git a/0.153/libcpu/i386_parse.c b/src/libcpu/i386_parse.c
index 575fcc52..575fcc52 100644
--- a/0.153/libcpu/i386_parse.c
+++ b/src/libcpu/i386_parse.c
diff --git a/0.153/libcpu/i386_parse.h b/src/libcpu/i386_parse.h
index a9486e32..a9486e32 100644
--- a/0.153/libcpu/i386_parse.h
+++ b/src/libcpu/i386_parse.h
diff --git a/0.153/libcpu/i386_parse.y b/src/libcpu/i386_parse.y
index bea0e335..bea0e335 100644
--- a/0.153/libcpu/i386_parse.y
+++ b/src/libcpu/i386_parse.y
diff --git a/0.153/libcpu/memory-access.h b/src/libcpu/memory-access.h
index c68eb4a0..c68eb4a0 100644
--- a/0.153/libcpu/memory-access.h
+++ b/src/libcpu/memory-access.h
diff --git a/0.153/libcpu/x86_64_dis.h b/src/libcpu/x86_64_dis.h
index a0198bed..a0198bed 100644
--- a/0.153/libcpu/x86_64_dis.h
+++ b/src/libcpu/x86_64_dis.h
diff --git a/0.153/libcpu/x86_64_disasm.c b/src/libcpu/x86_64_disasm.c
index b793b78d..b793b78d 100644
--- a/0.153/libcpu/x86_64_disasm.c
+++ b/src/libcpu/x86_64_disasm.c
diff --git a/0.153/libdw/Android.mk b/src/libdw/Android.mk
index df14cbaf..5579b244 100755
--- a/0.153/libdw/Android.mk
+++ b/src/libdw/Android.mk
@@ -143,6 +143,8 @@ LOCAL_CFLAGS += -Wno-pointer-arith
 
 LOCAL_MODULE:= libdw
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif # linux
@@ -177,4 +179,6 @@ LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE:= libdw
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/0.153/libdw/ChangeLog b/src/libdw/ChangeLog
index 98b67f4a..98b67f4a 100644
--- a/0.153/libdw/ChangeLog
+++ b/src/libdw/ChangeLog
diff --git a/0.153/libdw/Makefile.am b/src/libdw/Makefile.am
index 1efda358..1efda358 100644
--- a/0.153/libdw/Makefile.am
+++ b/src/libdw/Makefile.am
diff --git a/0.153/libdw/Makefile.in b/src/libdw/Makefile.in
index 6cbfeaaf..6cbfeaaf 100644
--- a/0.153/libdw/Makefile.in
+++ b/src/libdw/Makefile.in
diff --git a/0.153/libdw/cfi.c b/src/libdw/cfi.c
index aeb48e69..aeb48e69 100644
--- a/0.153/libdw/cfi.c
+++ b/src/libdw/cfi.c
diff --git a/0.153/libdw/cfi.h b/src/libdw/cfi.h
index ef9cd7e1..ef9cd7e1 100644
--- a/0.153/libdw/cfi.h
+++ b/src/libdw/cfi.h
diff --git a/0.153/libdw/cie.c b/src/libdw/cie.c
index 7c93f551..7c93f551 100644
--- a/0.153/libdw/cie.c
+++ b/src/libdw/cie.c
diff --git a/0.153/libdw/dwarf.h b/src/libdw/dwarf.h
index e6a83670..e6a83670 100644
--- a/0.153/libdw/dwarf.h
+++ b/src/libdw/dwarf.h
diff --git a/0.153/libdw/dwarf_abbrev_hash.c b/src/libdw/dwarf_abbrev_hash.c
index bec1ceb2..bec1ceb2 100644
--- a/0.153/libdw/dwarf_abbrev_hash.c
+++ b/src/libdw/dwarf_abbrev_hash.c
diff --git a/0.153/libdw/dwarf_abbrev_hash.h b/src/libdw/dwarf_abbrev_hash.h
index f124d166..f124d166 100644
--- a/0.153/libdw/dwarf_abbrev_hash.h
+++ b/src/libdw/dwarf_abbrev_hash.h
diff --git a/0.153/libdw/dwarf_abbrevhaschildren.c b/src/libdw/dwarf_abbrevhaschildren.c
index 4e42a32b..4e42a32b 100644
--- a/0.153/libdw/dwarf_abbrevhaschildren.c
+++ b/src/libdw/dwarf_abbrevhaschildren.c
diff --git a/0.153/libdw/dwarf_addrdie.c b/src/libdw/dwarf_addrdie.c
index 84618721..84618721 100644
--- a/0.153/libdw/dwarf_addrdie.c
+++ b/src/libdw/dwarf_addrdie.c
diff --git a/0.153/libdw/dwarf_aggregate_size.c b/src/libdw/dwarf_aggregate_size.c
index e7420141..e7420141 100644
--- a/0.153/libdw/dwarf_aggregate_size.c
+++ b/src/libdw/dwarf_aggregate_size.c
diff --git a/0.153/libdw/dwarf_arrayorder.c b/src/libdw/dwarf_arrayorder.c
index 4929fb3c..4929fb3c 100644
--- a/0.153/libdw/dwarf_arrayorder.c
+++ b/src/libdw/dwarf_arrayorder.c
diff --git a/0.153/libdw/dwarf_attr.c b/src/libdw/dwarf_attr.c
index d3b03244..d3b03244 100644
--- a/0.153/libdw/dwarf_attr.c
+++ b/src/libdw/dwarf_attr.c
diff --git a/0.153/libdw/dwarf_attr_integrate.c b/src/libdw/dwarf_attr_integrate.c
index ce062f5b..ce062f5b 100644
--- a/0.153/libdw/dwarf_attr_integrate.c
+++ b/src/libdw/dwarf_attr_integrate.c
diff --git a/0.153/libdw/dwarf_begin.c b/src/libdw/dwarf_begin.c
index 8a419147..8a419147 100644
--- a/0.153/libdw/dwarf_begin.c
+++ b/src/libdw/dwarf_begin.c
diff --git a/0.153/libdw/dwarf_begin_elf.c b/src/libdw/dwarf_begin_elf.c
index 9ec7d51f..9ec7d51f 100644
--- a/0.153/libdw/dwarf_begin_elf.c
+++ b/src/libdw/dwarf_begin_elf.c
diff --git a/0.153/libdw/dwarf_bitoffset.c b/src/libdw/dwarf_bitoffset.c
index 3ab14683..3ab14683 100644
--- a/0.153/libdw/dwarf_bitoffset.c
+++ b/src/libdw/dwarf_bitoffset.c
diff --git a/0.153/libdw/dwarf_bitsize.c b/src/libdw/dwarf_bitsize.c
index 67d97dc1..67d97dc1 100644
--- a/0.153/libdw/dwarf_bitsize.c
+++ b/src/libdw/dwarf_bitsize.c
diff --git a/0.153/libdw/dwarf_bytesize.c b/src/libdw/dwarf_bytesize.c
index 2f2e1985..2f2e1985 100644
--- a/0.153/libdw/dwarf_bytesize.c
+++ b/src/libdw/dwarf_bytesize.c
diff --git a/0.153/libdw/dwarf_cfi_addrframe.c b/src/libdw/dwarf_cfi_addrframe.c
index 79d0e125..79d0e125 100644
--- a/0.153/libdw/dwarf_cfi_addrframe.c
+++ b/src/libdw/dwarf_cfi_addrframe.c
diff --git a/0.153/libdw/dwarf_cfi_end.c b/src/libdw/dwarf_cfi_end.c
index 5591e2a9..5591e2a9 100644
--- a/0.153/libdw/dwarf_cfi_end.c
+++ b/src/libdw/dwarf_cfi_end.c
diff --git a/0.153/libdw/dwarf_child.c b/src/libdw/dwarf_child.c
index 0c2df004..0c2df004 100644
--- a/0.153/libdw/dwarf_child.c
+++ b/src/libdw/dwarf_child.c
diff --git a/0.153/libdw/dwarf_cuoffset.c b/src/libdw/dwarf_cuoffset.c
index 47653200..47653200 100644
--- a/0.153/libdw/dwarf_cuoffset.c
+++ b/src/libdw/dwarf_cuoffset.c
diff --git a/0.153/libdw/dwarf_decl_column.c b/src/libdw/dwarf_decl_column.c
index 11ba5d74..11ba5d74 100644
--- a/0.153/libdw/dwarf_decl_column.c
+++ b/src/libdw/dwarf_decl_column.c
diff --git a/0.153/libdw/dwarf_decl_file.c b/src/libdw/dwarf_decl_file.c
index c81e35b8..c81e35b8 100644
--- a/0.153/libdw/dwarf_decl_file.c
+++ b/src/libdw/dwarf_decl_file.c
diff --git a/0.153/libdw/dwarf_decl_line.c b/src/libdw/dwarf_decl_line.c
index ab64e510..ab64e510 100644
--- a/0.153/libdw/dwarf_decl_line.c
+++ b/src/libdw/dwarf_decl_line.c
diff --git a/0.153/libdw/dwarf_diecu.c b/src/libdw/dwarf_diecu.c
index cd98cf61..cd98cf61 100644
--- a/0.153/libdw/dwarf_diecu.c
+++ b/src/libdw/dwarf_diecu.c
diff --git a/0.153/libdw/dwarf_diename.c b/src/libdw/dwarf_diename.c
index 3b66d12e..3b66d12e 100644
--- a/0.153/libdw/dwarf_diename.c
+++ b/src/libdw/dwarf_diename.c
diff --git a/0.153/libdw/dwarf_dieoffset.c b/src/libdw/dwarf_dieoffset.c
index ac4a84c8..ac4a84c8 100644
--- a/0.153/libdw/dwarf_dieoffset.c
+++ b/src/libdw/dwarf_dieoffset.c
diff --git a/0.153/libdw/dwarf_end.c b/src/libdw/dwarf_end.c
index 1e733cae..1e733cae 100644
--- a/0.153/libdw/dwarf_end.c
+++ b/src/libdw/dwarf_end.c
diff --git a/0.153/libdw/dwarf_entry_breakpoints.c b/src/libdw/dwarf_entry_breakpoints.c
index 1e5c1b81..1e5c1b81 100644
--- a/0.153/libdw/dwarf_entry_breakpoints.c
+++ b/src/libdw/dwarf_entry_breakpoints.c
diff --git a/0.153/libdw/dwarf_entrypc.c b/src/libdw/dwarf_entrypc.c
index 1719be27..1719be27 100644
--- a/0.153/libdw/dwarf_entrypc.c
+++ b/src/libdw/dwarf_entrypc.c
diff --git a/0.153/libdw/dwarf_error.c b/src/libdw/dwarf_error.c
index a298a19d..a298a19d 100644
--- a/0.153/libdw/dwarf_error.c
+++ b/src/libdw/dwarf_error.c
diff --git a/0.153/libdw/dwarf_filesrc.c b/src/libdw/dwarf_filesrc.c
index b48340d4..b48340d4 100644
--- a/0.153/libdw/dwarf_filesrc.c
+++ b/src/libdw/dwarf_filesrc.c
diff --git a/0.153/libdw/dwarf_formaddr.c b/src/libdw/dwarf_formaddr.c
index a8c786ff..a8c786ff 100644
--- a/0.153/libdw/dwarf_formaddr.c
+++ b/src/libdw/dwarf_formaddr.c
diff --git a/0.153/libdw/dwarf_formblock.c b/src/libdw/dwarf_formblock.c
index 4eb815c4..4eb815c4 100644
--- a/0.153/libdw/dwarf_formblock.c
+++ b/src/libdw/dwarf_formblock.c
diff --git a/0.153/libdw/dwarf_formflag.c b/src/libdw/dwarf_formflag.c
index fb60c8e6..fb60c8e6 100644
--- a/0.153/libdw/dwarf_formflag.c
+++ b/src/libdw/dwarf_formflag.c
diff --git a/0.153/libdw/dwarf_formref.c b/src/libdw/dwarf_formref.c
index e4d35ae8..e4d35ae8 100644
--- a/0.153/libdw/dwarf_formref.c
+++ b/src/libdw/dwarf_formref.c
diff --git a/0.153/libdw/dwarf_formref_die.c b/src/libdw/dwarf_formref_die.c
index 3ec770d2..3ec770d2 100644
--- a/0.153/libdw/dwarf_formref_die.c
+++ b/src/libdw/dwarf_formref_die.c
diff --git a/0.153/libdw/dwarf_formsdata.c b/src/libdw/dwarf_formsdata.c
index ab7249d1..ab7249d1 100644
--- a/0.153/libdw/dwarf_formsdata.c
+++ b/src/libdw/dwarf_formsdata.c
diff --git a/0.153/libdw/dwarf_formstring.c b/src/libdw/dwarf_formstring.c
index 1dee9b2d..1dee9b2d 100644
--- a/0.153/libdw/dwarf_formstring.c
+++ b/src/libdw/dwarf_formstring.c
diff --git a/0.153/libdw/dwarf_formudata.c b/src/libdw/dwarf_formudata.c
index 07efbe0b..07efbe0b 100644
--- a/0.153/libdw/dwarf_formudata.c
+++ b/src/libdw/dwarf_formudata.c
diff --git a/0.153/libdw/dwarf_frame_cfa.c b/src/libdw/dwarf_frame_cfa.c
index 2f3268a8..2f3268a8 100644
--- a/0.153/libdw/dwarf_frame_cfa.c
+++ b/src/libdw/dwarf_frame_cfa.c
diff --git a/0.153/libdw/dwarf_frame_info.c b/src/libdw/dwarf_frame_info.c
index 4bdd8068..4bdd8068 100644
--- a/0.153/libdw/dwarf_frame_info.c
+++ b/src/libdw/dwarf_frame_info.c
diff --git a/0.153/libdw/dwarf_frame_register.c b/src/libdw/dwarf_frame_register.c
index ae0db020..ae0db020 100644
--- a/0.153/libdw/dwarf_frame_register.c
+++ b/src/libdw/dwarf_frame_register.c
diff --git a/0.153/libdw/dwarf_func_inline.c b/src/libdw/dwarf_func_inline.c
index 6018691a..6018691a 100644
--- a/0.153/libdw/dwarf_func_inline.c
+++ b/src/libdw/dwarf_func_inline.c
diff --git a/0.153/libdw/dwarf_getabbrev.c b/src/libdw/dwarf_getabbrev.c
index 07bf6dfc..07bf6dfc 100644
--- a/0.153/libdw/dwarf_getabbrev.c
+++ b/src/libdw/dwarf_getabbrev.c
diff --git a/0.153/libdw/dwarf_getabbrevattr.c b/src/libdw/dwarf_getabbrevattr.c
index 05da17c9..05da17c9 100644
--- a/0.153/libdw/dwarf_getabbrevattr.c
+++ b/src/libdw/dwarf_getabbrevattr.c
diff --git a/0.153/libdw/dwarf_getabbrevcode.c b/src/libdw/dwarf_getabbrevcode.c
index edf492d8..edf492d8 100644
--- a/0.153/libdw/dwarf_getabbrevcode.c
+++ b/src/libdw/dwarf_getabbrevcode.c
diff --git a/0.153/libdw/dwarf_getabbrevtag.c b/src/libdw/dwarf_getabbrevtag.c
index 4f1f72ca..4f1f72ca 100644
--- a/0.153/libdw/dwarf_getabbrevtag.c
+++ b/src/libdw/dwarf_getabbrevtag.c
diff --git a/0.153/libdw/dwarf_getarange_addr.c b/src/libdw/dwarf_getarange_addr.c
index 855c855b..855c855b 100644
--- a/0.153/libdw/dwarf_getarange_addr.c
+++ b/src/libdw/dwarf_getarange_addr.c
diff --git a/0.153/libdw/dwarf_getarangeinfo.c b/src/libdw/dwarf_getarangeinfo.c
index 7cefbf71..7cefbf71 100644
--- a/0.153/libdw/dwarf_getarangeinfo.c
+++ b/src/libdw/dwarf_getarangeinfo.c
diff --git a/0.153/libdw/dwarf_getaranges.c b/src/libdw/dwarf_getaranges.c
index f18d63d0..f18d63d0 100644
--- a/0.153/libdw/dwarf_getaranges.c
+++ b/src/libdw/dwarf_getaranges.c
diff --git a/0.153/libdw/dwarf_getattrcnt.c b/src/libdw/dwarf_getattrcnt.c
index f85adf0f..f85adf0f 100644
--- a/0.153/libdw/dwarf_getattrcnt.c
+++ b/src/libdw/dwarf_getattrcnt.c
diff --git a/0.153/libdw/dwarf_getattrs.c b/src/libdw/dwarf_getattrs.c
index 051dc25f..051dc25f 100644
--- a/0.153/libdw/dwarf_getattrs.c
+++ b/src/libdw/dwarf_getattrs.c
diff --git a/0.153/libdw/dwarf_getcfi.c b/src/libdw/dwarf_getcfi.c
index c935631e..c935631e 100644
--- a/0.153/libdw/dwarf_getcfi.c
+++ b/src/libdw/dwarf_getcfi.c
diff --git a/0.153/libdw/dwarf_getcfi_elf.c b/src/libdw/dwarf_getcfi_elf.c
index 64a2a885..64a2a885 100644
--- a/0.153/libdw/dwarf_getcfi_elf.c
+++ b/src/libdw/dwarf_getcfi_elf.c
diff --git a/0.153/libdw/dwarf_getelf.c b/src/libdw/dwarf_getelf.c
index daf3b9a7..daf3b9a7 100644
--- a/0.153/libdw/dwarf_getelf.c
+++ b/src/libdw/dwarf_getelf.c
diff --git a/0.153/libdw/dwarf_getfuncs.c b/src/libdw/dwarf_getfuncs.c
index c0352fbf..c0352fbf 100644
--- a/0.153/libdw/dwarf_getfuncs.c
+++ b/src/libdw/dwarf_getfuncs.c
diff --git a/0.153/libdw/dwarf_getlocation.c b/src/libdw/dwarf_getlocation.c
index f7a60f9f..f7a60f9f 100644
--- a/0.153/libdw/dwarf_getlocation.c
+++ b/src/libdw/dwarf_getlocation.c
diff --git a/0.153/libdw/dwarf_getlocation_implicit_pointer.c b/src/libdw/dwarf_getlocation_implicit_pointer.c
index 4d9f6b99..4d9f6b99 100644
--- a/0.153/libdw/dwarf_getlocation_implicit_pointer.c
+++ b/src/libdw/dwarf_getlocation_implicit_pointer.c
diff --git a/0.153/libdw/dwarf_getmacros.c b/src/libdw/dwarf_getmacros.c
index b9ec34b9..b9ec34b9 100644
--- a/0.153/libdw/dwarf_getmacros.c
+++ b/src/libdw/dwarf_getmacros.c
diff --git a/0.153/libdw/dwarf_getpubnames.c b/src/libdw/dwarf_getpubnames.c
index 5560a758..5560a758 100644
--- a/0.153/libdw/dwarf_getpubnames.c
+++ b/src/libdw/dwarf_getpubnames.c
diff --git a/0.153/libdw/dwarf_getscopes.c b/src/libdw/dwarf_getscopes.c
index 73431ba7..73431ba7 100644
--- a/0.153/libdw/dwarf_getscopes.c
+++ b/src/libdw/dwarf_getscopes.c
diff --git a/0.153/libdw/dwarf_getscopes_die.c b/src/libdw/dwarf_getscopes_die.c
index 07fb9b00..07fb9b00 100644
--- a/0.153/libdw/dwarf_getscopes_die.c
+++ b/src/libdw/dwarf_getscopes_die.c
diff --git a/0.153/libdw/dwarf_getscopevar.c b/src/libdw/dwarf_getscopevar.c
index 6ce214f5..6ce214f5 100644
--- a/0.153/libdw/dwarf_getscopevar.c
+++ b/src/libdw/dwarf_getscopevar.c
diff --git a/0.153/libdw/dwarf_getsrc_die.c b/src/libdw/dwarf_getsrc_die.c
index 96aa41fd..96aa41fd 100644
--- a/0.153/libdw/dwarf_getsrc_die.c
+++ b/src/libdw/dwarf_getsrc_die.c
diff --git a/0.153/libdw/dwarf_getsrc_file.c b/src/libdw/dwarf_getsrc_file.c
index bc612f6c..bc612f6c 100644
--- a/0.153/libdw/dwarf_getsrc_file.c
+++ b/src/libdw/dwarf_getsrc_file.c
diff --git a/0.153/libdw/dwarf_getsrcdirs.c b/src/libdw/dwarf_getsrcdirs.c
index 74786dd0..74786dd0 100644
--- a/0.153/libdw/dwarf_getsrcdirs.c
+++ b/src/libdw/dwarf_getsrcdirs.c
diff --git a/0.153/libdw/dwarf_getsrcfiles.c b/src/libdw/dwarf_getsrcfiles.c
index ee4de520..ee4de520 100644
--- a/0.153/libdw/dwarf_getsrcfiles.c
+++ b/src/libdw/dwarf_getsrcfiles.c
diff --git a/0.153/libdw/dwarf_getsrclines.c b/src/libdw/dwarf_getsrclines.c
index 6840b2b5..6840b2b5 100644
--- a/0.153/libdw/dwarf_getsrclines.c
+++ b/src/libdw/dwarf_getsrclines.c
diff --git a/0.153/libdw/dwarf_getstring.c b/src/libdw/dwarf_getstring.c
index d5e7abfd..d5e7abfd 100644
--- a/0.153/libdw/dwarf_getstring.c
+++ b/src/libdw/dwarf_getstring.c
diff --git a/0.153/libdw/dwarf_hasattr.c b/src/libdw/dwarf_hasattr.c
index b1c4292a..b1c4292a 100644
--- a/0.153/libdw/dwarf_hasattr.c
+++ b/src/libdw/dwarf_hasattr.c
diff --git a/0.153/libdw/dwarf_hasattr_integrate.c b/src/libdw/dwarf_hasattr_integrate.c
index 806742d6..806742d6 100644
--- a/0.153/libdw/dwarf_hasattr_integrate.c
+++ b/src/libdw/dwarf_hasattr_integrate.c
diff --git a/0.153/libdw/dwarf_haschildren.c b/src/libdw/dwarf_haschildren.c
index d9a47ad2..d9a47ad2 100644
--- a/0.153/libdw/dwarf_haschildren.c
+++ b/src/libdw/dwarf_haschildren.c
diff --git a/0.153/libdw/dwarf_hasform.c b/src/libdw/dwarf_hasform.c
index 66e0e746..66e0e746 100644
--- a/0.153/libdw/dwarf_hasform.c
+++ b/src/libdw/dwarf_hasform.c
diff --git a/0.153/libdw/dwarf_haspc.c b/src/libdw/dwarf_haspc.c
index 58b87b65..58b87b65 100644
--- a/0.153/libdw/dwarf_haspc.c
+++ b/src/libdw/dwarf_haspc.c
diff --git a/0.153/libdw/dwarf_highpc.c b/src/libdw/dwarf_highpc.c
index c88e0721..c88e0721 100644
--- a/0.153/libdw/dwarf_highpc.c
+++ b/src/libdw/dwarf_highpc.c
diff --git a/0.153/libdw/dwarf_lineaddr.c b/src/libdw/dwarf_lineaddr.c
index c59dd5d5..c59dd5d5 100644
--- a/0.153/libdw/dwarf_lineaddr.c
+++ b/src/libdw/dwarf_lineaddr.c
diff --git a/0.153/libdw/dwarf_linebeginstatement.c b/src/libdw/dwarf_linebeginstatement.c
index 2a99e675..2a99e675 100644
--- a/0.153/libdw/dwarf_linebeginstatement.c
+++ b/src/libdw/dwarf_linebeginstatement.c
diff --git a/0.153/libdw/dwarf_lineblock.c b/src/libdw/dwarf_lineblock.c
index 5ad2bb57..5ad2bb57 100644
--- a/0.153/libdw/dwarf_lineblock.c
+++ b/src/libdw/dwarf_lineblock.c
diff --git a/0.153/libdw/dwarf_linecol.c b/src/libdw/dwarf_linecol.c
index 8a1228c2..8a1228c2 100644
--- a/0.153/libdw/dwarf_linecol.c
+++ b/src/libdw/dwarf_linecol.c
diff --git a/0.153/libdw/dwarf_linediscriminator.c b/src/libdw/dwarf_linediscriminator.c
index d17a99f2..d17a99f2 100644
--- a/0.153/libdw/dwarf_linediscriminator.c
+++ b/src/libdw/dwarf_linediscriminator.c
diff --git a/0.153/libdw/dwarf_lineendsequence.c b/src/libdw/dwarf_lineendsequence.c
index cea86aac..cea86aac 100644
--- a/0.153/libdw/dwarf_lineendsequence.c
+++ b/src/libdw/dwarf_lineendsequence.c
diff --git a/0.153/libdw/dwarf_lineepiloguebegin.c b/src/libdw/dwarf_lineepiloguebegin.c
index 9d806117..9d806117 100644
--- a/0.153/libdw/dwarf_lineepiloguebegin.c
+++ b/src/libdw/dwarf_lineepiloguebegin.c
diff --git a/0.153/libdw/dwarf_lineisa.c b/src/libdw/dwarf_lineisa.c
index 064761e0..064761e0 100644
--- a/0.153/libdw/dwarf_lineisa.c
+++ b/src/libdw/dwarf_lineisa.c
diff --git a/0.153/libdw/dwarf_lineno.c b/src/libdw/dwarf_lineno.c
index 98840b15..98840b15 100644
--- a/0.153/libdw/dwarf_lineno.c
+++ b/src/libdw/dwarf_lineno.c
diff --git a/0.153/libdw/dwarf_lineop_index.c b/src/libdw/dwarf_lineop_index.c
index 3b433104..3b433104 100644
--- a/0.153/libdw/dwarf_lineop_index.c
+++ b/src/libdw/dwarf_lineop_index.c
diff --git a/0.153/libdw/dwarf_lineprologueend.c b/src/libdw/dwarf_lineprologueend.c
index c7a05572..c7a05572 100644
--- a/0.153/libdw/dwarf_lineprologueend.c
+++ b/src/libdw/dwarf_lineprologueend.c
diff --git a/0.153/libdw/dwarf_linesrc.c b/src/libdw/dwarf_linesrc.c
index 6ecce93f..6ecce93f 100644
--- a/0.153/libdw/dwarf_linesrc.c
+++ b/src/libdw/dwarf_linesrc.c
diff --git a/0.153/libdw/dwarf_lowpc.c b/src/libdw/dwarf_lowpc.c
index 97ece031..97ece031 100644
--- a/0.153/libdw/dwarf_lowpc.c
+++ b/src/libdw/dwarf_lowpc.c
diff --git a/0.153/libdw/dwarf_macro_opcode.c b/src/libdw/dwarf_macro_opcode.c
index c40ebc7c..c40ebc7c 100644
--- a/0.153/libdw/dwarf_macro_opcode.c
+++ b/src/libdw/dwarf_macro_opcode.c
diff --git a/0.153/libdw/dwarf_macro_param1.c b/src/libdw/dwarf_macro_param1.c
index 409865f5..409865f5 100644
--- a/0.153/libdw/dwarf_macro_param1.c
+++ b/src/libdw/dwarf_macro_param1.c
diff --git a/0.153/libdw/dwarf_macro_param2.c b/src/libdw/dwarf_macro_param2.c
index c1eff939..c1eff939 100644
--- a/0.153/libdw/dwarf_macro_param2.c
+++ b/src/libdw/dwarf_macro_param2.c
diff --git a/0.153/libdw/dwarf_next_cfi.c b/src/libdw/dwarf_next_cfi.c
index 0e90457d..0e90457d 100644
--- a/0.153/libdw/dwarf_next_cfi.c
+++ b/src/libdw/dwarf_next_cfi.c
diff --git a/0.153/libdw/dwarf_nextcu.c b/src/libdw/dwarf_nextcu.c
index 2e8f4d79..2e8f4d79 100644
--- a/0.153/libdw/dwarf_nextcu.c
+++ b/src/libdw/dwarf_nextcu.c
diff --git a/0.153/libdw/dwarf_offabbrev.c b/src/libdw/dwarf_offabbrev.c
index 2cac2794..2cac2794 100644
--- a/0.153/libdw/dwarf_offabbrev.c
+++ b/src/libdw/dwarf_offabbrev.c
diff --git a/0.153/libdw/dwarf_offdie.c b/src/libdw/dwarf_offdie.c
index 4c650cfd..4c650cfd 100644
--- a/0.153/libdw/dwarf_offdie.c
+++ b/src/libdw/dwarf_offdie.c
diff --git a/0.153/libdw/dwarf_onearange.c b/src/libdw/dwarf_onearange.c
index 5a9b9f39..5a9b9f39 100644
--- a/0.153/libdw/dwarf_onearange.c
+++ b/src/libdw/dwarf_onearange.c
diff --git a/0.153/libdw/dwarf_onesrcline.c b/src/libdw/dwarf_onesrcline.c
index 3e716304..3e716304 100644
--- a/0.153/libdw/dwarf_onesrcline.c
+++ b/src/libdw/dwarf_onesrcline.c
diff --git a/0.153/libdw/dwarf_ranges.c b/src/libdw/dwarf_ranges.c
index 50fb6ba2..50fb6ba2 100644
--- a/0.153/libdw/dwarf_ranges.c
+++ b/src/libdw/dwarf_ranges.c
diff --git a/0.153/libdw/dwarf_siblingof.c b/src/libdw/dwarf_siblingof.c
index f8e54c18..f8e54c18 100644
--- a/0.153/libdw/dwarf_siblingof.c
+++ b/src/libdw/dwarf_siblingof.c
diff --git a/0.153/libdw/dwarf_sig8_hash.c b/src/libdw/dwarf_sig8_hash.c
index 53c07eac..53c07eac 100644
--- a/0.153/libdw/dwarf_sig8_hash.c
+++ b/src/libdw/dwarf_sig8_hash.c
diff --git a/0.153/libdw/dwarf_sig8_hash.h b/src/libdw/dwarf_sig8_hash.h
index 0d8932b5..0d8932b5 100644
--- a/0.153/libdw/dwarf_sig8_hash.h
+++ b/src/libdw/dwarf_sig8_hash.h
diff --git a/0.153/libdw/dwarf_srclang.c b/src/libdw/dwarf_srclang.c
index 305ffcd0..305ffcd0 100644
--- a/0.153/libdw/dwarf_srclang.c
+++ b/src/libdw/dwarf_srclang.c
diff --git a/0.153/libdw/dwarf_tag.c b/src/libdw/dwarf_tag.c
index fa8b384c..fa8b384c 100644
--- a/0.153/libdw/dwarf_tag.c
+++ b/src/libdw/dwarf_tag.c
diff --git a/0.153/libdw/dwarf_whatattr.c b/src/libdw/dwarf_whatattr.c
index 9b8bddf1..9b8bddf1 100644
--- a/0.153/libdw/dwarf_whatattr.c
+++ b/src/libdw/dwarf_whatattr.c
diff --git a/0.153/libdw/dwarf_whatform.c b/src/libdw/dwarf_whatform.c
index 8a9076b8..8a9076b8 100644
--- a/0.153/libdw/dwarf_whatform.c
+++ b/src/libdw/dwarf_whatform.c
diff --git a/0.153/libdw/encoded-value.h b/src/libdw/encoded-value.h
index e118a1c4..e118a1c4 100644
--- a/0.153/libdw/encoded-value.h
+++ b/src/libdw/encoded-value.h
diff --git a/0.153/libdw/fde.c b/src/libdw/fde.c
index 5685252b..5685252b 100644
--- a/0.153/libdw/fde.c
+++ b/src/libdw/fde.c
diff --git a/0.153/libdw/frame-cache.c b/src/libdw/frame-cache.c
index f4876638..f4876638 100644
--- a/0.153/libdw/frame-cache.c
+++ b/src/libdw/frame-cache.c
diff --git a/0.153/libdw/libdw.h b/src/libdw/libdw.h
index e001b7a4..e001b7a4 100644
--- a/0.153/libdw/libdw.h
+++ b/src/libdw/libdw.h
diff --git a/0.153/libdw/libdw.map b/src/libdw/libdw.map
index 1f71d03b..1f71d03b 100644
--- a/0.153/libdw/libdw.map
+++ b/src/libdw/libdw.map
diff --git a/0.153/libdw/libdwP.h b/src/libdw/libdwP.h
index b84bf02c..b84bf02c 100644
--- a/0.153/libdw/libdwP.h
+++ b/src/libdw/libdwP.h
diff --git a/0.153/libdw/libdw_alloc.c b/src/libdw/libdw_alloc.c
index 917cb309..917cb309 100644
--- a/0.153/libdw/libdw_alloc.c
+++ b/src/libdw/libdw_alloc.c
diff --git a/0.153/libdw/libdw_findcu.c b/src/libdw/libdw_findcu.c
index 8e5f9e9b..8e5f9e9b 100644
--- a/0.153/libdw/libdw_findcu.c
+++ b/src/libdw/libdw_findcu.c
diff --git a/0.153/libdw/libdw_form.c b/src/libdw/libdw_form.c
index 219dd793..219dd793 100644
--- a/0.153/libdw/libdw_form.c
+++ b/src/libdw/libdw_form.c
diff --git a/0.153/libdw/libdw_visit_scopes.c b/src/libdw/libdw_visit_scopes.c
index 9c7c3789..9c7c3789 100644
--- a/0.153/libdw/libdw_visit_scopes.c
+++ b/src/libdw/libdw_visit_scopes.c
diff --git a/0.153/libdw/memory-access.c b/src/libdw/memory-access.c
index c9a0ca76..c9a0ca76 100644
--- a/0.153/libdw/memory-access.c
+++ b/src/libdw/memory-access.c
diff --git a/0.153/libdw/memory-access.h b/src/libdw/memory-access.h
index b7799e92..b7799e92 100644
--- a/0.153/libdw/memory-access.h
+++ b/src/libdw/memory-access.h
diff --git a/0.153/libdwfl/Android.mk b/src/libdwfl/Android.mk
index ca2983fa..dc6a14ad 100755
--- a/0.153/libdwfl/Android.mk
+++ b/src/libdwfl/Android.mk
@@ -72,6 +72,8 @@ LOCAL_CFLAGS += -Wno-unused-but-set-variable
 
 LOCAL_MODULE:= libdwfl
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif # linux
@@ -109,4 +111,6 @@ LOCAL_CFLAGS += -Wno-unused-but-set-variable
 
 LOCAL_MODULE:= libdwfl
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/0.153/libdwfl/ChangeLog b/src/libdwfl/ChangeLog
index 87a05550..87a05550 100644
--- a/0.153/libdwfl/ChangeLog
+++ b/src/libdwfl/ChangeLog
diff --git a/0.153/libdwfl/Makefile.am b/src/libdwfl/Makefile.am
index 65b38965..65b38965 100644
--- a/0.153/libdwfl/Makefile.am
+++ b/src/libdwfl/Makefile.am
diff --git a/0.153/libdwfl/Makefile.in b/src/libdwfl/Makefile.in
index b22e1ad1..b22e1ad1 100644
--- a/0.153/libdwfl/Makefile.in
+++ b/src/libdwfl/Makefile.in
diff --git a/0.153/libdwfl/argp-std.c b/src/libdwfl/argp-std.c
index e598c6ef..e598c6ef 100644
--- a/0.153/libdwfl/argp-std.c
+++ b/src/libdwfl/argp-std.c
diff --git a/0.153/libdwfl/bzip2.c b/src/libdwfl/bzip2.c
index 8ad4ee5a..8ad4ee5a 100644
--- a/0.153/libdwfl/bzip2.c
+++ b/src/libdwfl/bzip2.c
diff --git a/0.153/libdwfl/core-file.c b/src/libdwfl/core-file.c
index 1b556dde..1b556dde 100644
--- a/0.153/libdwfl/core-file.c
+++ b/src/libdwfl/core-file.c
diff --git a/0.153/libdwfl/cu.c b/src/libdwfl/cu.c
index 515aff3b..515aff3b 100644
--- a/0.153/libdwfl/cu.c
+++ b/src/libdwfl/cu.c
diff --git a/0.153/libdwfl/derelocate.c b/src/libdwfl/derelocate.c
index b8c8dd73..b8c8dd73 100644
--- a/0.153/libdwfl/derelocate.c
+++ b/src/libdwfl/derelocate.c
diff --git a/0.153/libdwfl/dwfl_addrdie.c b/src/libdwfl/dwfl_addrdie.c
index 20c15783..20c15783 100644
--- a/0.153/libdwfl/dwfl_addrdie.c
+++ b/src/libdwfl/dwfl_addrdie.c
diff --git a/0.153/libdwfl/dwfl_addrdwarf.c b/src/libdwfl/dwfl_addrdwarf.c
index 365c69c5..365c69c5 100644
--- a/0.153/libdwfl/dwfl_addrdwarf.c
+++ b/src/libdwfl/dwfl_addrdwarf.c
diff --git a/0.153/libdwfl/dwfl_addrmodule.c b/src/libdwfl/dwfl_addrmodule.c
index 64559436..64559436 100644
--- a/0.153/libdwfl/dwfl_addrmodule.c
+++ b/src/libdwfl/dwfl_addrmodule.c
diff --git a/0.153/libdwfl/dwfl_begin.c b/src/libdwfl/dwfl_begin.c
index d388ee00..d388ee00 100644
--- a/0.153/libdwfl/dwfl_begin.c
+++ b/src/libdwfl/dwfl_begin.c
diff --git a/0.153/libdwfl/dwfl_build_id_find_debuginfo.c b/src/libdwfl/dwfl_build_id_find_debuginfo.c
index e51b65b1..e51b65b1 100644
--- a/0.153/libdwfl/dwfl_build_id_find_debuginfo.c
+++ b/src/libdwfl/dwfl_build_id_find_debuginfo.c
diff --git a/0.153/libdwfl/dwfl_build_id_find_elf.c b/src/libdwfl/dwfl_build_id_find_elf.c
index 12ce1b58..12ce1b58 100644
--- a/0.153/libdwfl/dwfl_build_id_find_elf.c
+++ b/src/libdwfl/dwfl_build_id_find_elf.c
diff --git a/0.153/libdwfl/dwfl_cumodule.c b/src/libdwfl/dwfl_cumodule.c
index 787c098f..787c098f 100644
--- a/0.153/libdwfl/dwfl_cumodule.c
+++ b/src/libdwfl/dwfl_cumodule.c
diff --git a/0.153/libdwfl/dwfl_dwarf_line.c b/src/libdwfl/dwfl_dwarf_line.c
index eb085e4a..eb085e4a 100644
--- a/0.153/libdwfl/dwfl_dwarf_line.c
+++ b/src/libdwfl/dwfl_dwarf_line.c
diff --git a/0.153/libdwfl/dwfl_end.c b/src/libdwfl/dwfl_end.c
index 429abb13..429abb13 100644
--- a/0.153/libdwfl/dwfl_end.c
+++ b/src/libdwfl/dwfl_end.c
diff --git a/0.153/libdwfl/dwfl_error.c b/src/libdwfl/dwfl_error.c
index 966c9901..966c9901 100644
--- a/0.153/libdwfl/dwfl_error.c
+++ b/src/libdwfl/dwfl_error.c
diff --git a/0.153/libdwfl/dwfl_getdwarf.c b/src/libdwfl/dwfl_getdwarf.c
index 0a0656f7..0a0656f7 100644
--- a/0.153/libdwfl/dwfl_getdwarf.c
+++ b/src/libdwfl/dwfl_getdwarf.c
diff --git a/0.153/libdwfl/dwfl_getmodules.c b/src/libdwfl/dwfl_getmodules.c
index 7c6ab971..7c6ab971 100644
--- a/0.153/libdwfl/dwfl_getmodules.c
+++ b/src/libdwfl/dwfl_getmodules.c
diff --git a/0.153/libdwfl/dwfl_getsrc.c b/src/libdwfl/dwfl_getsrc.c
index 1cc16953..1cc16953 100644
--- a/0.153/libdwfl/dwfl_getsrc.c
+++ b/src/libdwfl/dwfl_getsrc.c
diff --git a/0.153/libdwfl/dwfl_getsrclines.c b/src/libdwfl/dwfl_getsrclines.c
index 790481fd..790481fd 100644
--- a/0.153/libdwfl/dwfl_getsrclines.c
+++ b/src/libdwfl/dwfl_getsrclines.c
diff --git a/0.153/libdwfl/dwfl_line_comp_dir.c b/src/libdwfl/dwfl_line_comp_dir.c
index a755524d..a755524d 100644
--- a/0.153/libdwfl/dwfl_line_comp_dir.c
+++ b/src/libdwfl/dwfl_line_comp_dir.c
diff --git a/0.153/libdwfl/dwfl_linecu.c b/src/libdwfl/dwfl_linecu.c
index 34f5bb10..34f5bb10 100644
--- a/0.153/libdwfl/dwfl_linecu.c
+++ b/src/libdwfl/dwfl_linecu.c
diff --git a/0.153/libdwfl/dwfl_lineinfo.c b/src/libdwfl/dwfl_lineinfo.c
index 6049de84..6049de84 100644
--- a/0.153/libdwfl/dwfl_lineinfo.c
+++ b/src/libdwfl/dwfl_lineinfo.c
diff --git a/0.153/libdwfl/dwfl_linemodule.c b/src/libdwfl/dwfl_linemodule.c
index fb98f837..fb98f837 100644
--- a/0.153/libdwfl/dwfl_linemodule.c
+++ b/src/libdwfl/dwfl_linemodule.c
diff --git a/0.153/libdwfl/dwfl_module.c b/src/libdwfl/dwfl_module.c
index d7e54138..d7e54138 100644
--- a/0.153/libdwfl/dwfl_module.c
+++ b/src/libdwfl/dwfl_module.c
diff --git a/0.153/libdwfl/dwfl_module_addrdie.c b/src/libdwfl/dwfl_module_addrdie.c
index 2733196f..2733196f 100644
--- a/0.153/libdwfl/dwfl_module_addrdie.c
+++ b/src/libdwfl/dwfl_module_addrdie.c
diff --git a/0.153/libdwfl/dwfl_module_addrname.c b/src/libdwfl/dwfl_module_addrname.c
index 7d365fe2..7d365fe2 100644
--- a/0.153/libdwfl/dwfl_module_addrname.c
+++ b/src/libdwfl/dwfl_module_addrname.c
diff --git a/0.153/libdwfl/dwfl_module_addrsym.c b/src/libdwfl/dwfl_module_addrsym.c
index 9ced0cfb..9ced0cfb 100644
--- a/0.153/libdwfl/dwfl_module_addrsym.c
+++ b/src/libdwfl/dwfl_module_addrsym.c
diff --git a/0.153/libdwfl/dwfl_module_build_id.c b/src/libdwfl/dwfl_module_build_id.c
index f9888660..f9888660 100644
--- a/0.153/libdwfl/dwfl_module_build_id.c
+++ b/src/libdwfl/dwfl_module_build_id.c
diff --git a/0.153/libdwfl/dwfl_module_dwarf_cfi.c b/src/libdwfl/dwfl_module_dwarf_cfi.c
index 96e60fbf..96e60fbf 100644
--- a/0.153/libdwfl/dwfl_module_dwarf_cfi.c
+++ b/src/libdwfl/dwfl_module_dwarf_cfi.c
diff --git a/0.153/libdwfl/dwfl_module_eh_cfi.c b/src/libdwfl/dwfl_module_eh_cfi.c
index 79c8279c..79c8279c 100644
--- a/0.153/libdwfl/dwfl_module_eh_cfi.c
+++ b/src/libdwfl/dwfl_module_eh_cfi.c
diff --git a/0.153/libdwfl/dwfl_module_getdwarf.c b/src/libdwfl/dwfl_module_getdwarf.c
index 14fcd550..14fcd550 100644
--- a/0.153/libdwfl/dwfl_module_getdwarf.c
+++ b/src/libdwfl/dwfl_module_getdwarf.c
diff --git a/0.153/libdwfl/dwfl_module_getelf.c b/src/libdwfl/dwfl_module_getelf.c
index b4e4a2b7..b4e4a2b7 100644
--- a/0.153/libdwfl/dwfl_module_getelf.c
+++ b/src/libdwfl/dwfl_module_getelf.c
diff --git a/0.153/libdwfl/dwfl_module_getsrc.c b/src/libdwfl/dwfl_module_getsrc.c
index be03055e..be03055e 100644
--- a/0.153/libdwfl/dwfl_module_getsrc.c
+++ b/src/libdwfl/dwfl_module_getsrc.c
diff --git a/0.153/libdwfl/dwfl_module_getsrc_file.c b/src/libdwfl/dwfl_module_getsrc_file.c
index 9d0c786b..9d0c786b 100644
--- a/0.153/libdwfl/dwfl_module_getsrc_file.c
+++ b/src/libdwfl/dwfl_module_getsrc_file.c
diff --git a/0.153/libdwfl/dwfl_module_getsym.c b/src/libdwfl/dwfl_module_getsym.c
index 6bc063bb..6bc063bb 100644
--- a/0.153/libdwfl/dwfl_module_getsym.c
+++ b/src/libdwfl/dwfl_module_getsym.c
diff --git a/0.153/libdwfl/dwfl_module_info.c b/src/libdwfl/dwfl_module_info.c
index bfde6fc1..bfde6fc1 100644
--- a/0.153/libdwfl/dwfl_module_info.c
+++ b/src/libdwfl/dwfl_module_info.c
diff --git a/0.153/libdwfl/dwfl_module_nextcu.c b/src/libdwfl/dwfl_module_nextcu.c
index 1b37d299..1b37d299 100644
--- a/0.153/libdwfl/dwfl_module_nextcu.c
+++ b/src/libdwfl/dwfl_module_nextcu.c
diff --git a/0.153/libdwfl/dwfl_module_register_names.c b/src/libdwfl/dwfl_module_register_names.c
index 79a874a8..79a874a8 100644
--- a/0.153/libdwfl/dwfl_module_register_names.c
+++ b/src/libdwfl/dwfl_module_register_names.c
diff --git a/0.153/libdwfl/dwfl_module_report_build_id.c b/src/libdwfl/dwfl_module_report_build_id.c
index 9a1b14f7..9a1b14f7 100644
--- a/0.153/libdwfl/dwfl_module_report_build_id.c
+++ b/src/libdwfl/dwfl_module_report_build_id.c
diff --git a/0.153/libdwfl/dwfl_module_return_value_location.c b/src/libdwfl/dwfl_module_return_value_location.c
index 3d5154e2..3d5154e2 100644
--- a/0.153/libdwfl/dwfl_module_return_value_location.c
+++ b/src/libdwfl/dwfl_module_return_value_location.c
diff --git a/0.153/libdwfl/dwfl_nextcu.c b/src/libdwfl/dwfl_nextcu.c
index 90862d20..90862d20 100644
--- a/0.153/libdwfl/dwfl_nextcu.c
+++ b/src/libdwfl/dwfl_nextcu.c
diff --git a/0.153/libdwfl/dwfl_onesrcline.c b/src/libdwfl/dwfl_onesrcline.c
index 558d2408..558d2408 100644
--- a/0.153/libdwfl/dwfl_onesrcline.c
+++ b/src/libdwfl/dwfl_onesrcline.c
diff --git a/0.153/libdwfl/dwfl_report_elf.c b/src/libdwfl/dwfl_report_elf.c
index 4c4132b1..4c4132b1 100644
--- a/0.153/libdwfl/dwfl_report_elf.c
+++ b/src/libdwfl/dwfl_report_elf.c
diff --git a/0.153/libdwfl/dwfl_segment_report_module.c b/src/libdwfl/dwfl_segment_report_module.c
index 012a0fde..012a0fde 100644
--- a/0.153/libdwfl/dwfl_segment_report_module.c
+++ b/src/libdwfl/dwfl_segment_report_module.c
diff --git a/0.153/libdwfl/dwfl_validate_address.c b/src/libdwfl/dwfl_validate_address.c
index 81073762..81073762 100644
--- a/0.153/libdwfl/dwfl_validate_address.c
+++ b/src/libdwfl/dwfl_validate_address.c
diff --git a/0.153/libdwfl/dwfl_version.c b/src/libdwfl/dwfl_version.c
index 9c7074c5..9c7074c5 100644
--- a/0.153/libdwfl/dwfl_version.c
+++ b/src/libdwfl/dwfl_version.c
diff --git a/0.153/libdwfl/elf-from-memory.c b/src/libdwfl/elf-from-memory.c
index 0fb5f8a3..0fb5f8a3 100644
--- a/0.153/libdwfl/elf-from-memory.c
+++ b/src/libdwfl/elf-from-memory.c
diff --git a/0.153/libdwfl/find-debuginfo.c b/src/libdwfl/find-debuginfo.c
index 12cfe636..12cfe636 100644
--- a/0.153/libdwfl/find-debuginfo.c
+++ b/src/libdwfl/find-debuginfo.c
diff --git a/0.153/libdwfl/gzip.c b/src/libdwfl/gzip.c
index 5604d490..5604d490 100644
--- a/0.153/libdwfl/gzip.c
+++ b/src/libdwfl/gzip.c
diff --git a/0.153/libdwfl/image-header.c b/src/libdwfl/image-header.c
index c36d10c1..c36d10c1 100644
--- a/0.153/libdwfl/image-header.c
+++ b/src/libdwfl/image-header.c
diff --git a/0.153/libdwfl/libdwfl.h b/src/libdwfl/libdwfl.h
index 4ea2796c..4ea2796c 100644
--- a/0.153/libdwfl/libdwfl.h
+++ b/src/libdwfl/libdwfl.h
diff --git a/0.153/libdwfl/libdwflP.h b/src/libdwfl/libdwflP.h
index bca82d2e..bca82d2e 100644
--- a/0.153/libdwfl/libdwflP.h
+++ b/src/libdwfl/libdwflP.h
diff --git a/0.153/libdwfl/libdwfl_crc32.c b/src/libdwfl/libdwfl_crc32.c
index 0fa23789..0fa23789 100644
--- a/0.153/libdwfl/libdwfl_crc32.c
+++ b/src/libdwfl/libdwfl_crc32.c
diff --git a/0.153/libdwfl/libdwfl_crc32_file.c b/src/libdwfl/libdwfl_crc32_file.c
index ca154be3..ca154be3 100644
--- a/0.153/libdwfl/libdwfl_crc32_file.c
+++ b/src/libdwfl/libdwfl_crc32_file.c
diff --git a/0.153/libdwfl/lines.c b/src/libdwfl/lines.c
index ed4267fc..ed4267fc 100644
--- a/0.153/libdwfl/lines.c
+++ b/src/libdwfl/lines.c
diff --git a/0.153/libdwfl/link_map.c b/src/libdwfl/link_map.c
index 05839b3a..05839b3a 100644
--- a/0.153/libdwfl/link_map.c
+++ b/src/libdwfl/link_map.c
diff --git a/0.153/libdwfl/linux-kernel-modules.c b/src/libdwfl/linux-kernel-modules.c
index e2392722..e2392722 100644
--- a/0.153/libdwfl/linux-kernel-modules.c
+++ b/src/libdwfl/linux-kernel-modules.c
diff --git a/0.153/libdwfl/linux-proc-maps.c b/src/libdwfl/linux-proc-maps.c
index 8504a5f3..8504a5f3 100644
--- a/0.153/libdwfl/linux-proc-maps.c
+++ b/src/libdwfl/linux-proc-maps.c
diff --git a/0.153/libdwfl/lzma.c b/src/libdwfl/lzma.c
index 3edfdc22..3edfdc22 100644
--- a/0.153/libdwfl/lzma.c
+++ b/src/libdwfl/lzma.c
diff --git a/0.153/libdwfl/offline.c b/src/libdwfl/offline.c
index 34aa9f84..34aa9f84 100644
--- a/0.153/libdwfl/offline.c
+++ b/src/libdwfl/offline.c
diff --git a/0.153/libdwfl/open.c b/src/libdwfl/open.c
index 397af358..397af358 100644
--- a/0.153/libdwfl/open.c
+++ b/src/libdwfl/open.c
diff --git a/0.153/libdwfl/relocate.c b/src/libdwfl/relocate.c
index 95206f47..95206f47 100644
--- a/0.153/libdwfl/relocate.c
+++ b/src/libdwfl/relocate.c
diff --git a/0.153/libdwfl/segment.c b/src/libdwfl/segment.c
index 9d78c87f..9d78c87f 100644
--- a/0.153/libdwfl/segment.c
+++ b/src/libdwfl/segment.c
diff --git a/0.153/libebl/Android.mk b/src/libebl/Android.mk
index 440d328c..2b94a37d 100755
--- a/0.153/libebl/Android.mk
+++ b/src/libebl/Android.mk
@@ -87,6 +87,8 @@ LOCAL_CLANG := false
 
 LOCAL_MODULE:= libebl
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif # linux
@@ -118,4 +120,6 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -Werror
 
 LOCAL_MODULE:= libebl
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/0.153/libebl/ChangeLog b/src/libebl/ChangeLog
index ac2160de..ac2160de 100644
--- a/0.153/libebl/ChangeLog
+++ b/src/libebl/ChangeLog
diff --git a/0.153/libebl/Makefile.am b/src/libebl/Makefile.am
index ced5668b..ced5668b 100644
--- a/0.153/libebl/Makefile.am
+++ b/src/libebl/Makefile.am
diff --git a/0.153/libebl/Makefile.in b/src/libebl/Makefile.in
index 40edc5aa..40edc5aa 100644
--- a/0.153/libebl/Makefile.in
+++ b/src/libebl/Makefile.in
diff --git a/0.153/libebl/ebl-hooks.h b/src/libebl/ebl-hooks.h
index a04b3db0..a04b3db0 100644
--- a/0.153/libebl/ebl-hooks.h
+++ b/src/libebl/ebl-hooks.h
diff --git a/0.153/libebl/ebl_check_special_section.c b/src/libebl/ebl_check_special_section.c
index d1f3c6e3..d1f3c6e3 100644
--- a/0.153/libebl/ebl_check_special_section.c
+++ b/src/libebl/ebl_check_special_section.c
diff --git a/0.153/libebl/ebl_check_special_symbol.c b/src/libebl/ebl_check_special_symbol.c
index 875ed1ca..875ed1ca 100644
--- a/0.153/libebl/ebl_check_special_symbol.c
+++ b/src/libebl/ebl_check_special_symbol.c
diff --git a/0.153/libebl/ebl_syscall_abi.c b/src/libebl/ebl_syscall_abi.c
index 2d9a26b6..2d9a26b6 100644
--- a/0.153/libebl/ebl_syscall_abi.c
+++ b/src/libebl/ebl_syscall_abi.c
diff --git a/0.153/libebl/eblabicfi.c b/src/libebl/eblabicfi.c
index 221e83fc..221e83fc 100644
--- a/0.153/libebl/eblabicfi.c
+++ b/src/libebl/eblabicfi.c
diff --git a/0.153/libebl/eblauxvinfo.c b/src/libebl/eblauxvinfo.c
index 6e02403f..6e02403f 100644
--- a/0.153/libebl/eblauxvinfo.c
+++ b/src/libebl/eblauxvinfo.c
diff --git a/0.153/libebl/eblbackendname.c b/src/libebl/eblbackendname.c
index daec8805..daec8805 100644
--- a/0.153/libebl/eblbackendname.c
+++ b/src/libebl/eblbackendname.c
diff --git a/0.153/libebl/eblbsspltp.c b/src/libebl/eblbsspltp.c
index 14b6f099..14b6f099 100644
--- a/0.153/libebl/eblbsspltp.c
+++ b/src/libebl/eblbsspltp.c
diff --git a/0.153/libebl/eblcheckobjattr.c b/src/libebl/eblcheckobjattr.c
index fe75de74..fe75de74 100644
--- a/0.153/libebl/eblcheckobjattr.c
+++ b/src/libebl/eblcheckobjattr.c
diff --git a/0.153/libebl/eblclosebackend.c b/src/libebl/eblclosebackend.c
index a0fb3448..a0fb3448 100644
--- a/0.153/libebl/eblclosebackend.c
+++ b/src/libebl/eblclosebackend.c
diff --git a/0.153/libebl/eblcopyrelocp.c b/src/libebl/eblcopyrelocp.c
index a7aea880..a7aea880 100644
--- a/0.153/libebl/eblcopyrelocp.c
+++ b/src/libebl/eblcopyrelocp.c
diff --git a/0.153/libebl/eblcorenote.c b/src/libebl/eblcorenote.c
index 7549ca61..7549ca61 100644
--- a/0.153/libebl/eblcorenote.c
+++ b/src/libebl/eblcorenote.c
diff --git a/0.153/libebl/eblcorenotetypename.c b/src/libebl/eblcorenotetypename.c
index 9376cf57..9376cf57 100644
--- a/0.153/libebl/eblcorenotetypename.c
+++ b/src/libebl/eblcorenotetypename.c
diff --git a/0.153/libebl/ebldebugscnp.c b/src/libebl/ebldebugscnp.c
index c96622c5..c96622c5 100644
--- a/0.153/libebl/ebldebugscnp.c
+++ b/src/libebl/ebldebugscnp.c
diff --git a/0.153/libebl/ebldynamictagcheck.c b/src/libebl/ebldynamictagcheck.c
index 1953a9c0..1953a9c0 100644
--- a/0.153/libebl/ebldynamictagcheck.c
+++ b/src/libebl/ebldynamictagcheck.c
diff --git a/0.153/libebl/ebldynamictagname.c b/src/libebl/ebldynamictagname.c
index cb65b929..cb65b929 100644
--- a/0.153/libebl/ebldynamictagname.c
+++ b/src/libebl/ebldynamictagname.c
diff --git a/0.153/libebl/eblelfclass.c b/src/libebl/eblelfclass.c
index 222307e7..222307e7 100644
--- a/0.153/libebl/eblelfclass.c
+++ b/src/libebl/eblelfclass.c
diff --git a/0.153/libebl/eblelfdata.c b/src/libebl/eblelfdata.c
index f84ae165..f84ae165 100644
--- a/0.153/libebl/eblelfdata.c
+++ b/src/libebl/eblelfdata.c
diff --git a/0.153/libebl/eblelfmachine.c b/src/libebl/eblelfmachine.c
index 9839fefe..9839fefe 100644
--- a/0.153/libebl/eblelfmachine.c
+++ b/src/libebl/eblelfmachine.c
diff --git a/0.153/libebl/eblgotpcreloccheck.c b/src/libebl/eblgotpcreloccheck.c
index e70fcb19..e70fcb19 100644
--- a/0.153/libebl/eblgotpcreloccheck.c
+++ b/src/libebl/eblgotpcreloccheck.c
diff --git a/0.153/libebl/eblgstrtab.c b/src/libebl/eblgstrtab.c
index 73f0d278..73f0d278 100644
--- a/0.153/libebl/eblgstrtab.c
+++ b/src/libebl/eblgstrtab.c
diff --git a/0.153/libebl/eblmachineflagcheck.c b/src/libebl/eblmachineflagcheck.c
index ac383f60..ac383f60 100644
--- a/0.153/libebl/eblmachineflagcheck.c
+++ b/src/libebl/eblmachineflagcheck.c
diff --git a/0.153/libebl/eblmachineflagname.c b/src/libebl/eblmachineflagname.c
index 88a8da83..88a8da83 100644
--- a/0.153/libebl/eblmachineflagname.c
+++ b/src/libebl/eblmachineflagname.c
diff --git a/0.153/libebl/eblmachinesectionflagcheck.c b/src/libebl/eblmachinesectionflagcheck.c
index 9eb6d386..9eb6d386 100644
--- a/0.153/libebl/eblmachinesectionflagcheck.c
+++ b/src/libebl/eblmachinesectionflagcheck.c
diff --git a/0.153/libebl/eblnonerelocp.c b/src/libebl/eblnonerelocp.c
index 3bca98b1..3bca98b1 100644
--- a/0.153/libebl/eblnonerelocp.c
+++ b/src/libebl/eblnonerelocp.c
diff --git a/0.153/libebl/eblobjecttypename.c b/src/libebl/eblobjecttypename.c
index ce100e7f..ce100e7f 100644
--- a/0.153/libebl/eblobjecttypename.c
+++ b/src/libebl/eblobjecttypename.c
diff --git a/0.153/libebl/eblobjnote.c b/src/libebl/eblobjnote.c
index ec5bb7da..ec5bb7da 100644
--- a/0.153/libebl/eblobjnote.c
+++ b/src/libebl/eblobjnote.c
diff --git a/0.153/libebl/eblobjnotetypename.c b/src/libebl/eblobjnotetypename.c
index 0ceb5a87..0ceb5a87 100644
--- a/0.153/libebl/eblobjnotetypename.c
+++ b/src/libebl/eblobjnotetypename.c
diff --git a/0.153/libebl/eblopenbackend.c b/src/libebl/eblopenbackend.c
index 542df629..542df629 100644
--- a/0.153/libebl/eblopenbackend.c
+++ b/src/libebl/eblopenbackend.c
diff --git a/0.153/libebl/eblosabiname.c b/src/libebl/eblosabiname.c
index 3b38b441..3b38b441 100644
--- a/0.153/libebl/eblosabiname.c
+++ b/src/libebl/eblosabiname.c
diff --git a/0.153/libebl/eblreginfo.c b/src/libebl/eblreginfo.c
index 8fc4abfa..8fc4abfa 100644
--- a/0.153/libebl/eblreginfo.c
+++ b/src/libebl/eblreginfo.c
diff --git a/0.153/libebl/eblrelativerelocp.c b/src/libebl/eblrelativerelocp.c
index 9c28b59c..9c28b59c 100644
--- a/0.153/libebl/eblrelativerelocp.c
+++ b/src/libebl/eblrelativerelocp.c
diff --git a/0.153/libebl/eblrelocsimpletype.c b/src/libebl/eblrelocsimpletype.c
index 87eb5a89..87eb5a89 100644
--- a/0.153/libebl/eblrelocsimpletype.c
+++ b/src/libebl/eblrelocsimpletype.c
diff --git a/0.153/libebl/eblreloctypecheck.c b/src/libebl/eblreloctypecheck.c
index 576073cb..576073cb 100644
--- a/0.153/libebl/eblreloctypecheck.c
+++ b/src/libebl/eblreloctypecheck.c
diff --git a/0.153/libebl/eblreloctypename.c b/src/libebl/eblreloctypename.c
index 3f2c7d9c..3f2c7d9c 100644
--- a/0.153/libebl/eblreloctypename.c
+++ b/src/libebl/eblreloctypename.c
diff --git a/0.153/libebl/eblrelocvaliduse.c b/src/libebl/eblrelocvaliduse.c
index 40f27157..40f27157 100644
--- a/0.153/libebl/eblrelocvaliduse.c
+++ b/src/libebl/eblrelocvaliduse.c
diff --git a/0.153/libebl/eblretval.c b/src/libebl/eblretval.c
index 56dc30ff..56dc30ff 100644
--- a/0.153/libebl/eblretval.c
+++ b/src/libebl/eblretval.c
diff --git a/0.153/libebl/eblsectionname.c b/src/libebl/eblsectionname.c
index f1c2b56a..f1c2b56a 100644
--- a/0.153/libebl/eblsectionname.c
+++ b/src/libebl/eblsectionname.c
diff --git a/0.153/libebl/eblsectionstripp.c b/src/libebl/eblsectionstripp.c
index 9aa7502c..9aa7502c 100644
--- a/0.153/libebl/eblsectionstripp.c
+++ b/src/libebl/eblsectionstripp.c
diff --git a/0.153/libebl/eblsectiontypename.c b/src/libebl/eblsectiontypename.c
index a37e5f6d..a37e5f6d 100644
--- a/0.153/libebl/eblsectiontypename.c
+++ b/src/libebl/eblsectiontypename.c
diff --git a/0.153/libebl/eblsegmenttypename.c b/src/libebl/eblsegmenttypename.c
index 8c4c2952..8c4c2952 100644
--- a/0.153/libebl/eblsegmenttypename.c
+++ b/src/libebl/eblsegmenttypename.c
diff --git a/0.153/libebl/eblshflagscombine.c b/src/libebl/eblshflagscombine.c
index 49a65600..49a65600 100644
--- a/0.153/libebl/eblshflagscombine.c
+++ b/src/libebl/eblshflagscombine.c
diff --git a/0.153/libebl/eblstother.c b/src/libebl/eblstother.c
index ba8c9dac..ba8c9dac 100644
--- a/0.153/libebl/eblstother.c
+++ b/src/libebl/eblstother.c
diff --git a/0.153/libebl/eblstrtab.c b/src/libebl/eblstrtab.c
index 4222cfd5..4222cfd5 100644
--- a/0.153/libebl/eblstrtab.c
+++ b/src/libebl/eblstrtab.c
diff --git a/0.153/libebl/eblsymbolbindingname.c b/src/libebl/eblsymbolbindingname.c
index 334a9c3e..334a9c3e 100644
--- a/0.153/libebl/eblsymbolbindingname.c
+++ b/src/libebl/eblsymbolbindingname.c
diff --git a/0.153/libebl/eblsymboltypename.c b/src/libebl/eblsymboltypename.c
index f2ac6222..f2ac6222 100644
--- a/0.153/libebl/eblsymboltypename.c
+++ b/src/libebl/eblsymboltypename.c
diff --git a/0.153/libebl/eblsysvhashentrysize.c b/src/libebl/eblsysvhashentrysize.c
index 341979c1..341979c1 100644
--- a/0.153/libebl/eblsysvhashentrysize.c
+++ b/src/libebl/eblsysvhashentrysize.c
diff --git a/0.153/libebl/eblwstrtab.c b/src/libebl/eblwstrtab.c
index f29c0c7a..f29c0c7a 100644
--- a/0.153/libebl/eblwstrtab.c
+++ b/src/libebl/eblwstrtab.c
diff --git a/0.153/libebl/libebl.h b/src/libebl/libebl.h
index 3a334024..3a334024 100644
--- a/0.153/libebl/libebl.h
+++ b/src/libebl/libebl.h
diff --git a/0.153/libebl/libeblP.h b/src/libebl/libeblP.h
index 32a43728..32a43728 100644
--- a/0.153/libebl/libeblP.h
+++ b/src/libebl/libeblP.h
diff --git a/0.153/libelf/Android.mk b/src/libelf/Android.mk
index 10efc642..0fca8f61 100755
--- a/0.153/libelf/Android.mk
+++ b/src/libelf/Android.mk
@@ -143,7 +143,6 @@ LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/.. \
 	$(LOCAL_PATH)/../lib \
-	$(LOCAL_PATH)/../libelf
 
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
 
@@ -152,6 +151,8 @@ LOCAL_CFLAGS += -Wno-pointer-arith
 
 LOCAL_MODULE := libelf
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif # linux
@@ -170,7 +171,6 @@ LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/.. \
 	$(LOCAL_PATH)/../lib \
-	$(LOCAL_PATH)/../libelf
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../bionic-fixup
 
@@ -183,4 +183,6 @@ LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h
 
 LOCAL_MODULE := libelf
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/0.153/libelf/ChangeLog b/src/libelf/ChangeLog
index d88e2fe5..d88e2fe5 100644
--- a/0.153/libelf/ChangeLog
+++ b/src/libelf/ChangeLog
diff --git a/0.153/libelf/Makefile.am b/src/libelf/Makefile.am
index c7c83f35..c7c83f35 100644
--- a/0.153/libelf/Makefile.am
+++ b/src/libelf/Makefile.am
diff --git a/0.153/libelf/Makefile.in b/src/libelf/Makefile.in
index fcb3ed5d..fcb3ed5d 100644
--- a/0.153/libelf/Makefile.in
+++ b/src/libelf/Makefile.in
diff --git a/0.153/libelf/abstract.h b/src/libelf/abstract.h
index e359f96b..e359f96b 100644
--- a/0.153/libelf/abstract.h
+++ b/src/libelf/abstract.h
diff --git a/0.153/libelf/common.h b/src/libelf/common.h
index 8eef2a7a..8eef2a7a 100644
--- a/0.153/libelf/common.h
+++ b/src/libelf/common.h
diff --git a/0.153/libelf/dl-hash.h b/src/libelf/dl-hash.h
index fd593949..fd593949 100644
--- a/0.153/libelf/dl-hash.h
+++ b/src/libelf/dl-hash.h
diff --git a/0.153/libelf/elf-knowledge.h b/src/libelf/elf-knowledge.h
index 8b4c0d7b..8b4c0d7b 100644
--- a/0.153/libelf/elf-knowledge.h
+++ b/src/libelf/elf-knowledge.h
diff --git a/0.153/libelf/elf.h b/src/libelf/elf.h
index 2b063777..2b063777 100644
--- a/0.153/libelf/elf.h
+++ b/src/libelf/elf.h
diff --git a/0.153/libelf/elf32_checksum.c b/src/libelf/elf32_checksum.c
index ad040b80..ad040b80 100644
--- a/0.153/libelf/elf32_checksum.c
+++ b/src/libelf/elf32_checksum.c
diff --git a/0.153/libelf/elf32_fsize.c b/src/libelf/elf32_fsize.c
index d23e3a46..d23e3a46 100644
--- a/0.153/libelf/elf32_fsize.c
+++ b/src/libelf/elf32_fsize.c
diff --git a/0.153/libelf/elf32_getehdr.c b/src/libelf/elf32_getehdr.c
index 8009133b..8009133b 100644
--- a/0.153/libelf/elf32_getehdr.c
+++ b/src/libelf/elf32_getehdr.c
diff --git a/0.153/libelf/elf32_getphdr.c b/src/libelf/elf32_getphdr.c
index 80f54fd7..80f54fd7 100644
--- a/0.153/libelf/elf32_getphdr.c
+++ b/src/libelf/elf32_getphdr.c
diff --git a/0.153/libelf/elf32_getshdr.c b/src/libelf/elf32_getshdr.c
index 8d650d9f..8d650d9f 100644
--- a/0.153/libelf/elf32_getshdr.c
+++ b/src/libelf/elf32_getshdr.c
diff --git a/0.153/libelf/elf32_newehdr.c b/src/libelf/elf32_newehdr.c
index 4e20056f..4e20056f 100644
--- a/0.153/libelf/elf32_newehdr.c
+++ b/src/libelf/elf32_newehdr.c
diff --git a/0.153/libelf/elf32_newphdr.c b/src/libelf/elf32_newphdr.c
index 03ff100a..03ff100a 100644
--- a/0.153/libelf/elf32_newphdr.c
+++ b/src/libelf/elf32_newphdr.c
diff --git a/0.153/libelf/elf32_offscn.c b/src/libelf/elf32_offscn.c
index 86eff8b1..86eff8b1 100644
--- a/0.153/libelf/elf32_offscn.c
+++ b/src/libelf/elf32_offscn.c
diff --git a/0.153/libelf/elf32_updatefile.c b/src/libelf/elf32_updatefile.c
index 898cf1ab..898cf1ab 100644
--- a/0.153/libelf/elf32_updatefile.c
+++ b/src/libelf/elf32_updatefile.c
diff --git a/0.153/libelf/elf32_updatenull.c b/src/libelf/elf32_updatenull.c
index ca9a8708..ca9a8708 100644
--- a/0.153/libelf/elf32_updatenull.c
+++ b/src/libelf/elf32_updatenull.c
diff --git a/0.153/libelf/elf32_xlatetof.c b/src/libelf/elf32_xlatetof.c
index dc686ec0..dc686ec0 100644
--- a/0.153/libelf/elf32_xlatetof.c
+++ b/src/libelf/elf32_xlatetof.c
diff --git a/0.153/libelf/elf32_xlatetom.c b/src/libelf/elf32_xlatetom.c
index 4f54df25..4f54df25 100644
--- a/0.153/libelf/elf32_xlatetom.c
+++ b/src/libelf/elf32_xlatetom.c
diff --git a/0.153/libelf/elf64_checksum.c b/src/libelf/elf64_checksum.c
index 000b66f8..000b66f8 100644
--- a/0.153/libelf/elf64_checksum.c
+++ b/src/libelf/elf64_checksum.c
diff --git a/0.153/libelf/elf64_fsize.c b/src/libelf/elf64_fsize.c
index 2ee05122..2ee05122 100644
--- a/0.153/libelf/elf64_fsize.c
+++ b/src/libelf/elf64_fsize.c
diff --git a/0.153/libelf/elf64_getehdr.c b/src/libelf/elf64_getehdr.c
index c649679d..c649679d 100644
--- a/0.153/libelf/elf64_getehdr.c
+++ b/src/libelf/elf64_getehdr.c
diff --git a/0.153/libelf/elf64_getphdr.c b/src/libelf/elf64_getphdr.c
index 5e2d0ead..5e2d0ead 100644
--- a/0.153/libelf/elf64_getphdr.c
+++ b/src/libelf/elf64_getphdr.c
diff --git a/0.153/libelf/elf64_getshdr.c b/src/libelf/elf64_getshdr.c
index 5b86dbec..5b86dbec 100644
--- a/0.153/libelf/elf64_getshdr.c
+++ b/src/libelf/elf64_getshdr.c
diff --git a/0.153/libelf/elf64_newehdr.c b/src/libelf/elf64_newehdr.c
index eaea2b1a..eaea2b1a 100644
--- a/0.153/libelf/elf64_newehdr.c
+++ b/src/libelf/elf64_newehdr.c
diff --git a/0.153/libelf/elf64_newphdr.c b/src/libelf/elf64_newphdr.c
index 91a41331..91a41331 100644
--- a/0.153/libelf/elf64_newphdr.c
+++ b/src/libelf/elf64_newphdr.c
diff --git a/0.153/libelf/elf64_offscn.c b/src/libelf/elf64_offscn.c
index 6d312150..6d312150 100644
--- a/0.153/libelf/elf64_offscn.c
+++ b/src/libelf/elf64_offscn.c
diff --git a/0.153/libelf/elf64_updatefile.c b/src/libelf/elf64_updatefile.c
index 5502d188..5502d188 100644
--- a/0.153/libelf/elf64_updatefile.c
+++ b/src/libelf/elf64_updatefile.c
diff --git a/0.153/libelf/elf64_updatenull.c b/src/libelf/elf64_updatenull.c
index 6838fd8f..6838fd8f 100644
--- a/0.153/libelf/elf64_updatenull.c
+++ b/src/libelf/elf64_updatenull.c
diff --git a/0.153/libelf/elf64_xlatetof.c b/src/libelf/elf64_xlatetof.c
index 2747ce0f..2747ce0f 100644
--- a/0.153/libelf/elf64_xlatetof.c
+++ b/src/libelf/elf64_xlatetof.c
diff --git a/0.153/libelf/elf64_xlatetom.c b/src/libelf/elf64_xlatetom.c
index 6fa6a02d..6fa6a02d 100644
--- a/0.153/libelf/elf64_xlatetom.c
+++ b/src/libelf/elf64_xlatetom.c
diff --git a/0.153/libelf/elf_begin.c b/src/libelf/elf_begin.c
index e46add33..e46add33 100644
--- a/0.153/libelf/elf_begin.c
+++ b/src/libelf/elf_begin.c
diff --git a/0.153/libelf/elf_clone.c b/src/libelf/elf_clone.c
index 8b699fa6..8b699fa6 100644
--- a/0.153/libelf/elf_clone.c
+++ b/src/libelf/elf_clone.c
diff --git a/0.153/libelf/elf_cntl.c b/src/libelf/elf_cntl.c
index fd5b47b9..fd5b47b9 100644
--- a/0.153/libelf/elf_cntl.c
+++ b/src/libelf/elf_cntl.c
diff --git a/0.153/libelf/elf_end.c b/src/libelf/elf_end.c
index 5112eaea..5112eaea 100644
--- a/0.153/libelf/elf_end.c
+++ b/src/libelf/elf_end.c
diff --git a/0.153/libelf/elf_error.c b/src/libelf/elf_error.c
index 6394c021..6394c021 100644
--- a/0.153/libelf/elf_error.c
+++ b/src/libelf/elf_error.c
diff --git a/0.153/libelf/elf_fill.c b/src/libelf/elf_fill.c
index ae69951b..ae69951b 100644
--- a/0.153/libelf/elf_fill.c
+++ b/src/libelf/elf_fill.c
diff --git a/0.153/libelf/elf_flagdata.c b/src/libelf/elf_flagdata.c
index a2cbdd9a..a2cbdd9a 100644
--- a/0.153/libelf/elf_flagdata.c
+++ b/src/libelf/elf_flagdata.c
diff --git a/0.153/libelf/elf_flagehdr.c b/src/libelf/elf_flagehdr.c
index 499cf1da..499cf1da 100644
--- a/0.153/libelf/elf_flagehdr.c
+++ b/src/libelf/elf_flagehdr.c
diff --git a/0.153/libelf/elf_flagelf.c b/src/libelf/elf_flagelf.c
index 4ea45001..4ea45001 100644
--- a/0.153/libelf/elf_flagelf.c
+++ b/src/libelf/elf_flagelf.c
diff --git a/0.153/libelf/elf_flagphdr.c b/src/libelf/elf_flagphdr.c
index de1bccf5..de1bccf5 100644
--- a/0.153/libelf/elf_flagphdr.c
+++ b/src/libelf/elf_flagphdr.c
diff --git a/0.153/libelf/elf_flagscn.c b/src/libelf/elf_flagscn.c
index f4dba959..f4dba959 100644
--- a/0.153/libelf/elf_flagscn.c
+++ b/src/libelf/elf_flagscn.c
diff --git a/0.153/libelf/elf_flagshdr.c b/src/libelf/elf_flagshdr.c
index de645bbd..de645bbd 100644
--- a/0.153/libelf/elf_flagshdr.c
+++ b/src/libelf/elf_flagshdr.c
diff --git a/0.153/libelf/elf_getarhdr.c b/src/libelf/elf_getarhdr.c
index 61e4e0a2..61e4e0a2 100644
--- a/0.153/libelf/elf_getarhdr.c
+++ b/src/libelf/elf_getarhdr.c
diff --git a/0.153/libelf/elf_getaroff.c b/src/libelf/elf_getaroff.c
index 8dea0614..8dea0614 100644
--- a/0.153/libelf/elf_getaroff.c
+++ b/src/libelf/elf_getaroff.c
diff --git a/0.153/libelf/elf_getarsym.c b/src/libelf/elf_getarsym.c
index e6ecaadc..e6ecaadc 100644
--- a/0.153/libelf/elf_getarsym.c
+++ b/src/libelf/elf_getarsym.c
diff --git a/0.153/libelf/elf_getbase.c b/src/libelf/elf_getbase.c
index 2b6cf853..2b6cf853 100644
--- a/0.153/libelf/elf_getbase.c
+++ b/src/libelf/elf_getbase.c
diff --git a/0.153/libelf/elf_getdata.c b/src/libelf/elf_getdata.c
index 5a718f82..5a718f82 100644
--- a/0.153/libelf/elf_getdata.c
+++ b/src/libelf/elf_getdata.c
diff --git a/0.153/libelf/elf_getdata_rawchunk.c b/src/libelf/elf_getdata_rawchunk.c
index 3ec2100a..3ec2100a 100644
--- a/0.153/libelf/elf_getdata_rawchunk.c
+++ b/src/libelf/elf_getdata_rawchunk.c
diff --git a/0.153/libelf/elf_getident.c b/src/libelf/elf_getident.c
index f9bac104..f9bac104 100644
--- a/0.153/libelf/elf_getident.c
+++ b/src/libelf/elf_getident.c
diff --git a/0.153/libelf/elf_getphdrnum.c b/src/libelf/elf_getphdrnum.c
index edf073ec..edf073ec 100644
--- a/0.153/libelf/elf_getphdrnum.c
+++ b/src/libelf/elf_getphdrnum.c
diff --git a/0.153/libelf/elf_getscn.c b/src/libelf/elf_getscn.c
index 5c14a580..5c14a580 100644
--- a/0.153/libelf/elf_getscn.c
+++ b/src/libelf/elf_getscn.c
diff --git a/0.153/libelf/elf_getshdrnum.c b/src/libelf/elf_getshdrnum.c
index 5ca7fdd9..5ca7fdd9 100644
--- a/0.153/libelf/elf_getshdrnum.c
+++ b/src/libelf/elf_getshdrnum.c
diff --git a/0.153/libelf/elf_getshdrstrndx.c b/src/libelf/elf_getshdrstrndx.c
index a1aba5ff..a1aba5ff 100644
--- a/0.153/libelf/elf_getshdrstrndx.c
+++ b/src/libelf/elf_getshdrstrndx.c
diff --git a/0.153/libelf/elf_gnu_hash.c b/src/libelf/elf_gnu_hash.c
index efaee435..efaee435 100644
--- a/0.153/libelf/elf_gnu_hash.c
+++ b/src/libelf/elf_gnu_hash.c
diff --git a/0.153/libelf/elf_hash.c b/src/libelf/elf_hash.c
index 94c0a853..94c0a853 100644
--- a/0.153/libelf/elf_hash.c
+++ b/src/libelf/elf_hash.c
diff --git a/0.153/libelf/elf_kind.c b/src/libelf/elf_kind.c
index 06aeaa9c..06aeaa9c 100644
--- a/0.153/libelf/elf_kind.c
+++ b/src/libelf/elf_kind.c
diff --git a/0.153/libelf/elf_memory.c b/src/libelf/elf_memory.c
index f6468c8b..f6468c8b 100644
--- a/0.153/libelf/elf_memory.c
+++ b/src/libelf/elf_memory.c
diff --git a/0.153/libelf/elf_ndxscn.c b/src/libelf/elf_ndxscn.c
index 53082aee..53082aee 100644
--- a/0.153/libelf/elf_ndxscn.c
+++ b/src/libelf/elf_ndxscn.c
diff --git a/0.153/libelf/elf_newdata.c b/src/libelf/elf_newdata.c
index db17ea58..db17ea58 100644
--- a/0.153/libelf/elf_newdata.c
+++ b/src/libelf/elf_newdata.c
diff --git a/0.153/libelf/elf_newscn.c b/src/libelf/elf_newscn.c
index aefab334..aefab334 100644
--- a/0.153/libelf/elf_newscn.c
+++ b/src/libelf/elf_newscn.c
diff --git a/0.153/libelf/elf_next.c b/src/libelf/elf_next.c
index 196c65a3..196c65a3 100644
--- a/0.153/libelf/elf_next.c
+++ b/src/libelf/elf_next.c
diff --git a/0.153/libelf/elf_nextscn.c b/src/libelf/elf_nextscn.c
index a1842bb3..a1842bb3 100644
--- a/0.153/libelf/elf_nextscn.c
+++ b/src/libelf/elf_nextscn.c
diff --git a/0.153/libelf/elf_rand.c b/src/libelf/elf_rand.c
index a766d38f..a766d38f 100644
--- a/0.153/libelf/elf_rand.c
+++ b/src/libelf/elf_rand.c
diff --git a/0.153/libelf/elf_rawdata.c b/src/libelf/elf_rawdata.c
index b8bb0f4b..b8bb0f4b 100644
--- a/0.153/libelf/elf_rawdata.c
+++ b/src/libelf/elf_rawdata.c
diff --git a/0.153/libelf/elf_rawfile.c b/src/libelf/elf_rawfile.c
index a62a3549..a62a3549 100644
--- a/0.153/libelf/elf_rawfile.c
+++ b/src/libelf/elf_rawfile.c
diff --git a/0.153/libelf/elf_readall.c b/src/libelf/elf_readall.c
index 1f59932f..1f59932f 100644
--- a/0.153/libelf/elf_readall.c
+++ b/src/libelf/elf_readall.c
diff --git a/0.153/libelf/elf_scnshndx.c b/src/libelf/elf_scnshndx.c
index 987d23e4..987d23e4 100644
--- a/0.153/libelf/elf_scnshndx.c
+++ b/src/libelf/elf_scnshndx.c
diff --git a/0.153/libelf/elf_strptr.c b/src/libelf/elf_strptr.c
index 7b837b09..7b837b09 100644
--- a/0.153/libelf/elf_strptr.c
+++ b/src/libelf/elf_strptr.c
diff --git a/0.153/libelf/elf_update.c b/src/libelf/elf_update.c
index 5daece40..5daece40 100644
--- a/0.153/libelf/elf_update.c
+++ b/src/libelf/elf_update.c
diff --git a/0.153/libelf/elf_version.c b/src/libelf/elf_version.c
index cbed496f..cbed496f 100644
--- a/0.153/libelf/elf_version.c
+++ b/src/libelf/elf_version.c
diff --git a/0.153/libelf/exttypes.h b/src/libelf/exttypes.h
index 2b15667c..2b15667c 100644
--- a/0.153/libelf/exttypes.h
+++ b/src/libelf/exttypes.h
diff --git a/0.153/libelf/gelf.h b/src/libelf/gelf.h
index 533e15a9..533e15a9 100644
--- a/0.153/libelf/gelf.h
+++ b/src/libelf/gelf.h
diff --git a/0.153/libelf/gelf_checksum.c b/src/libelf/gelf_checksum.c
index fb0daa51..fb0daa51 100644
--- a/0.153/libelf/gelf_checksum.c
+++ b/src/libelf/gelf_checksum.c
diff --git a/0.153/libelf/gelf_fsize.c b/src/libelf/gelf_fsize.c
index 7a9a308e..7a9a308e 100644
--- a/0.153/libelf/gelf_fsize.c
+++ b/src/libelf/gelf_fsize.c
diff --git a/0.153/libelf/gelf_getauxv.c b/src/libelf/gelf_getauxv.c
index 036bdccf..036bdccf 100644
--- a/0.153/libelf/gelf_getauxv.c
+++ b/src/libelf/gelf_getauxv.c
diff --git a/0.153/libelf/gelf_getclass.c b/src/libelf/gelf_getclass.c
index 02784d74..02784d74 100644
--- a/0.153/libelf/gelf_getclass.c
+++ b/src/libelf/gelf_getclass.c
diff --git a/0.153/libelf/gelf_getdyn.c b/src/libelf/gelf_getdyn.c
index 82f8e328..82f8e328 100644
--- a/0.153/libelf/gelf_getdyn.c
+++ b/src/libelf/gelf_getdyn.c
diff --git a/0.153/libelf/gelf_getehdr.c b/src/libelf/gelf_getehdr.c
index 34b5db3e..34b5db3e 100644
--- a/0.153/libelf/gelf_getehdr.c
+++ b/src/libelf/gelf_getehdr.c
diff --git a/0.153/libelf/gelf_getlib.c b/src/libelf/gelf_getlib.c
index aa91a73b..aa91a73b 100644
--- a/0.153/libelf/gelf_getlib.c
+++ b/src/libelf/gelf_getlib.c
diff --git a/0.153/libelf/gelf_getmove.c b/src/libelf/gelf_getmove.c
index 6e769484..6e769484 100644
--- a/0.153/libelf/gelf_getmove.c
+++ b/src/libelf/gelf_getmove.c
diff --git a/0.153/libelf/gelf_getnote.c b/src/libelf/gelf_getnote.c
index e4900185..e4900185 100644
--- a/0.153/libelf/gelf_getnote.c
+++ b/src/libelf/gelf_getnote.c
diff --git a/0.153/libelf/gelf_getphdr.c b/src/libelf/gelf_getphdr.c
index 7b04b399..7b04b399 100644
--- a/0.153/libelf/gelf_getphdr.c
+++ b/src/libelf/gelf_getphdr.c
diff --git a/0.153/libelf/gelf_getrel.c b/src/libelf/gelf_getrel.c
index f3775bd9..f3775bd9 100644
--- a/0.153/libelf/gelf_getrel.c
+++ b/src/libelf/gelf_getrel.c
diff --git a/0.153/libelf/gelf_getrela.c b/src/libelf/gelf_getrela.c
index 0275c375..0275c375 100644
--- a/0.153/libelf/gelf_getrela.c
+++ b/src/libelf/gelf_getrela.c
diff --git a/0.153/libelf/gelf_getshdr.c b/src/libelf/gelf_getshdr.c
index 8b46dfa8..8b46dfa8 100644
--- a/0.153/libelf/gelf_getshdr.c
+++ b/src/libelf/gelf_getshdr.c
diff --git a/0.153/libelf/gelf_getsym.c b/src/libelf/gelf_getsym.c
index 162061f7..162061f7 100644
--- a/0.153/libelf/gelf_getsym.c
+++ b/src/libelf/gelf_getsym.c
diff --git a/0.153/libelf/gelf_getsyminfo.c b/src/libelf/gelf_getsyminfo.c
index 2c07526a..2c07526a 100644
--- a/0.153/libelf/gelf_getsyminfo.c
+++ b/src/libelf/gelf_getsyminfo.c
diff --git a/0.153/libelf/gelf_getsymshndx.c b/src/libelf/gelf_getsymshndx.c
index a9cfc181..a9cfc181 100644
--- a/0.153/libelf/gelf_getsymshndx.c
+++ b/src/libelf/gelf_getsymshndx.c
diff --git a/0.153/libelf/gelf_getverdaux.c b/src/libelf/gelf_getverdaux.c
index b8bcf14e..b8bcf14e 100644
--- a/0.153/libelf/gelf_getverdaux.c
+++ b/src/libelf/gelf_getverdaux.c
diff --git a/0.153/libelf/gelf_getverdef.c b/src/libelf/gelf_getverdef.c
index 05cc2e89..05cc2e89 100644
--- a/0.153/libelf/gelf_getverdef.c
+++ b/src/libelf/gelf_getverdef.c
diff --git a/0.153/libelf/gelf_getvernaux.c b/src/libelf/gelf_getvernaux.c
index 45d3300f..45d3300f 100644
--- a/0.153/libelf/gelf_getvernaux.c
+++ b/src/libelf/gelf_getvernaux.c
diff --git a/0.153/libelf/gelf_getverneed.c b/src/libelf/gelf_getverneed.c
index e82a055d..e82a055d 100644
--- a/0.153/libelf/gelf_getverneed.c
+++ b/src/libelf/gelf_getverneed.c
diff --git a/0.153/libelf/gelf_getversym.c b/src/libelf/gelf_getversym.c
index 397b7edb..397b7edb 100644
--- a/0.153/libelf/gelf_getversym.c
+++ b/src/libelf/gelf_getversym.c
diff --git a/0.153/libelf/gelf_newehdr.c b/src/libelf/gelf_newehdr.c
index 2f720b8a..2f720b8a 100644
--- a/0.153/libelf/gelf_newehdr.c
+++ b/src/libelf/gelf_newehdr.c
diff --git a/0.153/libelf/gelf_newphdr.c b/src/libelf/gelf_newphdr.c
index 65306924..65306924 100644
--- a/0.153/libelf/gelf_newphdr.c
+++ b/src/libelf/gelf_newphdr.c
diff --git a/0.153/libelf/gelf_offscn.c b/src/libelf/gelf_offscn.c
index 573195cd..573195cd 100644
--- a/0.153/libelf/gelf_offscn.c
+++ b/src/libelf/gelf_offscn.c
diff --git a/0.153/libelf/gelf_update_auxv.c b/src/libelf/gelf_update_auxv.c
index b294ead7..b294ead7 100644
--- a/0.153/libelf/gelf_update_auxv.c
+++ b/src/libelf/gelf_update_auxv.c
diff --git a/0.153/libelf/gelf_update_dyn.c b/src/libelf/gelf_update_dyn.c
index 10bfb6ab..10bfb6ab 100644
--- a/0.153/libelf/gelf_update_dyn.c
+++ b/src/libelf/gelf_update_dyn.c
diff --git a/0.153/libelf/gelf_update_ehdr.c b/src/libelf/gelf_update_ehdr.c
index baf7a3f8..baf7a3f8 100644
--- a/0.153/libelf/gelf_update_ehdr.c
+++ b/src/libelf/gelf_update_ehdr.c
diff --git a/0.153/libelf/gelf_update_lib.c b/src/libelf/gelf_update_lib.c
index 9571016f..9571016f 100644
--- a/0.153/libelf/gelf_update_lib.c
+++ b/src/libelf/gelf_update_lib.c
diff --git a/0.153/libelf/gelf_update_move.c b/src/libelf/gelf_update_move.c
index fd67be10..fd67be10 100644
--- a/0.153/libelf/gelf_update_move.c
+++ b/src/libelf/gelf_update_move.c
diff --git a/0.153/libelf/gelf_update_phdr.c b/src/libelf/gelf_update_phdr.c
index b90e5c04..b90e5c04 100644
--- a/0.153/libelf/gelf_update_phdr.c
+++ b/src/libelf/gelf_update_phdr.c
diff --git a/0.153/libelf/gelf_update_rel.c b/src/libelf/gelf_update_rel.c
index 049b71a1..049b71a1 100644
--- a/0.153/libelf/gelf_update_rel.c
+++ b/src/libelf/gelf_update_rel.c
diff --git a/0.153/libelf/gelf_update_rela.c b/src/libelf/gelf_update_rela.c
index dc99c681..dc99c681 100644
--- a/0.153/libelf/gelf_update_rela.c
+++ b/src/libelf/gelf_update_rela.c
diff --git a/0.153/libelf/gelf_update_shdr.c b/src/libelf/gelf_update_shdr.c
index c4e38294..c4e38294 100644
--- a/0.153/libelf/gelf_update_shdr.c
+++ b/src/libelf/gelf_update_shdr.c
diff --git a/0.153/libelf/gelf_update_sym.c b/src/libelf/gelf_update_sym.c
index fff45fdb..fff45fdb 100644
--- a/0.153/libelf/gelf_update_sym.c
+++ b/src/libelf/gelf_update_sym.c
diff --git a/0.153/libelf/gelf_update_syminfo.c b/src/libelf/gelf_update_syminfo.c
index a0e176dc..a0e176dc 100644
--- a/0.153/libelf/gelf_update_syminfo.c
+++ b/src/libelf/gelf_update_syminfo.c
diff --git a/0.153/libelf/gelf_update_symshndx.c b/src/libelf/gelf_update_symshndx.c
index 2d393c1f..2d393c1f 100644
--- a/0.153/libelf/gelf_update_symshndx.c
+++ b/src/libelf/gelf_update_symshndx.c
diff --git a/0.153/libelf/gelf_update_verdaux.c b/src/libelf/gelf_update_verdaux.c
index 17866efc..17866efc 100644
--- a/0.153/libelf/gelf_update_verdaux.c
+++ b/src/libelf/gelf_update_verdaux.c
diff --git a/0.153/libelf/gelf_update_verdef.c b/src/libelf/gelf_update_verdef.c
index cd19cb75..cd19cb75 100644
--- a/0.153/libelf/gelf_update_verdef.c
+++ b/src/libelf/gelf_update_verdef.c
diff --git a/0.153/libelf/gelf_update_vernaux.c b/src/libelf/gelf_update_vernaux.c
index 2be69e1e..2be69e1e 100644
--- a/0.153/libelf/gelf_update_vernaux.c
+++ b/src/libelf/gelf_update_vernaux.c
diff --git a/0.153/libelf/gelf_update_verneed.c b/src/libelf/gelf_update_verneed.c
index 95f2d18f..95f2d18f 100644
--- a/0.153/libelf/gelf_update_verneed.c
+++ b/src/libelf/gelf_update_verneed.c
diff --git a/0.153/libelf/gelf_update_versym.c b/src/libelf/gelf_update_versym.c
index 905c8f78..905c8f78 100644
--- a/0.153/libelf/gelf_update_versym.c
+++ b/src/libelf/gelf_update_versym.c
diff --git a/0.153/libelf/gelf_xlate.c b/src/libelf/gelf_xlate.c
index 7cf3b3c9..7cf3b3c9 100644
--- a/0.153/libelf/gelf_xlate.c
+++ b/src/libelf/gelf_xlate.c
diff --git a/0.153/libelf/gelf_xlate.h b/src/libelf/gelf_xlate.h
index e7659f12..e7659f12 100644
--- a/0.153/libelf/gelf_xlate.h
+++ b/src/libelf/gelf_xlate.h
diff --git a/0.153/libelf/gelf_xlatetof.c b/src/libelf/gelf_xlatetof.c
index e7f8238c..e7f8238c 100644
--- a/0.153/libelf/gelf_xlatetof.c
+++ b/src/libelf/gelf_xlatetof.c
diff --git a/0.153/libelf/gelf_xlatetom.c b/src/libelf/gelf_xlatetom.c
index b7da1b29..b7da1b29 100644
--- a/0.153/libelf/gelf_xlatetom.c
+++ b/src/libelf/gelf_xlatetom.c
diff --git a/0.153/libelf/gnuhash_xlate.h b/src/libelf/gnuhash_xlate.h
index d79764d8..d79764d8 100644
--- a/0.153/libelf/gnuhash_xlate.h
+++ b/src/libelf/gnuhash_xlate.h
diff --git a/0.153/libelf/libelf.h b/src/libelf/libelf.h
index 7cbff032..7cbff032 100644
--- a/0.153/libelf/libelf.h
+++ b/src/libelf/libelf.h
diff --git a/0.153/libelf/libelf.map b/src/libelf/libelf.map
index de6d912a..de6d912a 100644
--- a/0.153/libelf/libelf.map
+++ b/src/libelf/libelf.map
diff --git a/0.153/libelf/libelfP.h b/src/libelf/libelfP.h
index 8f2f33a4..8f2f33a4 100644
--- a/0.153/libelf/libelfP.h
+++ b/src/libelf/libelfP.h
diff --git a/0.153/libelf/libelf_crc32.c b/src/libelf/libelf_crc32.c
index 10ce34c6..10ce34c6 100644
--- a/0.153/libelf/libelf_crc32.c
+++ b/src/libelf/libelf_crc32.c
diff --git a/0.153/libelf/libelf_next_prime.c b/src/libelf/libelf_next_prime.c
index 1b96012c..1b96012c 100644
--- a/0.153/libelf/libelf_next_prime.c
+++ b/src/libelf/libelf_next_prime.c
diff --git a/0.153/libelf/nlist.c b/src/libelf/nlist.c
index f1fe1763..f1fe1763 100644
--- a/0.153/libelf/nlist.c
+++ b/src/libelf/nlist.c
diff --git a/0.153/libelf/nlist.h b/src/libelf/nlist.h
index ce6569ef..ce6569ef 100644
--- a/0.153/libelf/nlist.h
+++ b/src/libelf/nlist.h
diff --git a/0.153/libelf/note_xlate.h b/src/libelf/note_xlate.h
index a72fe868..a72fe868 100644
--- a/0.153/libelf/note_xlate.h
+++ b/src/libelf/note_xlate.h
diff --git a/0.153/libelf/version_xlate.h b/src/libelf/version_xlate.h
index b32cacdc..b32cacdc 100644
--- a/0.153/libelf/version_xlate.h
+++ b/src/libelf/version_xlate.h
diff --git a/0.153/m4/ChangeLog b/src/m4/ChangeLog
index d4f2bc1b..d4f2bc1b 100644
--- a/0.153/m4/ChangeLog
+++ b/src/m4/ChangeLog
diff --git a/0.153/m4/Makefile.am b/src/m4/Makefile.am
index 156010c7..156010c7 100644
--- a/0.153/m4/Makefile.am
+++ b/src/m4/Makefile.am
diff --git a/0.153/m4/Makefile.in b/src/m4/Makefile.in
index 1958a35f..1958a35f 100644
--- a/0.153/m4/Makefile.in
+++ b/src/m4/Makefile.in
diff --git a/0.153/m4/codeset.m4 b/src/m4/codeset.m4
index 59535ebc..59535ebc 100644
--- a/0.153/m4/codeset.m4
+++ b/src/m4/codeset.m4
diff --git a/0.153/m4/gettext.m4 b/src/m4/gettext.m4
index c9ae1f7d..c9ae1f7d 100644
--- a/0.153/m4/gettext.m4
+++ b/src/m4/gettext.m4
diff --git a/0.153/m4/iconv.m4 b/src/m4/iconv.m4
index 66bc76f4..66bc76f4 100644
--- a/0.153/m4/iconv.m4
+++ b/src/m4/iconv.m4
diff --git a/0.153/m4/lcmessage.m4 b/src/m4/lcmessage.m4
index ffbf915f..ffbf915f 100644
--- a/0.153/m4/lcmessage.m4
+++ b/src/m4/lcmessage.m4
diff --git a/0.153/m4/nls.m4 b/src/m4/nls.m4
index 7967cc2f..7967cc2f 100644
--- a/0.153/m4/nls.m4
+++ b/src/m4/nls.m4
diff --git a/0.153/m4/po.m4 b/src/m4/po.m4
index 0734762a..0734762a 100644
--- a/0.153/m4/po.m4
+++ b/src/m4/po.m4
diff --git a/0.153/m4/progtest.m4 b/src/m4/progtest.m4
index a56365cd..a56365cd 100644
--- a/0.153/m4/progtest.m4
+++ b/src/m4/progtest.m4
diff --git a/0.153/m4/zip.m4 b/src/m4/zip.m4
index 8e4d545c..8e4d545c 100644
--- a/0.153/m4/zip.m4
+++ b/src/m4/zip.m4
diff --git a/0.153/po/ChangeLog b/src/po/ChangeLog
index a2a933cd..a2a933cd 100644
--- a/0.153/po/ChangeLog
+++ b/src/po/ChangeLog
diff --git a/0.153/po/LINGUAS b/src/po/LINGUAS
index 4adcc52a..4adcc52a 100644
--- a/0.153/po/LINGUAS
+++ b/src/po/LINGUAS
diff --git a/0.153/po/Makefile.in.in b/src/po/Makefile.in.in
index fecf500f..fecf500f 100644
--- a/0.153/po/Makefile.in.in
+++ b/src/po/Makefile.in.in
diff --git a/0.153/po/Makevars b/src/po/Makevars
index 8a8ebc60..8a8ebc60 100644
--- a/0.153/po/Makevars
+++ b/src/po/Makevars
diff --git a/0.153/po/POTFILES.in b/src/po/POTFILES.in
index 2058928d..2058928d 100644
--- a/0.153/po/POTFILES.in
+++ b/src/po/POTFILES.in
diff --git a/0.153/po/Rules-quot b/src/po/Rules-quot
index 9c2a995e..9c2a995e 100644
--- a/0.153/po/Rules-quot
+++ b/src/po/Rules-quot
diff --git a/0.153/po/boldquot.sed b/src/po/boldquot.sed
index 4b937aa5..4b937aa5 100644
--- a/0.153/po/boldquot.sed
+++ b/src/po/boldquot.sed
diff --git a/0.153/po/de.gmo b/src/po/de.gmo
index cfa7f658..cfa7f658 100644
--- a/0.153/po/de.gmo
+++ b/src/po/de.gmo
diff --git a/0.153/po/de.po b/src/po/de.po
index 9177c3d0..9177c3d0 100644
--- a/0.153/po/de.po
+++ b/src/po/de.po
diff --git a/0.153/po/elfutils.pot b/src/po/elfutils.pot
index 4b2f264c..4b2f264c 100644
--- a/0.153/po/elfutils.pot
+++ b/src/po/elfutils.pot
diff --git a/0.153/po/en@boldquot.gmo b/src/po/en@boldquot.gmo
index e36dba62..e36dba62 100644
--- a/0.153/po/en@boldquot.gmo
+++ b/src/po/en@boldquot.gmo
diff --git a/0.153/po/en@boldquot.header b/src/po/en@boldquot.header
index fedb6a06..fedb6a06 100644
--- a/0.153/po/en@boldquot.header
+++ b/src/po/en@boldquot.header
diff --git a/0.153/po/en@boldquot.po b/src/po/en@boldquot.po
index 7bdcd14f..7bdcd14f 100644
--- a/0.153/po/en@boldquot.po
+++ b/src/po/en@boldquot.po
diff --git a/0.153/po/en@quot.gmo b/src/po/en@quot.gmo
index 42ff5aaf..42ff5aaf 100644
--- a/0.153/po/en@quot.gmo
+++ b/src/po/en@quot.gmo
diff --git a/0.153/po/en@quot.header b/src/po/en@quot.header
index a9647fc3..a9647fc3 100644
--- a/0.153/po/en@quot.header
+++ b/src/po/en@quot.header
diff --git a/0.153/po/en@quot.po b/src/po/en@quot.po
index 367e10b5..367e10b5 100644
--- a/0.153/po/en@quot.po
+++ b/src/po/en@quot.po
diff --git a/0.153/po/es.gmo b/src/po/es.gmo
index bc9b4b88..bc9b4b88 100644
--- a/0.153/po/es.gmo
+++ b/src/po/es.gmo
diff --git a/0.153/po/es.po b/src/po/es.po
index 89ca50d6..89ca50d6 100644
--- a/0.153/po/es.po
+++ b/src/po/es.po
diff --git a/0.153/po/insert-header.sin b/src/po/insert-header.sin
index b26de01f..b26de01f 100644
--- a/0.153/po/insert-header.sin
+++ b/src/po/insert-header.sin
diff --git a/0.153/po/ja.gmo b/src/po/ja.gmo
index 4c1d5ef9..4c1d5ef9 100644
--- a/0.153/po/ja.gmo
+++ b/src/po/ja.gmo
diff --git a/0.153/po/ja.po b/src/po/ja.po
index 6299fe0e..6299fe0e 100644
--- a/0.153/po/ja.po
+++ b/src/po/ja.po
diff --git a/0.153/po/pl.gmo b/src/po/pl.gmo
index 5ffb8f73..5ffb8f73 100644
--- a/0.153/po/pl.gmo
+++ b/src/po/pl.gmo
diff --git a/0.153/po/pl.po b/src/po/pl.po
index 82a62281..82a62281 100644
--- a/0.153/po/pl.po
+++ b/src/po/pl.po
diff --git a/0.153/po/quot.sed b/src/po/quot.sed
index 0122c463..0122c463 100644
--- a/0.153/po/quot.sed
+++ b/src/po/quot.sed
diff --git a/0.153/po/remove-potcdate.sin b/src/po/remove-potcdate.sin
index 2436c49e..2436c49e 100644
--- a/0.153/po/remove-potcdate.sin
+++ b/src/po/remove-potcdate.sin
diff --git a/0.153/po/stamp-po b/src/po/stamp-po
index 9788f702..9788f702 100644
--- a/0.153/po/stamp-po
+++ b/src/po/stamp-po
diff --git a/0.153/po/uk.gmo b/src/po/uk.gmo
index aba54ba7..aba54ba7 100644
--- a/0.153/po/uk.gmo
+++ b/src/po/uk.gmo
diff --git a/0.153/po/uk.po b/src/po/uk.po
index fd1e207e..fd1e207e 100644
--- a/0.153/po/uk.po
+++ b/src/po/uk.po
diff --git a/0.153/src/ChangeLog b/src/src/ChangeLog
index ff19b484..ff19b484 100644
--- a/0.153/src/ChangeLog
+++ b/src/src/ChangeLog
diff --git a/0.153/src/Makefile.am b/src/src/Makefile.am
index dc835cbd..dc835cbd 100644
--- a/0.153/src/Makefile.am
+++ b/src/src/Makefile.am
diff --git a/0.153/src/Makefile.in b/src/src/Makefile.in
index bccaaf95..bccaaf95 100644
--- a/0.153/src/Makefile.in
+++ b/src/src/Makefile.in
diff --git a/0.153/src/addr2line.c b/src/src/addr2line.c
index 2fcc1b10..2fcc1b10 100644
--- a/0.153/src/addr2line.c
+++ b/src/src/addr2line.c
diff --git a/0.153/src/ar.c b/src/src/ar.c
index 721f4c34..721f4c34 100644
--- a/0.153/src/ar.c
+++ b/src/src/ar.c
diff --git a/0.153/src/arlib-argp.c b/src/src/arlib-argp.c
index a0e669cf..a0e669cf 100644
--- a/0.153/src/arlib-argp.c
+++ b/src/src/arlib-argp.c
diff --git a/0.153/src/arlib.c b/src/src/arlib.c
index bcf9344b..bcf9344b 100644
--- a/0.153/src/arlib.c
+++ b/src/src/arlib.c
diff --git a/0.153/src/arlib.h b/src/src/arlib.h
index ea77b23e..ea77b23e 100644
--- a/0.153/src/arlib.h
+++ b/src/src/arlib.h
diff --git a/0.153/src/arlib2.c b/src/src/arlib2.c
index 7098fec1..7098fec1 100644
--- a/0.153/src/arlib2.c
+++ b/src/src/arlib2.c
diff --git a/0.153/src/debugpred.h b/src/src/debugpred.h
index 41d46796..41d46796 100644
--- a/0.153/src/debugpred.h
+++ b/src/src/debugpred.h
diff --git a/0.153/src/elf32-i386.script b/src/src/elf32-i386.script
index 2083278f..2083278f 100644
--- a/0.153/src/elf32-i386.script
+++ b/src/src/elf32-i386.script
diff --git a/0.153/src/elfcmp.c b/src/src/elfcmp.c
index 99296d19..99296d19 100644
--- a/0.153/src/elfcmp.c
+++ b/src/src/elfcmp.c
diff --git a/0.153/src/elflint.c b/src/src/elflint.c
index abca8b75..abca8b75 100644
--- a/0.153/src/elflint.c
+++ b/src/src/elflint.c
diff --git a/0.153/src/findtextrel.c b/src/src/findtextrel.c
index 444f3a2b..444f3a2b 100644
--- a/0.153/src/findtextrel.c
+++ b/src/src/findtextrel.c
diff --git a/0.153/src/i386_ld.c b/src/src/i386_ld.c
index 2702ef85..2702ef85 100644
--- a/0.153/src/i386_ld.c
+++ b/src/src/i386_ld.c
diff --git a/0.153/src/ld.c b/src/src/ld.c
index 6384e86a..6384e86a 100644
--- a/0.153/src/ld.c
+++ b/src/src/ld.c
diff --git a/0.153/src/ld.h b/src/src/ld.h
index 72d5b27b..72d5b27b 100644
--- a/0.153/src/ld.h
+++ b/src/src/ld.h
diff --git a/0.153/src/ldgeneric.c b/src/src/ldgeneric.c
index 98bdc225..98bdc225 100644
--- a/0.153/src/ldgeneric.c
+++ b/src/src/ldgeneric.c
diff --git a/0.153/src/ldlex.c b/src/src/ldlex.c
index e1b5b4e9..e1b5b4e9 100644
--- a/0.153/src/ldlex.c
+++ b/src/src/ldlex.c
diff --git a/0.153/src/ldlex.l b/src/src/ldlex.l
index eb15c7be..eb15c7be 100644
--- a/0.153/src/ldlex.l
+++ b/src/src/ldlex.l
diff --git a/0.153/src/ldscript.c b/src/src/ldscript.c
index 05a393bb..05a393bb 100644
--- a/0.153/src/ldscript.c
+++ b/src/src/ldscript.c
diff --git a/0.153/src/ldscript.h b/src/src/ldscript.h
index e33b803d..e33b803d 100644
--- a/0.153/src/ldscript.h
+++ b/src/src/ldscript.h
diff --git a/0.153/src/ldscript.y b/src/src/ldscript.y
index c2f1971a..c2f1971a 100644
--- a/0.153/src/ldscript.y
+++ b/src/src/ldscript.y
diff --git a/0.153/src/libld_elf_i386.map b/src/src/libld_elf_i386.map
index 703af6d8..703af6d8 100644
--- a/0.153/src/libld_elf_i386.map
+++ b/src/src/libld_elf_i386.map
diff --git a/0.153/src/make-debug-archive.in b/src/src/make-debug-archive.in
index c3fcbce4..c3fcbce4 100644
--- a/0.153/src/make-debug-archive.in
+++ b/src/src/make-debug-archive.in
diff --git a/0.153/src/nm.c b/src/src/nm.c
index f33302a4..f33302a4 100644
--- a/0.153/src/nm.c
+++ b/src/src/nm.c
diff --git a/0.153/src/none_ld.c b/src/src/none_ld.c
index fb0f0fb2..fb0f0fb2 100644
--- a/0.153/src/none_ld.c
+++ b/src/src/none_ld.c
diff --git a/0.153/src/objdump.c b/src/src/objdump.c
index e2fcfbf1..e2fcfbf1 100644
--- a/0.153/src/objdump.c
+++ b/src/src/objdump.c
diff --git a/0.153/src/ranlib.c b/src/src/ranlib.c
index d30fc320..d30fc320 100644
--- a/0.153/src/ranlib.c
+++ b/src/src/ranlib.c
diff --git a/0.153/src/readelf.c b/src/src/readelf.c
index 88766889..88766889 100644
--- a/0.153/src/readelf.c
+++ b/src/src/readelf.c
diff --git a/0.153/src/sectionhash.c b/src/src/sectionhash.c
index 68d734e1..68d734e1 100644
--- a/0.153/src/sectionhash.c
+++ b/src/src/sectionhash.c
diff --git a/0.153/src/sectionhash.h b/src/src/sectionhash.h
index ba41ee8c..ba41ee8c 100644
--- a/0.153/src/sectionhash.h
+++ b/src/src/sectionhash.h
diff --git a/0.153/src/size.c b/src/src/size.c
index 14dafc48..14dafc48 100644
--- a/0.153/src/size.c
+++ b/src/src/size.c
diff --git a/0.153/src/strings.c b/src/src/strings.c
index 442901e5..442901e5 100644
--- a/0.153/src/strings.c
+++ b/src/src/strings.c
diff --git a/0.153/src/strip.c b/src/src/strip.c
index 78f683a8..78f683a8 100644
--- a/0.153/src/strip.c
+++ b/src/src/strip.c
diff --git a/0.153/src/symbolhash.c b/src/src/symbolhash.c
index 670cf056..670cf056 100644
--- a/0.153/src/symbolhash.c
+++ b/src/src/symbolhash.c
diff --git a/0.153/src/symbolhash.h b/src/src/symbolhash.h
index 54b95397..54b95397 100644
--- a/0.153/src/symbolhash.h
+++ b/src/src/symbolhash.h
diff --git a/0.153/src/unaligned.h b/src/src/unaligned.h
index ad7c55a5..ad7c55a5 100644
--- a/0.153/src/unaligned.h
+++ b/src/src/unaligned.h
diff --git a/0.153/src/unstrip.c b/src/src/unstrip.c
index f62010a3..f62010a3 100644
--- a/0.153/src/unstrip.c
+++ b/src/src/unstrip.c
diff --git a/0.153/src/versionhash.c b/src/src/versionhash.c
index 6126eb95..6126eb95 100644
--- a/0.153/src/versionhash.c
+++ b/src/src/versionhash.c
diff --git a/0.153/src/versionhash.h b/src/src/versionhash.h
index 63ca1145..63ca1145 100644
--- a/0.153/src/versionhash.h
+++ b/src/src/versionhash.h
diff --git a/0.153/src/xelf.h b/src/src/xelf.h
index 21c7193a..21c7193a 100644
--- a/0.153/src/xelf.h
+++ b/src/src/xelf.h
diff --git a/0.153/src/ylwrap b/src/src/ylwrap
index b77a9ebb..b77a9ebb 100644
--- a/0.153/src/ylwrap
+++ b/src/src/ylwrap
diff --git a/0.153/version.h b/src/version.h
index 684c0dd4..684c0dd4 100644
--- a/0.153/version.h
+++ b/src/version.h