Merge commit 'cb9844add29614cd9e36fe1aeee5fecfa02522a3' into HEAD
diff --git a/0.153/bionic-fixup/error.h b/0.153/bionic-fixup/error.h
deleted file mode 100644
index 1fcd937..0000000
--- a/0.153/bionic-fixup/error.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2013, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ELFUTILS_ERROR_H
-#define ELFUTILS_ERROR_H
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-static inline void __attribute__((noreturn))
-error(int status, int errnum, const char *fmt, ...)
-{
-        va_list lst;
-        va_start(lst, fmt);
-        vfprintf(stderr, fmt, lst);
-        fprintf(stderr, "error %d: %s\n", errnum, strerror(errno));
-        va_end(lst);
-        exit(status);
-}
-
-#endif /* ELFUTILS_ERROR_H */
diff --git a/0.153/host-darwin-fixup/AndroidFixup.h b/0.153/host-darwin-fixup/AndroidFixup.h
deleted file mode 100644
index 0d43c0b..0000000
--- a/0.153/host-darwin-fixup/AndroidFixup.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2013, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_FIXUP_H
-#define ANDROID_FIXUP_H
-
-#define loff_t off_t
-#define off64_t off_t
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <locale.h> //LC_MESSAGES
-
-#ifndef TEMP_FAILURE_RETRY
-#define TEMP_FAILURE_RETRY(exp) ({         \
-    typeof (exp) _rc;                      \
-    do {                                   \
-        _rc = (exp);                       \
-    } while (_rc == -1 && errno == EINTR); \
-    _rc; })
-#endif
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
-static inline size_t strnlen (const char *__string, size_t __maxlen)
-{
-        int len = 0;
-        while (__maxlen-- && *__string++)
-                len++;
-        return len;
-}
-#endif
-
-static inline void *mempcpy (void * __dest, const void * __src, size_t __n)
-{
-        memcpy(__dest, __src, __n);
-        return ((char *)__dest) + __n;
-}
-
-#define __mempcpy mempcpy
-
-#define dgettext(domainname, msgid)  dcgettext (domainname, msgid, LC_MESSAGES)
-
-static inline void __attribute__((noreturn)) error(int status, int errnum, const char *fmt, ...)
-{
-        va_list lst;
-        va_start(lst, fmt);
-        vfprintf(stderr, fmt, lst);
-        fprintf(stderr, "error %d: %s\n", errnum, strerror(errno));
-        va_end(lst);
-        exit(status);
-}
-
-static inline char *dcgettext (char *__domainname, char *__msgid, int __category)
-{
-        error(EXIT_FAILURE, 0, "%s not implemented!", __FUNCTION__);
-        return NULL;
-}
-
-/* workaround for canonicalize_file_name */
-#define canonicalize_file_name(path) realpath(path, NULL)
-
-/* workaround for open64 */
-#define open64(path, flags)     open(path, flags)
-
-/* rawmemchr */
-static inline void *rawmemchr(const void *s, int c)
-{
-    const unsigned char *ptr = s;
-    while (1) {
-        if (*ptr == c) return (void *) ptr;
-        ptr++;
-    }
-}
-
-#define strndup(str, size) strdup(str)
-
-static void tdestroy(void *root, void (*free_node)(void *nodep))
-{
-}
-
-#endif /* ANDROID_FIXUP_H */
diff --git a/0.153/host-darwin-fixup/argp.h b/0.153/host-darwin-fixup/argp.h
deleted file mode 100644
index 8a8e1bb..0000000
--- a/0.153/host-darwin-fixup/argp.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2013, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ELFUTILS_ARGP_H
-#define ELFUTILS_ARGP_H
-
-/* intentionally blank */
-
-#endif /* ELFUTILS_ARGP_H */
diff --git a/0.153/host-darwin-fixup/byteswap.h b/0.153/host-darwin-fixup/byteswap.h
deleted file mode 100644
index a8d27d4..0000000
--- a/0.153/host-darwin-fixup/byteswap.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2013, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ELFUTILS_BYTESWAP_H
-#define ELFUTILS_BYTESWAP_H
-
-static inline unsigned short bswap_16(unsigned short val)
-{
-        return ((val & 0xff) << 8) | ((val >> 8) & 0xff);
-}
-
-static inline unsigned long bswap_32(unsigned long val)
-{
-        return bswap_16((unsigned short)val) << 16 |
-               bswap_16((unsigned short)(val >> 16));
-}
-
-static inline unsigned long long bswap_64(unsigned long long val)
-{
-        return ((((unsigned long long)bswap_32(val)) << 32) |
-                (((unsigned long long)bswap_32(val >> 32)) & 0xffffffffULL));
-}
-
-#endif /* ELFUTILS_BYTESWAP_H */
diff --git a/0.153/host-darwin-fixup/endian.h b/0.153/host-darwin-fixup/endian.h
deleted file mode 100644
index 14bb32d..0000000
--- a/0.153/host-darwin-fixup/endian.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2013, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ELFUTILS_ENDIAN_H
-#define ELFUTILS_ENDIAN_H
-
-#define __LITTLE_ENDIAN (1234)
-#define __BIG_ENDIAN    (4321)
-#define __BYTE_ORDER    __LITTLE_ENDIAN
-
-#endif /* ELFUTILS_ENDIAN_H */
diff --git a/0.153/host-darwin-fixup/error.h b/0.153/host-darwin-fixup/error.h
deleted file mode 100644
index 3c9569f..0000000
--- a/0.153/host-darwin-fixup/error.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2013, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ELFUTILS_ERROR_H
-#define ELFUTILS_ERROR_H
-
-/* intentionally blank */
-
-#endif /* ELFUTILS_ERROR_H */
diff --git a/0.153/host-darwin-fixup/libintl.h b/0.153/host-darwin-fixup/libintl.h
deleted file mode 100644
index fe94348..0000000
--- a/0.153/host-darwin-fixup/libintl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2013, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ELFUTILS_LIBINTL_H
-#define ELFUTILS_LIBINTL_H
-
-/* intentionally blank */
-
-#endif /* ELFUTILS_LIBINTL_H */
diff --git a/0.153/host-linux-fixup/AndroidFixup.h b/0.153/host-linux-fixup/AndroidFixup.h
deleted file mode 100644
index ea4d5a1..0000000
--- a/0.153/host-linux-fixup/AndroidFixup.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2013, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_FIXUP_H
-#define ANDROID_FIXUP_H
-
-/* intentionally blank */
-
-#endif /* ANDROID_FIXUP_H */
diff --git a/elfutils/libdw.h b/elfutils/libdw.h
deleted file mode 100644
index e001b7a..0000000
--- 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 4ea2796..0000000
--- 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 684c0dd..0000000
--- 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 0000000..804db27
--- /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 0000000..0d7cdaf
--- /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 0000000..9e568ce
--- /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
similarity index 100%
rename from 0.153/ABOUT-NLS
rename to src/ABOUT-NLS
diff --git a/0.153/AUTHORS b/src/AUTHORS
similarity index 100%
rename from 0.153/AUTHORS
rename to src/AUTHORS
diff --git a/0.153/Android.mk b/src/Android.mk
similarity index 100%
rename from 0.153/Android.mk
rename to src/Android.mk
diff --git a/0.153/COPYING b/src/COPYING
similarity index 100%
rename from 0.153/COPYING
rename to src/COPYING
diff --git a/0.153/ChangeLog b/src/ChangeLog
similarity index 100%
rename from 0.153/ChangeLog
rename to src/ChangeLog
diff --git a/0.153/EXCEPTION b/src/EXCEPTION
similarity index 100%
rename from 0.153/EXCEPTION
rename to src/EXCEPTION
diff --git a/0.153/GPG-KEY b/src/GPG-KEY
similarity index 100%
rename from 0.153/GPG-KEY
rename to src/GPG-KEY
diff --git a/0.153/INSTALL b/src/INSTALL
similarity index 100%
rename from 0.153/INSTALL
rename to src/INSTALL
diff --git a/0.153/Makefile.am b/src/Makefile.am
similarity index 100%
rename from 0.153/Makefile.am
rename to src/Makefile.am
diff --git a/0.153/Makefile.in b/src/Makefile.in
similarity index 100%
rename from 0.153/Makefile.in
rename to src/Makefile.in
diff --git a/0.153/NEWS b/src/NEWS
similarity index 100%
rename from 0.153/NEWS
rename to src/NEWS
diff --git a/0.153/NOTES b/src/NOTES
similarity index 100%
rename from 0.153/NOTES
rename to src/NOTES
diff --git a/0.153/README b/src/README
similarity index 100%
rename from 0.153/README
rename to src/README
diff --git a/0.153/THANKS b/src/THANKS
similarity index 100%
rename from 0.153/THANKS
rename to src/THANKS
diff --git a/0.153/TODO b/src/TODO
similarity index 100%
rename from 0.153/TODO
rename to src/TODO
diff --git a/0.153/aclocal.m4 b/src/aclocal.m4
similarity index 100%
rename from 0.153/aclocal.m4
rename to src/aclocal.m4
diff --git a/0.153/backends/ChangeLog b/src/backends/ChangeLog
similarity index 100%
rename from 0.153/backends/ChangeLog
rename to src/backends/ChangeLog
diff --git a/0.153/backends/Makefile.am b/src/backends/Makefile.am
similarity index 100%
rename from 0.153/backends/Makefile.am
rename to src/backends/Makefile.am
diff --git a/0.153/backends/Makefile.in b/src/backends/Makefile.in
similarity index 100%
rename from 0.153/backends/Makefile.in
rename to src/backends/Makefile.in
diff --git a/0.153/backends/alpha_auxv.c b/src/backends/alpha_auxv.c
similarity index 100%
rename from 0.153/backends/alpha_auxv.c
rename to src/backends/alpha_auxv.c
diff --git a/0.153/backends/alpha_corenote.c b/src/backends/alpha_corenote.c
similarity index 100%
rename from 0.153/backends/alpha_corenote.c
rename to src/backends/alpha_corenote.c
diff --git a/0.153/backends/alpha_init.c b/src/backends/alpha_init.c
similarity index 100%
rename from 0.153/backends/alpha_init.c
rename to src/backends/alpha_init.c
diff --git a/0.153/backends/alpha_regs.c b/src/backends/alpha_regs.c
similarity index 100%
rename from 0.153/backends/alpha_regs.c
rename to src/backends/alpha_regs.c
diff --git a/0.153/backends/alpha_reloc.def b/src/backends/alpha_reloc.def
similarity index 100%
rename from 0.153/backends/alpha_reloc.def
rename to src/backends/alpha_reloc.def
diff --git a/0.153/backends/alpha_retval.c b/src/backends/alpha_retval.c
similarity index 100%
rename from 0.153/backends/alpha_retval.c
rename to src/backends/alpha_retval.c
diff --git a/0.153/backends/alpha_symbol.c b/src/backends/alpha_symbol.c
similarity index 100%
rename from 0.153/backends/alpha_symbol.c
rename to src/backends/alpha_symbol.c
diff --git a/0.153/backends/arm_attrs.c b/src/backends/arm_attrs.c
similarity index 100%
rename from 0.153/backends/arm_attrs.c
rename to src/backends/arm_attrs.c
diff --git a/0.153/backends/arm_auxv.c b/src/backends/arm_auxv.c
similarity index 100%
rename from 0.153/backends/arm_auxv.c
rename to src/backends/arm_auxv.c
diff --git a/0.153/backends/arm_corenote.c b/src/backends/arm_corenote.c
similarity index 100%
rename from 0.153/backends/arm_corenote.c
rename to src/backends/arm_corenote.c
diff --git a/0.153/backends/arm_init.c b/src/backends/arm_init.c
similarity index 100%
rename from 0.153/backends/arm_init.c
rename to src/backends/arm_init.c
diff --git a/0.153/backends/arm_regs.c b/src/backends/arm_regs.c
similarity index 100%
rename from 0.153/backends/arm_regs.c
rename to src/backends/arm_regs.c
diff --git a/0.153/backends/arm_reloc.def b/src/backends/arm_reloc.def
similarity index 100%
rename from 0.153/backends/arm_reloc.def
rename to src/backends/arm_reloc.def
diff --git a/0.153/backends/arm_retval.c b/src/backends/arm_retval.c
similarity index 100%
rename from 0.153/backends/arm_retval.c
rename to src/backends/arm_retval.c
diff --git a/0.153/backends/arm_symbol.c b/src/backends/arm_symbol.c
similarity index 100%
rename from 0.153/backends/arm_symbol.c
rename to src/backends/arm_symbol.c
diff --git a/0.153/backends/common-reloc.c b/src/backends/common-reloc.c
similarity index 100%
rename from 0.153/backends/common-reloc.c
rename to src/backends/common-reloc.c
diff --git a/0.153/backends/i386_auxv.c b/src/backends/i386_auxv.c
similarity index 100%
rename from 0.153/backends/i386_auxv.c
rename to src/backends/i386_auxv.c
diff --git a/0.153/backends/i386_cfi.c b/src/backends/i386_cfi.c
similarity index 100%
rename from 0.153/backends/i386_cfi.c
rename to src/backends/i386_cfi.c
diff --git a/0.153/backends/i386_corenote.c b/src/backends/i386_corenote.c
similarity index 100%
rename from 0.153/backends/i386_corenote.c
rename to src/backends/i386_corenote.c
diff --git a/0.153/backends/i386_init.c b/src/backends/i386_init.c
similarity index 100%
rename from 0.153/backends/i386_init.c
rename to src/backends/i386_init.c
diff --git a/0.153/backends/i386_regs.c b/src/backends/i386_regs.c
similarity index 100%
rename from 0.153/backends/i386_regs.c
rename to src/backends/i386_regs.c
diff --git a/0.153/backends/i386_reloc.def b/src/backends/i386_reloc.def
similarity index 100%
rename from 0.153/backends/i386_reloc.def
rename to src/backends/i386_reloc.def
diff --git a/0.153/backends/i386_retval.c b/src/backends/i386_retval.c
similarity index 100%
rename from 0.153/backends/i386_retval.c
rename to src/backends/i386_retval.c
diff --git a/0.153/backends/i386_symbol.c b/src/backends/i386_symbol.c
similarity index 100%
rename from 0.153/backends/i386_symbol.c
rename to src/backends/i386_symbol.c
diff --git a/0.153/backends/i386_syscall.c b/src/backends/i386_syscall.c
similarity index 100%
rename from 0.153/backends/i386_syscall.c
rename to src/backends/i386_syscall.c
diff --git a/0.153/backends/ia64_init.c b/src/backends/ia64_init.c
similarity index 100%
rename from 0.153/backends/ia64_init.c
rename to src/backends/ia64_init.c
diff --git a/0.153/backends/ia64_regs.c b/src/backends/ia64_regs.c
similarity index 100%
rename from 0.153/backends/ia64_regs.c
rename to src/backends/ia64_regs.c
diff --git a/0.153/backends/ia64_reloc.def b/src/backends/ia64_reloc.def
similarity index 100%
rename from 0.153/backends/ia64_reloc.def
rename to src/backends/ia64_reloc.def
diff --git a/0.153/backends/ia64_retval.c b/src/backends/ia64_retval.c
similarity index 100%
rename from 0.153/backends/ia64_retval.c
rename to src/backends/ia64_retval.c
diff --git a/0.153/backends/ia64_symbol.c b/src/backends/ia64_symbol.c
similarity index 100%
rename from 0.153/backends/ia64_symbol.c
rename to src/backends/ia64_symbol.c
diff --git a/0.153/backends/libebl_CPU.h b/src/backends/libebl_CPU.h
similarity index 100%
rename from 0.153/backends/libebl_CPU.h
rename to src/backends/libebl_CPU.h
diff --git a/0.153/backends/linux-core-note.c b/src/backends/linux-core-note.c
similarity index 100%
rename from 0.153/backends/linux-core-note.c
rename to src/backends/linux-core-note.c
diff --git a/0.153/backends/ppc64_corenote.c b/src/backends/ppc64_corenote.c
similarity index 100%
rename from 0.153/backends/ppc64_corenote.c
rename to src/backends/ppc64_corenote.c
diff --git a/0.153/backends/ppc64_init.c b/src/backends/ppc64_init.c
similarity index 100%
rename from 0.153/backends/ppc64_init.c
rename to src/backends/ppc64_init.c
diff --git a/0.153/backends/ppc64_reloc.def b/src/backends/ppc64_reloc.def
similarity index 100%
rename from 0.153/backends/ppc64_reloc.def
rename to src/backends/ppc64_reloc.def
diff --git a/0.153/backends/ppc64_retval.c b/src/backends/ppc64_retval.c
similarity index 100%
rename from 0.153/backends/ppc64_retval.c
rename to src/backends/ppc64_retval.c
diff --git a/0.153/backends/ppc64_symbol.c b/src/backends/ppc64_symbol.c
similarity index 100%
rename from 0.153/backends/ppc64_symbol.c
rename to src/backends/ppc64_symbol.c
diff --git a/0.153/backends/ppc_attrs.c b/src/backends/ppc_attrs.c
similarity index 100%
rename from 0.153/backends/ppc_attrs.c
rename to src/backends/ppc_attrs.c
diff --git a/0.153/backends/ppc_auxv.c b/src/backends/ppc_auxv.c
similarity index 100%
rename from 0.153/backends/ppc_auxv.c
rename to src/backends/ppc_auxv.c
diff --git a/0.153/backends/ppc_corenote.c b/src/backends/ppc_corenote.c
similarity index 100%
rename from 0.153/backends/ppc_corenote.c
rename to src/backends/ppc_corenote.c
diff --git a/0.153/backends/ppc_init.c b/src/backends/ppc_init.c
similarity index 100%
rename from 0.153/backends/ppc_init.c
rename to src/backends/ppc_init.c
diff --git a/0.153/backends/ppc_regs.c b/src/backends/ppc_regs.c
similarity index 100%
rename from 0.153/backends/ppc_regs.c
rename to src/backends/ppc_regs.c
diff --git a/0.153/backends/ppc_reloc.def b/src/backends/ppc_reloc.def
similarity index 100%
rename from 0.153/backends/ppc_reloc.def
rename to src/backends/ppc_reloc.def
diff --git a/0.153/backends/ppc_retval.c b/src/backends/ppc_retval.c
similarity index 100%
rename from 0.153/backends/ppc_retval.c
rename to src/backends/ppc_retval.c
diff --git a/0.153/backends/ppc_symbol.c b/src/backends/ppc_symbol.c
similarity index 100%
rename from 0.153/backends/ppc_symbol.c
rename to src/backends/ppc_symbol.c
diff --git a/0.153/backends/ppc_syscall.c b/src/backends/ppc_syscall.c
similarity index 100%
rename from 0.153/backends/ppc_syscall.c
rename to src/backends/ppc_syscall.c
diff --git a/0.153/backends/s390_init.c b/src/backends/s390_init.c
similarity index 100%
rename from 0.153/backends/s390_init.c
rename to src/backends/s390_init.c
diff --git a/0.153/backends/s390_regs.c b/src/backends/s390_regs.c
similarity index 100%
rename from 0.153/backends/s390_regs.c
rename to src/backends/s390_regs.c
diff --git a/0.153/backends/s390_reloc.def b/src/backends/s390_reloc.def
similarity index 100%
rename from 0.153/backends/s390_reloc.def
rename to src/backends/s390_reloc.def
diff --git a/0.153/backends/s390_retval.c b/src/backends/s390_retval.c
similarity index 100%
rename from 0.153/backends/s390_retval.c
rename to src/backends/s390_retval.c
diff --git a/0.153/backends/s390_symbol.c b/src/backends/s390_symbol.c
similarity index 100%
rename from 0.153/backends/s390_symbol.c
rename to src/backends/s390_symbol.c
diff --git a/0.153/backends/sh_corenote.c b/src/backends/sh_corenote.c
similarity index 100%
rename from 0.153/backends/sh_corenote.c
rename to src/backends/sh_corenote.c
diff --git a/0.153/backends/sh_init.c b/src/backends/sh_init.c
similarity index 100%
rename from 0.153/backends/sh_init.c
rename to src/backends/sh_init.c
diff --git a/0.153/backends/sh_regs.c b/src/backends/sh_regs.c
similarity index 100%
rename from 0.153/backends/sh_regs.c
rename to src/backends/sh_regs.c
diff --git a/0.153/backends/sh_reloc.def b/src/backends/sh_reloc.def
similarity index 100%
rename from 0.153/backends/sh_reloc.def
rename to src/backends/sh_reloc.def
diff --git a/0.153/backends/sh_retval.c b/src/backends/sh_retval.c
similarity index 100%
rename from 0.153/backends/sh_retval.c
rename to src/backends/sh_retval.c
diff --git a/0.153/backends/sh_symbol.c b/src/backends/sh_symbol.c
similarity index 100%
rename from 0.153/backends/sh_symbol.c
rename to src/backends/sh_symbol.c
diff --git a/0.153/backends/sparc64_corenote.c b/src/backends/sparc64_corenote.c
similarity index 100%
rename from 0.153/backends/sparc64_corenote.c
rename to src/backends/sparc64_corenote.c
diff --git a/0.153/backends/sparc_auxv.c b/src/backends/sparc_auxv.c
similarity index 100%
rename from 0.153/backends/sparc_auxv.c
rename to src/backends/sparc_auxv.c
diff --git a/0.153/backends/sparc_corenote.c b/src/backends/sparc_corenote.c
similarity index 100%
rename from 0.153/backends/sparc_corenote.c
rename to src/backends/sparc_corenote.c
diff --git a/0.153/backends/sparc_init.c b/src/backends/sparc_init.c
similarity index 100%
rename from 0.153/backends/sparc_init.c
rename to src/backends/sparc_init.c
diff --git a/0.153/backends/sparc_regs.c b/src/backends/sparc_regs.c
similarity index 100%
rename from 0.153/backends/sparc_regs.c
rename to src/backends/sparc_regs.c
diff --git a/0.153/backends/sparc_reloc.def b/src/backends/sparc_reloc.def
similarity index 100%
rename from 0.153/backends/sparc_reloc.def
rename to src/backends/sparc_reloc.def
diff --git a/0.153/backends/sparc_retval.c b/src/backends/sparc_retval.c
similarity index 100%
rename from 0.153/backends/sparc_retval.c
rename to src/backends/sparc_retval.c
diff --git a/0.153/backends/sparc_symbol.c b/src/backends/sparc_symbol.c
similarity index 100%
rename from 0.153/backends/sparc_symbol.c
rename to src/backends/sparc_symbol.c
diff --git a/0.153/backends/x86_64_cfi.c b/src/backends/x86_64_cfi.c
similarity index 100%
rename from 0.153/backends/x86_64_cfi.c
rename to src/backends/x86_64_cfi.c
diff --git a/0.153/backends/x86_64_corenote.c b/src/backends/x86_64_corenote.c
similarity index 100%
rename from 0.153/backends/x86_64_corenote.c
rename to src/backends/x86_64_corenote.c
diff --git a/0.153/backends/x86_64_init.c b/src/backends/x86_64_init.c
similarity index 100%
rename from 0.153/backends/x86_64_init.c
rename to src/backends/x86_64_init.c
diff --git a/0.153/backends/x86_64_regs.c b/src/backends/x86_64_regs.c
similarity index 100%
rename from 0.153/backends/x86_64_regs.c
rename to src/backends/x86_64_regs.c
diff --git a/0.153/backends/x86_64_reloc.def b/src/backends/x86_64_reloc.def
similarity index 100%
rename from 0.153/backends/x86_64_reloc.def
rename to src/backends/x86_64_reloc.def
diff --git a/0.153/backends/x86_64_retval.c b/src/backends/x86_64_retval.c
similarity index 100%
rename from 0.153/backends/x86_64_retval.c
rename to src/backends/x86_64_retval.c
diff --git a/0.153/backends/x86_64_symbol.c b/src/backends/x86_64_symbol.c
similarity index 100%
rename from 0.153/backends/x86_64_symbol.c
rename to src/backends/x86_64_symbol.c
diff --git a/0.153/backends/x86_64_syscall.c b/src/backends/x86_64_syscall.c
similarity index 100%
rename from 0.153/backends/x86_64_syscall.c
rename to src/backends/x86_64_syscall.c
diff --git a/0.153/backends/x86_corenote.c b/src/backends/x86_corenote.c
similarity index 100%
rename from 0.153/backends/x86_corenote.c
rename to src/backends/x86_corenote.c
diff --git a/0.153/bionic-fixup/AndroidFixup.h b/src/bionic-fixup/AndroidFixup.h
similarity index 100%
rename from 0.153/bionic-fixup/AndroidFixup.h
rename to src/bionic-fixup/AndroidFixup.h
diff --git a/0.153/bionic-fixup/argp.h b/src/bionic-fixup/argp.h
similarity index 100%
rename from 0.153/bionic-fixup/argp.h
rename to src/bionic-fixup/argp.h
diff --git a/0.153/bionic-fixup/libintl.h b/src/bionic-fixup/libintl.h
similarity index 100%
rename from 0.153/bionic-fixup/libintl.h
rename to src/bionic-fixup/libintl.h
diff --git a/0.153/config.h b/src/config.h
similarity index 100%
rename from 0.153/config.h
rename to src/config.h
diff --git a/0.153/config.h.in b/src/config.h.in
similarity index 100%
rename from 0.153/config.h.in
rename to src/config.h.in
diff --git a/0.153/config/ChangeLog b/src/config/ChangeLog
similarity index 100%
rename from 0.153/config/ChangeLog
rename to src/config/ChangeLog
diff --git a/0.153/config/Makefile.am b/src/config/Makefile.am
similarity index 100%
rename from 0.153/config/Makefile.am
rename to src/config/Makefile.am
diff --git a/0.153/config/Makefile.in b/src/config/Makefile.in
similarity index 100%
rename from 0.153/config/Makefile.in
rename to src/config/Makefile.in
diff --git a/0.153/config/config.guess b/src/config/config.guess
similarity index 100%
rename from 0.153/config/config.guess
rename to src/config/config.guess
diff --git a/0.153/config/config.sub b/src/config/config.sub
similarity index 100%
rename from 0.153/config/config.sub
rename to src/config/config.sub
diff --git a/0.153/config/depcomp b/src/config/depcomp
similarity index 100%
rename from 0.153/config/depcomp
rename to src/config/depcomp
diff --git a/0.153/config/elfutils.spec.in b/src/config/elfutils.spec.in
similarity index 100%
rename from 0.153/config/elfutils.spec.in
rename to src/config/elfutils.spec.in
diff --git a/0.153/config/eu.am b/src/config/eu.am
similarity index 100%
rename from 0.153/config/eu.am
rename to src/config/eu.am
diff --git a/0.153/config/install-sh b/src/config/install-sh
similarity index 100%
rename from 0.153/config/install-sh
rename to src/config/install-sh
diff --git a/0.153/config/known-dwarf.awk b/src/config/known-dwarf.awk
similarity index 100%
rename from 0.153/config/known-dwarf.awk
rename to src/config/known-dwarf.awk
diff --git a/0.153/config/missing b/src/config/missing
similarity index 100%
rename from 0.153/config/missing
rename to src/config/missing
diff --git a/0.153/config/version.h.in b/src/config/version.h.in
similarity index 100%
rename from 0.153/config/version.h.in
rename to src/config/version.h.in
diff --git a/0.153/config/ylwrap b/src/config/ylwrap
similarity index 100%
rename from 0.153/config/ylwrap
rename to src/config/ylwrap
diff --git a/0.153/configure b/src/configure
similarity index 100%
rename from 0.153/configure
rename to src/configure
diff --git a/0.153/configure.ac b/src/configure.ac
similarity index 100%
rename from 0.153/configure.ac
rename to src/configure.ac
diff --git a/0.153/elfutils.spec b/src/elfutils.spec
similarity index 100%
rename from 0.153/elfutils.spec
rename to src/elfutils.spec
diff --git a/0.153/lib/ChangeLog b/src/lib/ChangeLog
similarity index 100%
rename from 0.153/lib/ChangeLog
rename to src/lib/ChangeLog
diff --git a/0.153/lib/Makefile.am b/src/lib/Makefile.am
similarity index 100%
rename from 0.153/lib/Makefile.am
rename to src/lib/Makefile.am
diff --git a/0.153/lib/Makefile.in b/src/lib/Makefile.in
similarity index 100%
rename from 0.153/lib/Makefile.in
rename to src/lib/Makefile.in
diff --git a/0.153/lib/color.c b/src/lib/color.c
similarity index 100%
rename from 0.153/lib/color.c
rename to src/lib/color.c
diff --git a/0.153/lib/crc32.c b/src/lib/crc32.c
similarity index 100%
rename from 0.153/lib/crc32.c
rename to src/lib/crc32.c
diff --git a/0.153/lib/crc32_file.c b/src/lib/crc32_file.c
similarity index 100%
rename from 0.153/lib/crc32_file.c
rename to src/lib/crc32_file.c
diff --git a/0.153/lib/dynamicsizehash.c b/src/lib/dynamicsizehash.c
similarity index 100%
rename from 0.153/lib/dynamicsizehash.c
rename to src/lib/dynamicsizehash.c
diff --git a/0.153/lib/dynamicsizehash.h b/src/lib/dynamicsizehash.h
similarity index 100%
rename from 0.153/lib/dynamicsizehash.h
rename to src/lib/dynamicsizehash.h
diff --git a/0.153/lib/eu-config.h b/src/lib/eu-config.h
similarity index 100%
rename from 0.153/lib/eu-config.h
rename to src/lib/eu-config.h
diff --git a/0.153/lib/fixedsizehash.h b/src/lib/fixedsizehash.h
similarity index 100%
rename from 0.153/lib/fixedsizehash.h
rename to src/lib/fixedsizehash.h
diff --git a/0.153/lib/list.h b/src/lib/list.h
similarity index 100%
rename from 0.153/lib/list.h
rename to src/lib/list.h
diff --git a/0.153/lib/md5.c b/src/lib/md5.c
similarity index 100%
rename from 0.153/lib/md5.c
rename to src/lib/md5.c
diff --git a/0.153/lib/md5.h b/src/lib/md5.h
similarity index 100%
rename from 0.153/lib/md5.h
rename to src/lib/md5.h
diff --git a/0.153/lib/next_prime.c b/src/lib/next_prime.c
similarity index 100%
rename from 0.153/lib/next_prime.c
rename to src/lib/next_prime.c
diff --git a/0.153/lib/sha1.c b/src/lib/sha1.c
similarity index 100%
rename from 0.153/lib/sha1.c
rename to src/lib/sha1.c
diff --git a/0.153/lib/sha1.h b/src/lib/sha1.h
similarity index 100%
rename from 0.153/lib/sha1.h
rename to src/lib/sha1.h
diff --git a/0.153/lib/system.h b/src/lib/system.h
similarity index 100%
rename from 0.153/lib/system.h
rename to src/lib/system.h
diff --git a/0.153/lib/xmalloc.c b/src/lib/xmalloc.c
similarity index 100%
rename from 0.153/lib/xmalloc.c
rename to src/lib/xmalloc.c
diff --git a/0.153/lib/xstrdup.c b/src/lib/xstrdup.c
similarity index 100%
rename from 0.153/lib/xstrdup.c
rename to src/lib/xstrdup.c
diff --git a/0.153/lib/xstrndup.c b/src/lib/xstrndup.c
similarity index 100%
rename from 0.153/lib/xstrndup.c
rename to src/lib/xstrndup.c
diff --git a/0.153/libasm/ChangeLog b/src/libasm/ChangeLog
similarity index 100%
rename from 0.153/libasm/ChangeLog
rename to src/libasm/ChangeLog
diff --git a/0.153/libasm/Makefile.am b/src/libasm/Makefile.am
similarity index 100%
rename from 0.153/libasm/Makefile.am
rename to src/libasm/Makefile.am
diff --git a/0.153/libasm/Makefile.in b/src/libasm/Makefile.in
similarity index 100%
rename from 0.153/libasm/Makefile.in
rename to src/libasm/Makefile.in
diff --git a/0.153/libasm/asm_abort.c b/src/libasm/asm_abort.c
similarity index 100%
rename from 0.153/libasm/asm_abort.c
rename to src/libasm/asm_abort.c
diff --git a/0.153/libasm/asm_addint16.c b/src/libasm/asm_addint16.c
similarity index 100%
rename from 0.153/libasm/asm_addint16.c
rename to src/libasm/asm_addint16.c
diff --git a/0.153/libasm/asm_addint32.c b/src/libasm/asm_addint32.c
similarity index 100%
rename from 0.153/libasm/asm_addint32.c
rename to src/libasm/asm_addint32.c
diff --git a/0.153/libasm/asm_addint64.c b/src/libasm/asm_addint64.c
similarity index 100%
rename from 0.153/libasm/asm_addint64.c
rename to src/libasm/asm_addint64.c
diff --git a/0.153/libasm/asm_addint8.c b/src/libasm/asm_addint8.c
similarity index 100%
rename from 0.153/libasm/asm_addint8.c
rename to src/libasm/asm_addint8.c
diff --git a/0.153/libasm/asm_addsleb128.c b/src/libasm/asm_addsleb128.c
similarity index 100%
rename from 0.153/libasm/asm_addsleb128.c
rename to src/libasm/asm_addsleb128.c
diff --git a/0.153/libasm/asm_addstrz.c b/src/libasm/asm_addstrz.c
similarity index 100%
rename from 0.153/libasm/asm_addstrz.c
rename to src/libasm/asm_addstrz.c
diff --git a/0.153/libasm/asm_adduint16.c b/src/libasm/asm_adduint16.c
similarity index 100%
rename from 0.153/libasm/asm_adduint16.c
rename to src/libasm/asm_adduint16.c
diff --git a/0.153/libasm/asm_adduint32.c b/src/libasm/asm_adduint32.c
similarity index 100%
rename from 0.153/libasm/asm_adduint32.c
rename to src/libasm/asm_adduint32.c
diff --git a/0.153/libasm/asm_adduint64.c b/src/libasm/asm_adduint64.c
similarity index 100%
rename from 0.153/libasm/asm_adduint64.c
rename to src/libasm/asm_adduint64.c
diff --git a/0.153/libasm/asm_adduint8.c b/src/libasm/asm_adduint8.c
similarity index 100%
rename from 0.153/libasm/asm_adduint8.c
rename to src/libasm/asm_adduint8.c
diff --git a/0.153/libasm/asm_adduleb128.c b/src/libasm/asm_adduleb128.c
similarity index 100%
rename from 0.153/libasm/asm_adduleb128.c
rename to src/libasm/asm_adduleb128.c
diff --git a/0.153/libasm/asm_align.c b/src/libasm/asm_align.c
similarity index 100%
rename from 0.153/libasm/asm_align.c
rename to src/libasm/asm_align.c
diff --git a/0.153/libasm/asm_begin.c b/src/libasm/asm_begin.c
similarity index 100%
rename from 0.153/libasm/asm_begin.c
rename to src/libasm/asm_begin.c
diff --git a/0.153/libasm/asm_end.c b/src/libasm/asm_end.c
similarity index 100%
rename from 0.153/libasm/asm_end.c
rename to src/libasm/asm_end.c
diff --git a/0.153/libasm/asm_error.c b/src/libasm/asm_error.c
similarity index 100%
rename from 0.153/libasm/asm_error.c
rename to src/libasm/asm_error.c
diff --git a/0.153/libasm/asm_fill.c b/src/libasm/asm_fill.c
similarity index 100%
rename from 0.153/libasm/asm_fill.c
rename to src/libasm/asm_fill.c
diff --git a/0.153/libasm/asm_getelf.c b/src/libasm/asm_getelf.c
similarity index 100%
rename from 0.153/libasm/asm_getelf.c
rename to src/libasm/asm_getelf.c
diff --git a/0.153/libasm/asm_newabssym.c b/src/libasm/asm_newabssym.c
similarity index 100%
rename from 0.153/libasm/asm_newabssym.c
rename to src/libasm/asm_newabssym.c
diff --git a/0.153/libasm/asm_newcomsym.c b/src/libasm/asm_newcomsym.c
similarity index 100%
rename from 0.153/libasm/asm_newcomsym.c
rename to src/libasm/asm_newcomsym.c
diff --git a/0.153/libasm/asm_newscn.c b/src/libasm/asm_newscn.c
similarity index 100%
rename from 0.153/libasm/asm_newscn.c
rename to src/libasm/asm_newscn.c
diff --git a/0.153/libasm/asm_newscn_ingrp.c b/src/libasm/asm_newscn_ingrp.c
similarity index 100%
rename from 0.153/libasm/asm_newscn_ingrp.c
rename to src/libasm/asm_newscn_ingrp.c
diff --git a/0.153/libasm/asm_newscngrp.c b/src/libasm/asm_newscngrp.c
similarity index 100%
rename from 0.153/libasm/asm_newscngrp.c
rename to src/libasm/asm_newscngrp.c
diff --git a/0.153/libasm/asm_newsubscn.c b/src/libasm/asm_newsubscn.c
similarity index 100%
rename from 0.153/libasm/asm_newsubscn.c
rename to src/libasm/asm_newsubscn.c
diff --git a/0.153/libasm/asm_newsym.c b/src/libasm/asm_newsym.c
similarity index 100%
rename from 0.153/libasm/asm_newsym.c
rename to src/libasm/asm_newsym.c
diff --git a/0.153/libasm/asm_scngrp_newsignature.c b/src/libasm/asm_scngrp_newsignature.c
similarity index 100%
rename from 0.153/libasm/asm_scngrp_newsignature.c
rename to src/libasm/asm_scngrp_newsignature.c
diff --git a/0.153/libasm/disasm_begin.c b/src/libasm/disasm_begin.c
similarity index 100%
rename from 0.153/libasm/disasm_begin.c
rename to src/libasm/disasm_begin.c
diff --git a/0.153/libasm/disasm_cb.c b/src/libasm/disasm_cb.c
similarity index 100%
rename from 0.153/libasm/disasm_cb.c
rename to src/libasm/disasm_cb.c
diff --git a/0.153/libasm/disasm_end.c b/src/libasm/disasm_end.c
similarity index 100%
rename from 0.153/libasm/disasm_end.c
rename to src/libasm/disasm_end.c
diff --git a/0.153/libasm/disasm_str.c b/src/libasm/disasm_str.c
similarity index 100%
rename from 0.153/libasm/disasm_str.c
rename to src/libasm/disasm_str.c
diff --git a/0.153/libasm/libasm.h b/src/libasm/libasm.h
similarity index 100%
rename from 0.153/libasm/libasm.h
rename to src/libasm/libasm.h
diff --git a/0.153/libasm/libasm.map b/src/libasm/libasm.map
similarity index 100%
rename from 0.153/libasm/libasm.map
rename to src/libasm/libasm.map
diff --git a/0.153/libasm/libasmP.h b/src/libasm/libasmP.h
similarity index 100%
rename from 0.153/libasm/libasmP.h
rename to src/libasm/libasmP.h
diff --git a/0.153/libasm/symbolhash.c b/src/libasm/symbolhash.c
similarity index 100%
rename from 0.153/libasm/symbolhash.c
rename to src/libasm/symbolhash.c
diff --git a/0.153/libasm/symbolhash.h b/src/libasm/symbolhash.h
similarity index 100%
rename from 0.153/libasm/symbolhash.h
rename to src/libasm/symbolhash.h
diff --git a/0.153/libcpu/ChangeLog b/src/libcpu/ChangeLog
similarity index 100%
rename from 0.153/libcpu/ChangeLog
rename to src/libcpu/ChangeLog
diff --git a/0.153/libcpu/Makefile.am b/src/libcpu/Makefile.am
similarity index 100%
rename from 0.153/libcpu/Makefile.am
rename to src/libcpu/Makefile.am
diff --git a/0.153/libcpu/Makefile.in b/src/libcpu/Makefile.in
similarity index 100%
rename from 0.153/libcpu/Makefile.in
rename to src/libcpu/Makefile.in
diff --git a/0.153/libcpu/defs/i386 b/src/libcpu/defs/i386
similarity index 100%
rename from 0.153/libcpu/defs/i386
rename to src/libcpu/defs/i386
diff --git a/0.153/libcpu/i386_data.h b/src/libcpu/i386_data.h
similarity index 100%
rename from 0.153/libcpu/i386_data.h
rename to src/libcpu/i386_data.h
diff --git a/0.153/libcpu/i386_dis.h b/src/libcpu/i386_dis.h
similarity index 100%
rename from 0.153/libcpu/i386_dis.h
rename to src/libcpu/i386_dis.h
diff --git a/0.153/libcpu/i386_disasm.c b/src/libcpu/i386_disasm.c
similarity index 100%
rename from 0.153/libcpu/i386_disasm.c
rename to src/libcpu/i386_disasm.c
diff --git a/0.153/libcpu/i386_gendis.c b/src/libcpu/i386_gendis.c
similarity index 100%
rename from 0.153/libcpu/i386_gendis.c
rename to src/libcpu/i386_gendis.c
diff --git a/0.153/libcpu/i386_lex.c b/src/libcpu/i386_lex.c
similarity index 100%
rename from 0.153/libcpu/i386_lex.c
rename to src/libcpu/i386_lex.c
diff --git a/0.153/libcpu/i386_lex.l b/src/libcpu/i386_lex.l
similarity index 100%
rename from 0.153/libcpu/i386_lex.l
rename to src/libcpu/i386_lex.l
diff --git a/0.153/libcpu/i386_parse.c b/src/libcpu/i386_parse.c
similarity index 100%
rename from 0.153/libcpu/i386_parse.c
rename to src/libcpu/i386_parse.c
diff --git a/0.153/libcpu/i386_parse.h b/src/libcpu/i386_parse.h
similarity index 100%
rename from 0.153/libcpu/i386_parse.h
rename to src/libcpu/i386_parse.h
diff --git a/0.153/libcpu/i386_parse.y b/src/libcpu/i386_parse.y
similarity index 100%
rename from 0.153/libcpu/i386_parse.y
rename to src/libcpu/i386_parse.y
diff --git a/0.153/libcpu/memory-access.h b/src/libcpu/memory-access.h
similarity index 100%
rename from 0.153/libcpu/memory-access.h
rename to src/libcpu/memory-access.h
diff --git a/0.153/libcpu/x86_64_dis.h b/src/libcpu/x86_64_dis.h
similarity index 100%
rename from 0.153/libcpu/x86_64_dis.h
rename to src/libcpu/x86_64_dis.h
diff --git a/0.153/libcpu/x86_64_disasm.c b/src/libcpu/x86_64_disasm.c
similarity index 100%
rename from 0.153/libcpu/x86_64_disasm.c
rename to src/libcpu/x86_64_disasm.c
diff --git a/0.153/libdw/Android.mk b/src/libdw/Android.mk
similarity index 96%
rename from 0.153/libdw/Android.mk
rename to src/libdw/Android.mk
index c951b1f..5579b24 100755
--- a/0.153/libdw/Android.mk
+++ b/src/libdw/Android.mk
@@ -136,18 +136,15 @@
 	$(LOCAL_PATH)/../libdw \
 	$(LOCAL_PATH)/../libelf
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
-
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE -DIS_LIBDW
 
-# to fix machine-dependent issues
-LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
-
 # to suppress the "pointer of type ‘void *’ used in arithmetic" warning
 LOCAL_CFLAGS += -Wno-pointer-arith
 
 LOCAL_MODULE:= libdw
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif # linux
@@ -182,4 +179,6 @@
 
 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
similarity index 100%
rename from 0.153/libdw/ChangeLog
rename to src/libdw/ChangeLog
diff --git a/0.153/libdw/Makefile.am b/src/libdw/Makefile.am
similarity index 100%
rename from 0.153/libdw/Makefile.am
rename to src/libdw/Makefile.am
diff --git a/0.153/libdw/Makefile.in b/src/libdw/Makefile.in
similarity index 100%
rename from 0.153/libdw/Makefile.in
rename to src/libdw/Makefile.in
diff --git a/0.153/libdw/cfi.c b/src/libdw/cfi.c
similarity index 100%
rename from 0.153/libdw/cfi.c
rename to src/libdw/cfi.c
diff --git a/0.153/libdw/cfi.h b/src/libdw/cfi.h
similarity index 100%
rename from 0.153/libdw/cfi.h
rename to src/libdw/cfi.h
diff --git a/0.153/libdw/cie.c b/src/libdw/cie.c
similarity index 100%
rename from 0.153/libdw/cie.c
rename to src/libdw/cie.c
diff --git a/0.153/libdw/dwarf.h b/src/libdw/dwarf.h
similarity index 100%
rename from 0.153/libdw/dwarf.h
rename to src/libdw/dwarf.h
diff --git a/0.153/libdw/dwarf_abbrev_hash.c b/src/libdw/dwarf_abbrev_hash.c
similarity index 100%
rename from 0.153/libdw/dwarf_abbrev_hash.c
rename to src/libdw/dwarf_abbrev_hash.c
diff --git a/0.153/libdw/dwarf_abbrev_hash.h b/src/libdw/dwarf_abbrev_hash.h
similarity index 100%
rename from 0.153/libdw/dwarf_abbrev_hash.h
rename to src/libdw/dwarf_abbrev_hash.h
diff --git a/0.153/libdw/dwarf_abbrevhaschildren.c b/src/libdw/dwarf_abbrevhaschildren.c
similarity index 100%
rename from 0.153/libdw/dwarf_abbrevhaschildren.c
rename to src/libdw/dwarf_abbrevhaschildren.c
diff --git a/0.153/libdw/dwarf_addrdie.c b/src/libdw/dwarf_addrdie.c
similarity index 100%
rename from 0.153/libdw/dwarf_addrdie.c
rename to src/libdw/dwarf_addrdie.c
diff --git a/0.153/libdw/dwarf_aggregate_size.c b/src/libdw/dwarf_aggregate_size.c
similarity index 100%
rename from 0.153/libdw/dwarf_aggregate_size.c
rename to src/libdw/dwarf_aggregate_size.c
diff --git a/0.153/libdw/dwarf_arrayorder.c b/src/libdw/dwarf_arrayorder.c
similarity index 100%
rename from 0.153/libdw/dwarf_arrayorder.c
rename to src/libdw/dwarf_arrayorder.c
diff --git a/0.153/libdw/dwarf_attr.c b/src/libdw/dwarf_attr.c
similarity index 100%
rename from 0.153/libdw/dwarf_attr.c
rename to src/libdw/dwarf_attr.c
diff --git a/0.153/libdw/dwarf_attr_integrate.c b/src/libdw/dwarf_attr_integrate.c
similarity index 100%
rename from 0.153/libdw/dwarf_attr_integrate.c
rename to src/libdw/dwarf_attr_integrate.c
diff --git a/0.153/libdw/dwarf_begin.c b/src/libdw/dwarf_begin.c
similarity index 100%
rename from 0.153/libdw/dwarf_begin.c
rename to src/libdw/dwarf_begin.c
diff --git a/0.153/libdw/dwarf_begin_elf.c b/src/libdw/dwarf_begin_elf.c
similarity index 100%
rename from 0.153/libdw/dwarf_begin_elf.c
rename to src/libdw/dwarf_begin_elf.c
diff --git a/0.153/libdw/dwarf_bitoffset.c b/src/libdw/dwarf_bitoffset.c
similarity index 100%
rename from 0.153/libdw/dwarf_bitoffset.c
rename to src/libdw/dwarf_bitoffset.c
diff --git a/0.153/libdw/dwarf_bitsize.c b/src/libdw/dwarf_bitsize.c
similarity index 100%
rename from 0.153/libdw/dwarf_bitsize.c
rename to src/libdw/dwarf_bitsize.c
diff --git a/0.153/libdw/dwarf_bytesize.c b/src/libdw/dwarf_bytesize.c
similarity index 100%
rename from 0.153/libdw/dwarf_bytesize.c
rename to src/libdw/dwarf_bytesize.c
diff --git a/0.153/libdw/dwarf_cfi_addrframe.c b/src/libdw/dwarf_cfi_addrframe.c
similarity index 100%
rename from 0.153/libdw/dwarf_cfi_addrframe.c
rename to src/libdw/dwarf_cfi_addrframe.c
diff --git a/0.153/libdw/dwarf_cfi_end.c b/src/libdw/dwarf_cfi_end.c
similarity index 100%
rename from 0.153/libdw/dwarf_cfi_end.c
rename to src/libdw/dwarf_cfi_end.c
diff --git a/0.153/libdw/dwarf_child.c b/src/libdw/dwarf_child.c
similarity index 100%
rename from 0.153/libdw/dwarf_child.c
rename to src/libdw/dwarf_child.c
diff --git a/0.153/libdw/dwarf_cuoffset.c b/src/libdw/dwarf_cuoffset.c
similarity index 100%
rename from 0.153/libdw/dwarf_cuoffset.c
rename to src/libdw/dwarf_cuoffset.c
diff --git a/0.153/libdw/dwarf_decl_column.c b/src/libdw/dwarf_decl_column.c
similarity index 100%
rename from 0.153/libdw/dwarf_decl_column.c
rename to src/libdw/dwarf_decl_column.c
diff --git a/0.153/libdw/dwarf_decl_file.c b/src/libdw/dwarf_decl_file.c
similarity index 100%
rename from 0.153/libdw/dwarf_decl_file.c
rename to src/libdw/dwarf_decl_file.c
diff --git a/0.153/libdw/dwarf_decl_line.c b/src/libdw/dwarf_decl_line.c
similarity index 100%
rename from 0.153/libdw/dwarf_decl_line.c
rename to src/libdw/dwarf_decl_line.c
diff --git a/0.153/libdw/dwarf_diecu.c b/src/libdw/dwarf_diecu.c
similarity index 100%
rename from 0.153/libdw/dwarf_diecu.c
rename to src/libdw/dwarf_diecu.c
diff --git a/0.153/libdw/dwarf_diename.c b/src/libdw/dwarf_diename.c
similarity index 100%
rename from 0.153/libdw/dwarf_diename.c
rename to src/libdw/dwarf_diename.c
diff --git a/0.153/libdw/dwarf_dieoffset.c b/src/libdw/dwarf_dieoffset.c
similarity index 100%
rename from 0.153/libdw/dwarf_dieoffset.c
rename to src/libdw/dwarf_dieoffset.c
diff --git a/0.153/libdw/dwarf_end.c b/src/libdw/dwarf_end.c
similarity index 100%
rename from 0.153/libdw/dwarf_end.c
rename to src/libdw/dwarf_end.c
diff --git a/0.153/libdw/dwarf_entry_breakpoints.c b/src/libdw/dwarf_entry_breakpoints.c
similarity index 100%
rename from 0.153/libdw/dwarf_entry_breakpoints.c
rename to src/libdw/dwarf_entry_breakpoints.c
diff --git a/0.153/libdw/dwarf_entrypc.c b/src/libdw/dwarf_entrypc.c
similarity index 100%
rename from 0.153/libdw/dwarf_entrypc.c
rename to src/libdw/dwarf_entrypc.c
diff --git a/0.153/libdw/dwarf_error.c b/src/libdw/dwarf_error.c
similarity index 100%
rename from 0.153/libdw/dwarf_error.c
rename to src/libdw/dwarf_error.c
diff --git a/0.153/libdw/dwarf_filesrc.c b/src/libdw/dwarf_filesrc.c
similarity index 100%
rename from 0.153/libdw/dwarf_filesrc.c
rename to src/libdw/dwarf_filesrc.c
diff --git a/0.153/libdw/dwarf_formaddr.c b/src/libdw/dwarf_formaddr.c
similarity index 100%
rename from 0.153/libdw/dwarf_formaddr.c
rename to src/libdw/dwarf_formaddr.c
diff --git a/0.153/libdw/dwarf_formblock.c b/src/libdw/dwarf_formblock.c
similarity index 100%
rename from 0.153/libdw/dwarf_formblock.c
rename to src/libdw/dwarf_formblock.c
diff --git a/0.153/libdw/dwarf_formflag.c b/src/libdw/dwarf_formflag.c
similarity index 100%
rename from 0.153/libdw/dwarf_formflag.c
rename to src/libdw/dwarf_formflag.c
diff --git a/0.153/libdw/dwarf_formref.c b/src/libdw/dwarf_formref.c
similarity index 100%
rename from 0.153/libdw/dwarf_formref.c
rename to src/libdw/dwarf_formref.c
diff --git a/0.153/libdw/dwarf_formref_die.c b/src/libdw/dwarf_formref_die.c
similarity index 100%
rename from 0.153/libdw/dwarf_formref_die.c
rename to src/libdw/dwarf_formref_die.c
diff --git a/0.153/libdw/dwarf_formsdata.c b/src/libdw/dwarf_formsdata.c
similarity index 100%
rename from 0.153/libdw/dwarf_formsdata.c
rename to src/libdw/dwarf_formsdata.c
diff --git a/0.153/libdw/dwarf_formstring.c b/src/libdw/dwarf_formstring.c
similarity index 100%
rename from 0.153/libdw/dwarf_formstring.c
rename to src/libdw/dwarf_formstring.c
diff --git a/0.153/libdw/dwarf_formudata.c b/src/libdw/dwarf_formudata.c
similarity index 100%
rename from 0.153/libdw/dwarf_formudata.c
rename to src/libdw/dwarf_formudata.c
diff --git a/0.153/libdw/dwarf_frame_cfa.c b/src/libdw/dwarf_frame_cfa.c
similarity index 100%
rename from 0.153/libdw/dwarf_frame_cfa.c
rename to src/libdw/dwarf_frame_cfa.c
diff --git a/0.153/libdw/dwarf_frame_info.c b/src/libdw/dwarf_frame_info.c
similarity index 100%
rename from 0.153/libdw/dwarf_frame_info.c
rename to src/libdw/dwarf_frame_info.c
diff --git a/0.153/libdw/dwarf_frame_register.c b/src/libdw/dwarf_frame_register.c
similarity index 100%
rename from 0.153/libdw/dwarf_frame_register.c
rename to src/libdw/dwarf_frame_register.c
diff --git a/0.153/libdw/dwarf_func_inline.c b/src/libdw/dwarf_func_inline.c
similarity index 100%
rename from 0.153/libdw/dwarf_func_inline.c
rename to src/libdw/dwarf_func_inline.c
diff --git a/0.153/libdw/dwarf_getabbrev.c b/src/libdw/dwarf_getabbrev.c
similarity index 100%
rename from 0.153/libdw/dwarf_getabbrev.c
rename to src/libdw/dwarf_getabbrev.c
diff --git a/0.153/libdw/dwarf_getabbrevattr.c b/src/libdw/dwarf_getabbrevattr.c
similarity index 100%
rename from 0.153/libdw/dwarf_getabbrevattr.c
rename to src/libdw/dwarf_getabbrevattr.c
diff --git a/0.153/libdw/dwarf_getabbrevcode.c b/src/libdw/dwarf_getabbrevcode.c
similarity index 100%
rename from 0.153/libdw/dwarf_getabbrevcode.c
rename to src/libdw/dwarf_getabbrevcode.c
diff --git a/0.153/libdw/dwarf_getabbrevtag.c b/src/libdw/dwarf_getabbrevtag.c
similarity index 100%
rename from 0.153/libdw/dwarf_getabbrevtag.c
rename to src/libdw/dwarf_getabbrevtag.c
diff --git a/0.153/libdw/dwarf_getarange_addr.c b/src/libdw/dwarf_getarange_addr.c
similarity index 100%
rename from 0.153/libdw/dwarf_getarange_addr.c
rename to src/libdw/dwarf_getarange_addr.c
diff --git a/0.153/libdw/dwarf_getarangeinfo.c b/src/libdw/dwarf_getarangeinfo.c
similarity index 100%
rename from 0.153/libdw/dwarf_getarangeinfo.c
rename to src/libdw/dwarf_getarangeinfo.c
diff --git a/0.153/libdw/dwarf_getaranges.c b/src/libdw/dwarf_getaranges.c
similarity index 100%
rename from 0.153/libdw/dwarf_getaranges.c
rename to src/libdw/dwarf_getaranges.c
diff --git a/0.153/libdw/dwarf_getattrcnt.c b/src/libdw/dwarf_getattrcnt.c
similarity index 100%
rename from 0.153/libdw/dwarf_getattrcnt.c
rename to src/libdw/dwarf_getattrcnt.c
diff --git a/0.153/libdw/dwarf_getattrs.c b/src/libdw/dwarf_getattrs.c
similarity index 100%
rename from 0.153/libdw/dwarf_getattrs.c
rename to src/libdw/dwarf_getattrs.c
diff --git a/0.153/libdw/dwarf_getcfi.c b/src/libdw/dwarf_getcfi.c
similarity index 100%
rename from 0.153/libdw/dwarf_getcfi.c
rename to src/libdw/dwarf_getcfi.c
diff --git a/0.153/libdw/dwarf_getcfi_elf.c b/src/libdw/dwarf_getcfi_elf.c
similarity index 100%
rename from 0.153/libdw/dwarf_getcfi_elf.c
rename to src/libdw/dwarf_getcfi_elf.c
diff --git a/0.153/libdw/dwarf_getelf.c b/src/libdw/dwarf_getelf.c
similarity index 100%
rename from 0.153/libdw/dwarf_getelf.c
rename to src/libdw/dwarf_getelf.c
diff --git a/0.153/libdw/dwarf_getfuncs.c b/src/libdw/dwarf_getfuncs.c
similarity index 100%
rename from 0.153/libdw/dwarf_getfuncs.c
rename to src/libdw/dwarf_getfuncs.c
diff --git a/0.153/libdw/dwarf_getlocation.c b/src/libdw/dwarf_getlocation.c
similarity index 100%
rename from 0.153/libdw/dwarf_getlocation.c
rename to src/libdw/dwarf_getlocation.c
diff --git a/0.153/libdw/dwarf_getlocation_implicit_pointer.c b/src/libdw/dwarf_getlocation_implicit_pointer.c
similarity index 100%
rename from 0.153/libdw/dwarf_getlocation_implicit_pointer.c
rename to src/libdw/dwarf_getlocation_implicit_pointer.c
diff --git a/0.153/libdw/dwarf_getmacros.c b/src/libdw/dwarf_getmacros.c
similarity index 100%
rename from 0.153/libdw/dwarf_getmacros.c
rename to src/libdw/dwarf_getmacros.c
diff --git a/0.153/libdw/dwarf_getpubnames.c b/src/libdw/dwarf_getpubnames.c
similarity index 100%
rename from 0.153/libdw/dwarf_getpubnames.c
rename to src/libdw/dwarf_getpubnames.c
diff --git a/0.153/libdw/dwarf_getscopes.c b/src/libdw/dwarf_getscopes.c
similarity index 100%
rename from 0.153/libdw/dwarf_getscopes.c
rename to src/libdw/dwarf_getscopes.c
diff --git a/0.153/libdw/dwarf_getscopes_die.c b/src/libdw/dwarf_getscopes_die.c
similarity index 100%
rename from 0.153/libdw/dwarf_getscopes_die.c
rename to src/libdw/dwarf_getscopes_die.c
diff --git a/0.153/libdw/dwarf_getscopevar.c b/src/libdw/dwarf_getscopevar.c
similarity index 100%
rename from 0.153/libdw/dwarf_getscopevar.c
rename to src/libdw/dwarf_getscopevar.c
diff --git a/0.153/libdw/dwarf_getsrc_die.c b/src/libdw/dwarf_getsrc_die.c
similarity index 100%
rename from 0.153/libdw/dwarf_getsrc_die.c
rename to src/libdw/dwarf_getsrc_die.c
diff --git a/0.153/libdw/dwarf_getsrc_file.c b/src/libdw/dwarf_getsrc_file.c
similarity index 100%
rename from 0.153/libdw/dwarf_getsrc_file.c
rename to src/libdw/dwarf_getsrc_file.c
diff --git a/0.153/libdw/dwarf_getsrcdirs.c b/src/libdw/dwarf_getsrcdirs.c
similarity index 100%
rename from 0.153/libdw/dwarf_getsrcdirs.c
rename to src/libdw/dwarf_getsrcdirs.c
diff --git a/0.153/libdw/dwarf_getsrcfiles.c b/src/libdw/dwarf_getsrcfiles.c
similarity index 100%
rename from 0.153/libdw/dwarf_getsrcfiles.c
rename to src/libdw/dwarf_getsrcfiles.c
diff --git a/0.153/libdw/dwarf_getsrclines.c b/src/libdw/dwarf_getsrclines.c
similarity index 100%
rename from 0.153/libdw/dwarf_getsrclines.c
rename to src/libdw/dwarf_getsrclines.c
diff --git a/0.153/libdw/dwarf_getstring.c b/src/libdw/dwarf_getstring.c
similarity index 100%
rename from 0.153/libdw/dwarf_getstring.c
rename to src/libdw/dwarf_getstring.c
diff --git a/0.153/libdw/dwarf_hasattr.c b/src/libdw/dwarf_hasattr.c
similarity index 100%
rename from 0.153/libdw/dwarf_hasattr.c
rename to src/libdw/dwarf_hasattr.c
diff --git a/0.153/libdw/dwarf_hasattr_integrate.c b/src/libdw/dwarf_hasattr_integrate.c
similarity index 100%
rename from 0.153/libdw/dwarf_hasattr_integrate.c
rename to src/libdw/dwarf_hasattr_integrate.c
diff --git a/0.153/libdw/dwarf_haschildren.c b/src/libdw/dwarf_haschildren.c
similarity index 100%
rename from 0.153/libdw/dwarf_haschildren.c
rename to src/libdw/dwarf_haschildren.c
diff --git a/0.153/libdw/dwarf_hasform.c b/src/libdw/dwarf_hasform.c
similarity index 100%
rename from 0.153/libdw/dwarf_hasform.c
rename to src/libdw/dwarf_hasform.c
diff --git a/0.153/libdw/dwarf_haspc.c b/src/libdw/dwarf_haspc.c
similarity index 100%
rename from 0.153/libdw/dwarf_haspc.c
rename to src/libdw/dwarf_haspc.c
diff --git a/0.153/libdw/dwarf_highpc.c b/src/libdw/dwarf_highpc.c
similarity index 100%
rename from 0.153/libdw/dwarf_highpc.c
rename to src/libdw/dwarf_highpc.c
diff --git a/0.153/libdw/dwarf_lineaddr.c b/src/libdw/dwarf_lineaddr.c
similarity index 100%
rename from 0.153/libdw/dwarf_lineaddr.c
rename to src/libdw/dwarf_lineaddr.c
diff --git a/0.153/libdw/dwarf_linebeginstatement.c b/src/libdw/dwarf_linebeginstatement.c
similarity index 100%
rename from 0.153/libdw/dwarf_linebeginstatement.c
rename to src/libdw/dwarf_linebeginstatement.c
diff --git a/0.153/libdw/dwarf_lineblock.c b/src/libdw/dwarf_lineblock.c
similarity index 100%
rename from 0.153/libdw/dwarf_lineblock.c
rename to src/libdw/dwarf_lineblock.c
diff --git a/0.153/libdw/dwarf_linecol.c b/src/libdw/dwarf_linecol.c
similarity index 100%
rename from 0.153/libdw/dwarf_linecol.c
rename to src/libdw/dwarf_linecol.c
diff --git a/0.153/libdw/dwarf_linediscriminator.c b/src/libdw/dwarf_linediscriminator.c
similarity index 100%
rename from 0.153/libdw/dwarf_linediscriminator.c
rename to src/libdw/dwarf_linediscriminator.c
diff --git a/0.153/libdw/dwarf_lineendsequence.c b/src/libdw/dwarf_lineendsequence.c
similarity index 100%
rename from 0.153/libdw/dwarf_lineendsequence.c
rename to src/libdw/dwarf_lineendsequence.c
diff --git a/0.153/libdw/dwarf_lineepiloguebegin.c b/src/libdw/dwarf_lineepiloguebegin.c
similarity index 100%
rename from 0.153/libdw/dwarf_lineepiloguebegin.c
rename to src/libdw/dwarf_lineepiloguebegin.c
diff --git a/0.153/libdw/dwarf_lineisa.c b/src/libdw/dwarf_lineisa.c
similarity index 100%
rename from 0.153/libdw/dwarf_lineisa.c
rename to src/libdw/dwarf_lineisa.c
diff --git a/0.153/libdw/dwarf_lineno.c b/src/libdw/dwarf_lineno.c
similarity index 100%
rename from 0.153/libdw/dwarf_lineno.c
rename to src/libdw/dwarf_lineno.c
diff --git a/0.153/libdw/dwarf_lineop_index.c b/src/libdw/dwarf_lineop_index.c
similarity index 100%
rename from 0.153/libdw/dwarf_lineop_index.c
rename to src/libdw/dwarf_lineop_index.c
diff --git a/0.153/libdw/dwarf_lineprologueend.c b/src/libdw/dwarf_lineprologueend.c
similarity index 100%
rename from 0.153/libdw/dwarf_lineprologueend.c
rename to src/libdw/dwarf_lineprologueend.c
diff --git a/0.153/libdw/dwarf_linesrc.c b/src/libdw/dwarf_linesrc.c
similarity index 100%
rename from 0.153/libdw/dwarf_linesrc.c
rename to src/libdw/dwarf_linesrc.c
diff --git a/0.153/libdw/dwarf_lowpc.c b/src/libdw/dwarf_lowpc.c
similarity index 100%
rename from 0.153/libdw/dwarf_lowpc.c
rename to src/libdw/dwarf_lowpc.c
diff --git a/0.153/libdw/dwarf_macro_opcode.c b/src/libdw/dwarf_macro_opcode.c
similarity index 100%
rename from 0.153/libdw/dwarf_macro_opcode.c
rename to src/libdw/dwarf_macro_opcode.c
diff --git a/0.153/libdw/dwarf_macro_param1.c b/src/libdw/dwarf_macro_param1.c
similarity index 100%
rename from 0.153/libdw/dwarf_macro_param1.c
rename to src/libdw/dwarf_macro_param1.c
diff --git a/0.153/libdw/dwarf_macro_param2.c b/src/libdw/dwarf_macro_param2.c
similarity index 100%
rename from 0.153/libdw/dwarf_macro_param2.c
rename to src/libdw/dwarf_macro_param2.c
diff --git a/0.153/libdw/dwarf_next_cfi.c b/src/libdw/dwarf_next_cfi.c
similarity index 100%
rename from 0.153/libdw/dwarf_next_cfi.c
rename to src/libdw/dwarf_next_cfi.c
diff --git a/0.153/libdw/dwarf_nextcu.c b/src/libdw/dwarf_nextcu.c
similarity index 100%
rename from 0.153/libdw/dwarf_nextcu.c
rename to src/libdw/dwarf_nextcu.c
diff --git a/0.153/libdw/dwarf_offabbrev.c b/src/libdw/dwarf_offabbrev.c
similarity index 100%
rename from 0.153/libdw/dwarf_offabbrev.c
rename to src/libdw/dwarf_offabbrev.c
diff --git a/0.153/libdw/dwarf_offdie.c b/src/libdw/dwarf_offdie.c
similarity index 100%
rename from 0.153/libdw/dwarf_offdie.c
rename to src/libdw/dwarf_offdie.c
diff --git a/0.153/libdw/dwarf_onearange.c b/src/libdw/dwarf_onearange.c
similarity index 100%
rename from 0.153/libdw/dwarf_onearange.c
rename to src/libdw/dwarf_onearange.c
diff --git a/0.153/libdw/dwarf_onesrcline.c b/src/libdw/dwarf_onesrcline.c
similarity index 100%
rename from 0.153/libdw/dwarf_onesrcline.c
rename to src/libdw/dwarf_onesrcline.c
diff --git a/0.153/libdw/dwarf_ranges.c b/src/libdw/dwarf_ranges.c
similarity index 100%
rename from 0.153/libdw/dwarf_ranges.c
rename to src/libdw/dwarf_ranges.c
diff --git a/0.153/libdw/dwarf_siblingof.c b/src/libdw/dwarf_siblingof.c
similarity index 100%
rename from 0.153/libdw/dwarf_siblingof.c
rename to src/libdw/dwarf_siblingof.c
diff --git a/0.153/libdw/dwarf_sig8_hash.c b/src/libdw/dwarf_sig8_hash.c
similarity index 100%
rename from 0.153/libdw/dwarf_sig8_hash.c
rename to src/libdw/dwarf_sig8_hash.c
diff --git a/0.153/libdw/dwarf_sig8_hash.h b/src/libdw/dwarf_sig8_hash.h
similarity index 100%
rename from 0.153/libdw/dwarf_sig8_hash.h
rename to src/libdw/dwarf_sig8_hash.h
diff --git a/0.153/libdw/dwarf_srclang.c b/src/libdw/dwarf_srclang.c
similarity index 100%
rename from 0.153/libdw/dwarf_srclang.c
rename to src/libdw/dwarf_srclang.c
diff --git a/0.153/libdw/dwarf_tag.c b/src/libdw/dwarf_tag.c
similarity index 100%
rename from 0.153/libdw/dwarf_tag.c
rename to src/libdw/dwarf_tag.c
diff --git a/0.153/libdw/dwarf_whatattr.c b/src/libdw/dwarf_whatattr.c
similarity index 100%
rename from 0.153/libdw/dwarf_whatattr.c
rename to src/libdw/dwarf_whatattr.c
diff --git a/0.153/libdw/dwarf_whatform.c b/src/libdw/dwarf_whatform.c
similarity index 100%
rename from 0.153/libdw/dwarf_whatform.c
rename to src/libdw/dwarf_whatform.c
diff --git a/0.153/libdw/encoded-value.h b/src/libdw/encoded-value.h
similarity index 100%
rename from 0.153/libdw/encoded-value.h
rename to src/libdw/encoded-value.h
diff --git a/0.153/libdw/fde.c b/src/libdw/fde.c
similarity index 100%
rename from 0.153/libdw/fde.c
rename to src/libdw/fde.c
diff --git a/0.153/libdw/frame-cache.c b/src/libdw/frame-cache.c
similarity index 100%
rename from 0.153/libdw/frame-cache.c
rename to src/libdw/frame-cache.c
diff --git a/0.153/libdw/libdw.h b/src/libdw/libdw.h
similarity index 100%
rename from 0.153/libdw/libdw.h
rename to src/libdw/libdw.h
diff --git a/0.153/libdw/libdw.map b/src/libdw/libdw.map
similarity index 100%
rename from 0.153/libdw/libdw.map
rename to src/libdw/libdw.map
diff --git a/0.153/libdw/libdwP.h b/src/libdw/libdwP.h
similarity index 100%
rename from 0.153/libdw/libdwP.h
rename to src/libdw/libdwP.h
diff --git a/0.153/libdw/libdw_alloc.c b/src/libdw/libdw_alloc.c
similarity index 100%
rename from 0.153/libdw/libdw_alloc.c
rename to src/libdw/libdw_alloc.c
diff --git a/0.153/libdw/libdw_findcu.c b/src/libdw/libdw_findcu.c
similarity index 100%
rename from 0.153/libdw/libdw_findcu.c
rename to src/libdw/libdw_findcu.c
diff --git a/0.153/libdw/libdw_form.c b/src/libdw/libdw_form.c
similarity index 100%
rename from 0.153/libdw/libdw_form.c
rename to src/libdw/libdw_form.c
diff --git a/0.153/libdw/libdw_visit_scopes.c b/src/libdw/libdw_visit_scopes.c
similarity index 100%
rename from 0.153/libdw/libdw_visit_scopes.c
rename to src/libdw/libdw_visit_scopes.c
diff --git a/0.153/libdw/memory-access.c b/src/libdw/memory-access.c
similarity index 100%
rename from 0.153/libdw/memory-access.c
rename to src/libdw/memory-access.c
diff --git a/0.153/libdw/memory-access.h b/src/libdw/memory-access.h
similarity index 100%
rename from 0.153/libdw/memory-access.h
rename to src/libdw/memory-access.h
diff --git a/0.153/libdwfl/Android.mk b/src/libdwfl/Android.mk
similarity index 93%
rename from 0.153/libdwfl/Android.mk
rename to src/libdwfl/Android.mk
index f417247..dc6a14a 100755
--- a/0.153/libdwfl/Android.mk
+++ b/src/libdwfl/Android.mk
@@ -61,22 +61,19 @@
 	$(LOCAL_PATH)/../libdw \
 	$(LOCAL_PATH)/../libelf
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
-
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
 
 # to suppress the "pointer of type ‘void *’ used in arithmetic" warning
 LOCAL_CFLAGS += -Wno-pointer-arith
 
-# to fix machine-dependent issues
-LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
-
 # Asserts are not compiled, so some debug variables appear unused. Rather than
 # fix, we prefer to turn off the warning locally.
 LOCAL_CFLAGS += -Wno-unused-but-set-variable
 
 LOCAL_MODULE:= libdwfl
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif # linux
@@ -114,4 +111,6 @@
 
 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
similarity index 100%
rename from 0.153/libdwfl/ChangeLog
rename to src/libdwfl/ChangeLog
diff --git a/0.153/libdwfl/Makefile.am b/src/libdwfl/Makefile.am
similarity index 100%
rename from 0.153/libdwfl/Makefile.am
rename to src/libdwfl/Makefile.am
diff --git a/0.153/libdwfl/Makefile.in b/src/libdwfl/Makefile.in
similarity index 100%
rename from 0.153/libdwfl/Makefile.in
rename to src/libdwfl/Makefile.in
diff --git a/0.153/libdwfl/argp-std.c b/src/libdwfl/argp-std.c
similarity index 100%
rename from 0.153/libdwfl/argp-std.c
rename to src/libdwfl/argp-std.c
diff --git a/0.153/libdwfl/bzip2.c b/src/libdwfl/bzip2.c
similarity index 100%
rename from 0.153/libdwfl/bzip2.c
rename to src/libdwfl/bzip2.c
diff --git a/0.153/libdwfl/core-file.c b/src/libdwfl/core-file.c
similarity index 100%
rename from 0.153/libdwfl/core-file.c
rename to src/libdwfl/core-file.c
diff --git a/0.153/libdwfl/cu.c b/src/libdwfl/cu.c
similarity index 100%
rename from 0.153/libdwfl/cu.c
rename to src/libdwfl/cu.c
diff --git a/0.153/libdwfl/derelocate.c b/src/libdwfl/derelocate.c
similarity index 100%
rename from 0.153/libdwfl/derelocate.c
rename to src/libdwfl/derelocate.c
diff --git a/0.153/libdwfl/dwfl_addrdie.c b/src/libdwfl/dwfl_addrdie.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_addrdie.c
rename to src/libdwfl/dwfl_addrdie.c
diff --git a/0.153/libdwfl/dwfl_addrdwarf.c b/src/libdwfl/dwfl_addrdwarf.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_addrdwarf.c
rename to src/libdwfl/dwfl_addrdwarf.c
diff --git a/0.153/libdwfl/dwfl_addrmodule.c b/src/libdwfl/dwfl_addrmodule.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_addrmodule.c
rename to src/libdwfl/dwfl_addrmodule.c
diff --git a/0.153/libdwfl/dwfl_begin.c b/src/libdwfl/dwfl_begin.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_begin.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_build_id_find_debuginfo.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_build_id_find_elf.c
rename to src/libdwfl/dwfl_build_id_find_elf.c
diff --git a/0.153/libdwfl/dwfl_cumodule.c b/src/libdwfl/dwfl_cumodule.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_cumodule.c
rename to src/libdwfl/dwfl_cumodule.c
diff --git a/0.153/libdwfl/dwfl_dwarf_line.c b/src/libdwfl/dwfl_dwarf_line.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_dwarf_line.c
rename to src/libdwfl/dwfl_dwarf_line.c
diff --git a/0.153/libdwfl/dwfl_end.c b/src/libdwfl/dwfl_end.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_end.c
rename to src/libdwfl/dwfl_end.c
diff --git a/0.153/libdwfl/dwfl_error.c b/src/libdwfl/dwfl_error.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_error.c
rename to src/libdwfl/dwfl_error.c
diff --git a/0.153/libdwfl/dwfl_getdwarf.c b/src/libdwfl/dwfl_getdwarf.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_getdwarf.c
rename to src/libdwfl/dwfl_getdwarf.c
diff --git a/0.153/libdwfl/dwfl_getmodules.c b/src/libdwfl/dwfl_getmodules.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_getmodules.c
rename to src/libdwfl/dwfl_getmodules.c
diff --git a/0.153/libdwfl/dwfl_getsrc.c b/src/libdwfl/dwfl_getsrc.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_getsrc.c
rename to src/libdwfl/dwfl_getsrc.c
diff --git a/0.153/libdwfl/dwfl_getsrclines.c b/src/libdwfl/dwfl_getsrclines.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_getsrclines.c
rename to src/libdwfl/dwfl_getsrclines.c
diff --git a/0.153/libdwfl/dwfl_line_comp_dir.c b/src/libdwfl/dwfl_line_comp_dir.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_line_comp_dir.c
rename to src/libdwfl/dwfl_line_comp_dir.c
diff --git a/0.153/libdwfl/dwfl_linecu.c b/src/libdwfl/dwfl_linecu.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_linecu.c
rename to src/libdwfl/dwfl_linecu.c
diff --git a/0.153/libdwfl/dwfl_lineinfo.c b/src/libdwfl/dwfl_lineinfo.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_lineinfo.c
rename to src/libdwfl/dwfl_lineinfo.c
diff --git a/0.153/libdwfl/dwfl_linemodule.c b/src/libdwfl/dwfl_linemodule.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_linemodule.c
rename to src/libdwfl/dwfl_linemodule.c
diff --git a/0.153/libdwfl/dwfl_module.c b/src/libdwfl/dwfl_module.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module.c
rename to src/libdwfl/dwfl_module.c
diff --git a/0.153/libdwfl/dwfl_module_addrdie.c b/src/libdwfl/dwfl_module_addrdie.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_addrdie.c
rename to src/libdwfl/dwfl_module_addrdie.c
diff --git a/0.153/libdwfl/dwfl_module_addrname.c b/src/libdwfl/dwfl_module_addrname.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_addrname.c
rename to src/libdwfl/dwfl_module_addrname.c
diff --git a/0.153/libdwfl/dwfl_module_addrsym.c b/src/libdwfl/dwfl_module_addrsym.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_addrsym.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_build_id.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_dwarf_cfi.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_eh_cfi.c
rename to src/libdwfl/dwfl_module_eh_cfi.c
diff --git a/0.153/libdwfl/dwfl_module_getdwarf.c b/src/libdwfl/dwfl_module_getdwarf.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_getdwarf.c
rename to src/libdwfl/dwfl_module_getdwarf.c
diff --git a/0.153/libdwfl/dwfl_module_getelf.c b/src/libdwfl/dwfl_module_getelf.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_getelf.c
rename to src/libdwfl/dwfl_module_getelf.c
diff --git a/0.153/libdwfl/dwfl_module_getsrc.c b/src/libdwfl/dwfl_module_getsrc.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_getsrc.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_getsrc_file.c
rename to src/libdwfl/dwfl_module_getsrc_file.c
diff --git a/0.153/libdwfl/dwfl_module_getsym.c b/src/libdwfl/dwfl_module_getsym.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_getsym.c
rename to src/libdwfl/dwfl_module_getsym.c
diff --git a/0.153/libdwfl/dwfl_module_info.c b/src/libdwfl/dwfl_module_info.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_info.c
rename to src/libdwfl/dwfl_module_info.c
diff --git a/0.153/libdwfl/dwfl_module_nextcu.c b/src/libdwfl/dwfl_module_nextcu.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_nextcu.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_register_names.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_report_build_id.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_module_return_value_location.c
rename to src/libdwfl/dwfl_module_return_value_location.c
diff --git a/0.153/libdwfl/dwfl_nextcu.c b/src/libdwfl/dwfl_nextcu.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_nextcu.c
rename to src/libdwfl/dwfl_nextcu.c
diff --git a/0.153/libdwfl/dwfl_onesrcline.c b/src/libdwfl/dwfl_onesrcline.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_onesrcline.c
rename to src/libdwfl/dwfl_onesrcline.c
diff --git a/0.153/libdwfl/dwfl_report_elf.c b/src/libdwfl/dwfl_report_elf.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_report_elf.c
rename to 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
similarity index 100%
rename from 0.153/libdwfl/dwfl_segment_report_module.c
rename to src/libdwfl/dwfl_segment_report_module.c
diff --git a/0.153/libdwfl/dwfl_validate_address.c b/src/libdwfl/dwfl_validate_address.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_validate_address.c
rename to src/libdwfl/dwfl_validate_address.c
diff --git a/0.153/libdwfl/dwfl_version.c b/src/libdwfl/dwfl_version.c
similarity index 100%
rename from 0.153/libdwfl/dwfl_version.c
rename to src/libdwfl/dwfl_version.c
diff --git a/0.153/libdwfl/elf-from-memory.c b/src/libdwfl/elf-from-memory.c
similarity index 100%
rename from 0.153/libdwfl/elf-from-memory.c
rename to src/libdwfl/elf-from-memory.c
diff --git a/0.153/libdwfl/find-debuginfo.c b/src/libdwfl/find-debuginfo.c
similarity index 100%
rename from 0.153/libdwfl/find-debuginfo.c
rename to src/libdwfl/find-debuginfo.c
diff --git a/0.153/libdwfl/gzip.c b/src/libdwfl/gzip.c
similarity index 100%
rename from 0.153/libdwfl/gzip.c
rename to src/libdwfl/gzip.c
diff --git a/0.153/libdwfl/image-header.c b/src/libdwfl/image-header.c
similarity index 100%
rename from 0.153/libdwfl/image-header.c
rename to src/libdwfl/image-header.c
diff --git a/0.153/libdwfl/libdwfl.h b/src/libdwfl/libdwfl.h
similarity index 100%
rename from 0.153/libdwfl/libdwfl.h
rename to src/libdwfl/libdwfl.h
diff --git a/0.153/libdwfl/libdwflP.h b/src/libdwfl/libdwflP.h
similarity index 100%
rename from 0.153/libdwfl/libdwflP.h
rename to src/libdwfl/libdwflP.h
diff --git a/0.153/libdwfl/libdwfl_crc32.c b/src/libdwfl/libdwfl_crc32.c
similarity index 100%
rename from 0.153/libdwfl/libdwfl_crc32.c
rename to src/libdwfl/libdwfl_crc32.c
diff --git a/0.153/libdwfl/libdwfl_crc32_file.c b/src/libdwfl/libdwfl_crc32_file.c
similarity index 100%
rename from 0.153/libdwfl/libdwfl_crc32_file.c
rename to src/libdwfl/libdwfl_crc32_file.c
diff --git a/0.153/libdwfl/lines.c b/src/libdwfl/lines.c
similarity index 100%
rename from 0.153/libdwfl/lines.c
rename to src/libdwfl/lines.c
diff --git a/0.153/libdwfl/link_map.c b/src/libdwfl/link_map.c
similarity index 100%
rename from 0.153/libdwfl/link_map.c
rename to src/libdwfl/link_map.c
diff --git a/0.153/libdwfl/linux-kernel-modules.c b/src/libdwfl/linux-kernel-modules.c
similarity index 100%
rename from 0.153/libdwfl/linux-kernel-modules.c
rename to src/libdwfl/linux-kernel-modules.c
diff --git a/0.153/libdwfl/linux-proc-maps.c b/src/libdwfl/linux-proc-maps.c
similarity index 100%
rename from 0.153/libdwfl/linux-proc-maps.c
rename to src/libdwfl/linux-proc-maps.c
diff --git a/0.153/libdwfl/lzma.c b/src/libdwfl/lzma.c
similarity index 100%
rename from 0.153/libdwfl/lzma.c
rename to src/libdwfl/lzma.c
diff --git a/0.153/libdwfl/offline.c b/src/libdwfl/offline.c
similarity index 100%
rename from 0.153/libdwfl/offline.c
rename to src/libdwfl/offline.c
diff --git a/0.153/libdwfl/open.c b/src/libdwfl/open.c
similarity index 100%
rename from 0.153/libdwfl/open.c
rename to src/libdwfl/open.c
diff --git a/0.153/libdwfl/relocate.c b/src/libdwfl/relocate.c
similarity index 100%
rename from 0.153/libdwfl/relocate.c
rename to src/libdwfl/relocate.c
diff --git a/0.153/libdwfl/segment.c b/src/libdwfl/segment.c
similarity index 100%
rename from 0.153/libdwfl/segment.c
rename to src/libdwfl/segment.c
diff --git a/0.153/libebl/Android.mk b/src/libebl/Android.mk
similarity index 95%
rename from 0.153/libebl/Android.mk
rename to src/libebl/Android.mk
index 58b6d0d..2b94a37 100755
--- a/0.153/libebl/Android.mk
+++ b/src/libebl/Android.mk
@@ -81,16 +81,14 @@
 	$(LOCAL_PATH)/../libelf \
 	$(LOCAL_PATH)/../libdw
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
-
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
 
-LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
-
 LOCAL_CLANG := false
 
 LOCAL_MODULE:= libebl
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif # linux
@@ -122,4 +120,6 @@
 
 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
similarity index 100%
rename from 0.153/libebl/ChangeLog
rename to src/libebl/ChangeLog
diff --git a/0.153/libebl/Makefile.am b/src/libebl/Makefile.am
similarity index 100%
rename from 0.153/libebl/Makefile.am
rename to src/libebl/Makefile.am
diff --git a/0.153/libebl/Makefile.in b/src/libebl/Makefile.in
similarity index 100%
rename from 0.153/libebl/Makefile.in
rename to src/libebl/Makefile.in
diff --git a/0.153/libebl/ebl-hooks.h b/src/libebl/ebl-hooks.h
similarity index 100%
rename from 0.153/libebl/ebl-hooks.h
rename to src/libebl/ebl-hooks.h
diff --git a/0.153/libebl/ebl_check_special_section.c b/src/libebl/ebl_check_special_section.c
similarity index 100%
rename from 0.153/libebl/ebl_check_special_section.c
rename to 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
similarity index 100%
rename from 0.153/libebl/ebl_check_special_symbol.c
rename to src/libebl/ebl_check_special_symbol.c
diff --git a/0.153/libebl/ebl_syscall_abi.c b/src/libebl/ebl_syscall_abi.c
similarity index 100%
rename from 0.153/libebl/ebl_syscall_abi.c
rename to src/libebl/ebl_syscall_abi.c
diff --git a/0.153/libebl/eblabicfi.c b/src/libebl/eblabicfi.c
similarity index 100%
rename from 0.153/libebl/eblabicfi.c
rename to src/libebl/eblabicfi.c
diff --git a/0.153/libebl/eblauxvinfo.c b/src/libebl/eblauxvinfo.c
similarity index 100%
rename from 0.153/libebl/eblauxvinfo.c
rename to src/libebl/eblauxvinfo.c
diff --git a/0.153/libebl/eblbackendname.c b/src/libebl/eblbackendname.c
similarity index 100%
rename from 0.153/libebl/eblbackendname.c
rename to src/libebl/eblbackendname.c
diff --git a/0.153/libebl/eblbsspltp.c b/src/libebl/eblbsspltp.c
similarity index 100%
rename from 0.153/libebl/eblbsspltp.c
rename to src/libebl/eblbsspltp.c
diff --git a/0.153/libebl/eblcheckobjattr.c b/src/libebl/eblcheckobjattr.c
similarity index 100%
rename from 0.153/libebl/eblcheckobjattr.c
rename to src/libebl/eblcheckobjattr.c
diff --git a/0.153/libebl/eblclosebackend.c b/src/libebl/eblclosebackend.c
similarity index 100%
rename from 0.153/libebl/eblclosebackend.c
rename to src/libebl/eblclosebackend.c
diff --git a/0.153/libebl/eblcopyrelocp.c b/src/libebl/eblcopyrelocp.c
similarity index 100%
rename from 0.153/libebl/eblcopyrelocp.c
rename to src/libebl/eblcopyrelocp.c
diff --git a/0.153/libebl/eblcorenote.c b/src/libebl/eblcorenote.c
similarity index 100%
rename from 0.153/libebl/eblcorenote.c
rename to src/libebl/eblcorenote.c
diff --git a/0.153/libebl/eblcorenotetypename.c b/src/libebl/eblcorenotetypename.c
similarity index 100%
rename from 0.153/libebl/eblcorenotetypename.c
rename to src/libebl/eblcorenotetypename.c
diff --git a/0.153/libebl/ebldebugscnp.c b/src/libebl/ebldebugscnp.c
similarity index 100%
rename from 0.153/libebl/ebldebugscnp.c
rename to src/libebl/ebldebugscnp.c
diff --git a/0.153/libebl/ebldynamictagcheck.c b/src/libebl/ebldynamictagcheck.c
similarity index 100%
rename from 0.153/libebl/ebldynamictagcheck.c
rename to src/libebl/ebldynamictagcheck.c
diff --git a/0.153/libebl/ebldynamictagname.c b/src/libebl/ebldynamictagname.c
similarity index 100%
rename from 0.153/libebl/ebldynamictagname.c
rename to src/libebl/ebldynamictagname.c
diff --git a/0.153/libebl/eblelfclass.c b/src/libebl/eblelfclass.c
similarity index 100%
rename from 0.153/libebl/eblelfclass.c
rename to src/libebl/eblelfclass.c
diff --git a/0.153/libebl/eblelfdata.c b/src/libebl/eblelfdata.c
similarity index 100%
rename from 0.153/libebl/eblelfdata.c
rename to src/libebl/eblelfdata.c
diff --git a/0.153/libebl/eblelfmachine.c b/src/libebl/eblelfmachine.c
similarity index 100%
rename from 0.153/libebl/eblelfmachine.c
rename to src/libebl/eblelfmachine.c
diff --git a/0.153/libebl/eblgotpcreloccheck.c b/src/libebl/eblgotpcreloccheck.c
similarity index 100%
rename from 0.153/libebl/eblgotpcreloccheck.c
rename to src/libebl/eblgotpcreloccheck.c
diff --git a/0.153/libebl/eblgstrtab.c b/src/libebl/eblgstrtab.c
similarity index 100%
rename from 0.153/libebl/eblgstrtab.c
rename to src/libebl/eblgstrtab.c
diff --git a/0.153/libebl/eblmachineflagcheck.c b/src/libebl/eblmachineflagcheck.c
similarity index 100%
rename from 0.153/libebl/eblmachineflagcheck.c
rename to src/libebl/eblmachineflagcheck.c
diff --git a/0.153/libebl/eblmachineflagname.c b/src/libebl/eblmachineflagname.c
similarity index 100%
rename from 0.153/libebl/eblmachineflagname.c
rename to src/libebl/eblmachineflagname.c
diff --git a/0.153/libebl/eblmachinesectionflagcheck.c b/src/libebl/eblmachinesectionflagcheck.c
similarity index 100%
rename from 0.153/libebl/eblmachinesectionflagcheck.c
rename to src/libebl/eblmachinesectionflagcheck.c
diff --git a/0.153/libebl/eblnonerelocp.c b/src/libebl/eblnonerelocp.c
similarity index 100%
rename from 0.153/libebl/eblnonerelocp.c
rename to src/libebl/eblnonerelocp.c
diff --git a/0.153/libebl/eblobjecttypename.c b/src/libebl/eblobjecttypename.c
similarity index 100%
rename from 0.153/libebl/eblobjecttypename.c
rename to src/libebl/eblobjecttypename.c
diff --git a/0.153/libebl/eblobjnote.c b/src/libebl/eblobjnote.c
similarity index 100%
rename from 0.153/libebl/eblobjnote.c
rename to src/libebl/eblobjnote.c
diff --git a/0.153/libebl/eblobjnotetypename.c b/src/libebl/eblobjnotetypename.c
similarity index 100%
rename from 0.153/libebl/eblobjnotetypename.c
rename to src/libebl/eblobjnotetypename.c
diff --git a/0.153/libebl/eblopenbackend.c b/src/libebl/eblopenbackend.c
similarity index 100%
rename from 0.153/libebl/eblopenbackend.c
rename to src/libebl/eblopenbackend.c
diff --git a/0.153/libebl/eblosabiname.c b/src/libebl/eblosabiname.c
similarity index 100%
rename from 0.153/libebl/eblosabiname.c
rename to src/libebl/eblosabiname.c
diff --git a/0.153/libebl/eblreginfo.c b/src/libebl/eblreginfo.c
similarity index 100%
rename from 0.153/libebl/eblreginfo.c
rename to src/libebl/eblreginfo.c
diff --git a/0.153/libebl/eblrelativerelocp.c b/src/libebl/eblrelativerelocp.c
similarity index 100%
rename from 0.153/libebl/eblrelativerelocp.c
rename to src/libebl/eblrelativerelocp.c
diff --git a/0.153/libebl/eblrelocsimpletype.c b/src/libebl/eblrelocsimpletype.c
similarity index 100%
rename from 0.153/libebl/eblrelocsimpletype.c
rename to src/libebl/eblrelocsimpletype.c
diff --git a/0.153/libebl/eblreloctypecheck.c b/src/libebl/eblreloctypecheck.c
similarity index 100%
rename from 0.153/libebl/eblreloctypecheck.c
rename to src/libebl/eblreloctypecheck.c
diff --git a/0.153/libebl/eblreloctypename.c b/src/libebl/eblreloctypename.c
similarity index 100%
rename from 0.153/libebl/eblreloctypename.c
rename to src/libebl/eblreloctypename.c
diff --git a/0.153/libebl/eblrelocvaliduse.c b/src/libebl/eblrelocvaliduse.c
similarity index 100%
rename from 0.153/libebl/eblrelocvaliduse.c
rename to src/libebl/eblrelocvaliduse.c
diff --git a/0.153/libebl/eblretval.c b/src/libebl/eblretval.c
similarity index 100%
rename from 0.153/libebl/eblretval.c
rename to src/libebl/eblretval.c
diff --git a/0.153/libebl/eblsectionname.c b/src/libebl/eblsectionname.c
similarity index 100%
rename from 0.153/libebl/eblsectionname.c
rename to src/libebl/eblsectionname.c
diff --git a/0.153/libebl/eblsectionstripp.c b/src/libebl/eblsectionstripp.c
similarity index 100%
rename from 0.153/libebl/eblsectionstripp.c
rename to src/libebl/eblsectionstripp.c
diff --git a/0.153/libebl/eblsectiontypename.c b/src/libebl/eblsectiontypename.c
similarity index 100%
rename from 0.153/libebl/eblsectiontypename.c
rename to src/libebl/eblsectiontypename.c
diff --git a/0.153/libebl/eblsegmenttypename.c b/src/libebl/eblsegmenttypename.c
similarity index 100%
rename from 0.153/libebl/eblsegmenttypename.c
rename to src/libebl/eblsegmenttypename.c
diff --git a/0.153/libebl/eblshflagscombine.c b/src/libebl/eblshflagscombine.c
similarity index 100%
rename from 0.153/libebl/eblshflagscombine.c
rename to src/libebl/eblshflagscombine.c
diff --git a/0.153/libebl/eblstother.c b/src/libebl/eblstother.c
similarity index 100%
rename from 0.153/libebl/eblstother.c
rename to src/libebl/eblstother.c
diff --git a/0.153/libebl/eblstrtab.c b/src/libebl/eblstrtab.c
similarity index 100%
rename from 0.153/libebl/eblstrtab.c
rename to src/libebl/eblstrtab.c
diff --git a/0.153/libebl/eblsymbolbindingname.c b/src/libebl/eblsymbolbindingname.c
similarity index 100%
rename from 0.153/libebl/eblsymbolbindingname.c
rename to src/libebl/eblsymbolbindingname.c
diff --git a/0.153/libebl/eblsymboltypename.c b/src/libebl/eblsymboltypename.c
similarity index 100%
rename from 0.153/libebl/eblsymboltypename.c
rename to src/libebl/eblsymboltypename.c
diff --git a/0.153/libebl/eblsysvhashentrysize.c b/src/libebl/eblsysvhashentrysize.c
similarity index 100%
rename from 0.153/libebl/eblsysvhashentrysize.c
rename to src/libebl/eblsysvhashentrysize.c
diff --git a/0.153/libebl/eblwstrtab.c b/src/libebl/eblwstrtab.c
similarity index 100%
rename from 0.153/libebl/eblwstrtab.c
rename to src/libebl/eblwstrtab.c
diff --git a/0.153/libebl/libebl.h b/src/libebl/libebl.h
similarity index 100%
rename from 0.153/libebl/libebl.h
rename to src/libebl/libebl.h
diff --git a/0.153/libebl/libeblP.h b/src/libebl/libeblP.h
similarity index 100%
rename from 0.153/libebl/libeblP.h
rename to src/libebl/libeblP.h
diff --git a/0.153/libelf/Android.mk b/src/libelf/Android.mk
similarity index 94%
rename from 0.153/libelf/Android.mk
rename to src/libelf/Android.mk
index 1a8f94a..0fca8f6 100755
--- a/0.153/libelf/Android.mk
+++ b/src/libelf/Android.mk
@@ -143,20 +143,16 @@
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/.. \
 	$(LOCAL_PATH)/../lib \
-	$(LOCAL_PATH)/../libelf
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
 
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
 
 # to suppress the "pointer of type ‘void *’ used in arithmetic" warning
 LOCAL_CFLAGS += -Wno-pointer-arith
 
-# to fix machine-dependent issues
-LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
-
 LOCAL_MODULE := libelf
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif # linux
@@ -175,7 +171,6 @@
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/.. \
 	$(LOCAL_PATH)/../lib \
-	$(LOCAL_PATH)/../libelf
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../bionic-fixup
 
@@ -188,4 +183,6 @@
 
 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
similarity index 100%
rename from 0.153/libelf/ChangeLog
rename to src/libelf/ChangeLog
diff --git a/0.153/libelf/Makefile.am b/src/libelf/Makefile.am
similarity index 100%
rename from 0.153/libelf/Makefile.am
rename to src/libelf/Makefile.am
diff --git a/0.153/libelf/Makefile.in b/src/libelf/Makefile.in
similarity index 100%
rename from 0.153/libelf/Makefile.in
rename to src/libelf/Makefile.in
diff --git a/0.153/libelf/abstract.h b/src/libelf/abstract.h
similarity index 100%
rename from 0.153/libelf/abstract.h
rename to src/libelf/abstract.h
diff --git a/0.153/libelf/common.h b/src/libelf/common.h
similarity index 100%
rename from 0.153/libelf/common.h
rename to src/libelf/common.h
diff --git a/0.153/libelf/dl-hash.h b/src/libelf/dl-hash.h
similarity index 100%
rename from 0.153/libelf/dl-hash.h
rename to src/libelf/dl-hash.h
diff --git a/0.153/libelf/elf-knowledge.h b/src/libelf/elf-knowledge.h
similarity index 100%
rename from 0.153/libelf/elf-knowledge.h
rename to src/libelf/elf-knowledge.h
diff --git a/0.153/libelf/elf.h b/src/libelf/elf.h
similarity index 100%
rename from 0.153/libelf/elf.h
rename to src/libelf/elf.h
diff --git a/0.153/libelf/elf32_checksum.c b/src/libelf/elf32_checksum.c
similarity index 100%
rename from 0.153/libelf/elf32_checksum.c
rename to src/libelf/elf32_checksum.c
diff --git a/0.153/libelf/elf32_fsize.c b/src/libelf/elf32_fsize.c
similarity index 100%
rename from 0.153/libelf/elf32_fsize.c
rename to src/libelf/elf32_fsize.c
diff --git a/0.153/libelf/elf32_getehdr.c b/src/libelf/elf32_getehdr.c
similarity index 100%
rename from 0.153/libelf/elf32_getehdr.c
rename to src/libelf/elf32_getehdr.c
diff --git a/0.153/libelf/elf32_getphdr.c b/src/libelf/elf32_getphdr.c
similarity index 100%
rename from 0.153/libelf/elf32_getphdr.c
rename to src/libelf/elf32_getphdr.c
diff --git a/0.153/libelf/elf32_getshdr.c b/src/libelf/elf32_getshdr.c
similarity index 100%
rename from 0.153/libelf/elf32_getshdr.c
rename to src/libelf/elf32_getshdr.c
diff --git a/0.153/libelf/elf32_newehdr.c b/src/libelf/elf32_newehdr.c
similarity index 100%
rename from 0.153/libelf/elf32_newehdr.c
rename to src/libelf/elf32_newehdr.c
diff --git a/0.153/libelf/elf32_newphdr.c b/src/libelf/elf32_newphdr.c
similarity index 100%
rename from 0.153/libelf/elf32_newphdr.c
rename to src/libelf/elf32_newphdr.c
diff --git a/0.153/libelf/elf32_offscn.c b/src/libelf/elf32_offscn.c
similarity index 100%
rename from 0.153/libelf/elf32_offscn.c
rename to src/libelf/elf32_offscn.c
diff --git a/0.153/libelf/elf32_updatefile.c b/src/libelf/elf32_updatefile.c
similarity index 100%
rename from 0.153/libelf/elf32_updatefile.c
rename to src/libelf/elf32_updatefile.c
diff --git a/0.153/libelf/elf32_updatenull.c b/src/libelf/elf32_updatenull.c
similarity index 100%
rename from 0.153/libelf/elf32_updatenull.c
rename to src/libelf/elf32_updatenull.c
diff --git a/0.153/libelf/elf32_xlatetof.c b/src/libelf/elf32_xlatetof.c
similarity index 100%
rename from 0.153/libelf/elf32_xlatetof.c
rename to src/libelf/elf32_xlatetof.c
diff --git a/0.153/libelf/elf32_xlatetom.c b/src/libelf/elf32_xlatetom.c
similarity index 100%
rename from 0.153/libelf/elf32_xlatetom.c
rename to src/libelf/elf32_xlatetom.c
diff --git a/0.153/libelf/elf64_checksum.c b/src/libelf/elf64_checksum.c
similarity index 100%
rename from 0.153/libelf/elf64_checksum.c
rename to src/libelf/elf64_checksum.c
diff --git a/0.153/libelf/elf64_fsize.c b/src/libelf/elf64_fsize.c
similarity index 100%
rename from 0.153/libelf/elf64_fsize.c
rename to src/libelf/elf64_fsize.c
diff --git a/0.153/libelf/elf64_getehdr.c b/src/libelf/elf64_getehdr.c
similarity index 100%
rename from 0.153/libelf/elf64_getehdr.c
rename to src/libelf/elf64_getehdr.c
diff --git a/0.153/libelf/elf64_getphdr.c b/src/libelf/elf64_getphdr.c
similarity index 100%
rename from 0.153/libelf/elf64_getphdr.c
rename to src/libelf/elf64_getphdr.c
diff --git a/0.153/libelf/elf64_getshdr.c b/src/libelf/elf64_getshdr.c
similarity index 100%
rename from 0.153/libelf/elf64_getshdr.c
rename to src/libelf/elf64_getshdr.c
diff --git a/0.153/libelf/elf64_newehdr.c b/src/libelf/elf64_newehdr.c
similarity index 100%
rename from 0.153/libelf/elf64_newehdr.c
rename to src/libelf/elf64_newehdr.c
diff --git a/0.153/libelf/elf64_newphdr.c b/src/libelf/elf64_newphdr.c
similarity index 100%
rename from 0.153/libelf/elf64_newphdr.c
rename to src/libelf/elf64_newphdr.c
diff --git a/0.153/libelf/elf64_offscn.c b/src/libelf/elf64_offscn.c
similarity index 100%
rename from 0.153/libelf/elf64_offscn.c
rename to src/libelf/elf64_offscn.c
diff --git a/0.153/libelf/elf64_updatefile.c b/src/libelf/elf64_updatefile.c
similarity index 100%
rename from 0.153/libelf/elf64_updatefile.c
rename to src/libelf/elf64_updatefile.c
diff --git a/0.153/libelf/elf64_updatenull.c b/src/libelf/elf64_updatenull.c
similarity index 100%
rename from 0.153/libelf/elf64_updatenull.c
rename to src/libelf/elf64_updatenull.c
diff --git a/0.153/libelf/elf64_xlatetof.c b/src/libelf/elf64_xlatetof.c
similarity index 100%
rename from 0.153/libelf/elf64_xlatetof.c
rename to src/libelf/elf64_xlatetof.c
diff --git a/0.153/libelf/elf64_xlatetom.c b/src/libelf/elf64_xlatetom.c
similarity index 100%
rename from 0.153/libelf/elf64_xlatetom.c
rename to src/libelf/elf64_xlatetom.c
diff --git a/0.153/libelf/elf_begin.c b/src/libelf/elf_begin.c
similarity index 100%
rename from 0.153/libelf/elf_begin.c
rename to src/libelf/elf_begin.c
diff --git a/0.153/libelf/elf_clone.c b/src/libelf/elf_clone.c
similarity index 100%
rename from 0.153/libelf/elf_clone.c
rename to src/libelf/elf_clone.c
diff --git a/0.153/libelf/elf_cntl.c b/src/libelf/elf_cntl.c
similarity index 100%
rename from 0.153/libelf/elf_cntl.c
rename to src/libelf/elf_cntl.c
diff --git a/0.153/libelf/elf_end.c b/src/libelf/elf_end.c
similarity index 100%
rename from 0.153/libelf/elf_end.c
rename to src/libelf/elf_end.c
diff --git a/0.153/libelf/elf_error.c b/src/libelf/elf_error.c
similarity index 100%
rename from 0.153/libelf/elf_error.c
rename to src/libelf/elf_error.c
diff --git a/0.153/libelf/elf_fill.c b/src/libelf/elf_fill.c
similarity index 100%
rename from 0.153/libelf/elf_fill.c
rename to src/libelf/elf_fill.c
diff --git a/0.153/libelf/elf_flagdata.c b/src/libelf/elf_flagdata.c
similarity index 100%
rename from 0.153/libelf/elf_flagdata.c
rename to src/libelf/elf_flagdata.c
diff --git a/0.153/libelf/elf_flagehdr.c b/src/libelf/elf_flagehdr.c
similarity index 100%
rename from 0.153/libelf/elf_flagehdr.c
rename to src/libelf/elf_flagehdr.c
diff --git a/0.153/libelf/elf_flagelf.c b/src/libelf/elf_flagelf.c
similarity index 100%
rename from 0.153/libelf/elf_flagelf.c
rename to src/libelf/elf_flagelf.c
diff --git a/0.153/libelf/elf_flagphdr.c b/src/libelf/elf_flagphdr.c
similarity index 100%
rename from 0.153/libelf/elf_flagphdr.c
rename to src/libelf/elf_flagphdr.c
diff --git a/0.153/libelf/elf_flagscn.c b/src/libelf/elf_flagscn.c
similarity index 100%
rename from 0.153/libelf/elf_flagscn.c
rename to src/libelf/elf_flagscn.c
diff --git a/0.153/libelf/elf_flagshdr.c b/src/libelf/elf_flagshdr.c
similarity index 100%
rename from 0.153/libelf/elf_flagshdr.c
rename to src/libelf/elf_flagshdr.c
diff --git a/0.153/libelf/elf_getarhdr.c b/src/libelf/elf_getarhdr.c
similarity index 100%
rename from 0.153/libelf/elf_getarhdr.c
rename to src/libelf/elf_getarhdr.c
diff --git a/0.153/libelf/elf_getaroff.c b/src/libelf/elf_getaroff.c
similarity index 100%
rename from 0.153/libelf/elf_getaroff.c
rename to src/libelf/elf_getaroff.c
diff --git a/0.153/libelf/elf_getarsym.c b/src/libelf/elf_getarsym.c
similarity index 100%
rename from 0.153/libelf/elf_getarsym.c
rename to src/libelf/elf_getarsym.c
diff --git a/0.153/libelf/elf_getbase.c b/src/libelf/elf_getbase.c
similarity index 100%
rename from 0.153/libelf/elf_getbase.c
rename to src/libelf/elf_getbase.c
diff --git a/0.153/libelf/elf_getdata.c b/src/libelf/elf_getdata.c
similarity index 100%
rename from 0.153/libelf/elf_getdata.c
rename to src/libelf/elf_getdata.c
diff --git a/0.153/libelf/elf_getdata_rawchunk.c b/src/libelf/elf_getdata_rawchunk.c
similarity index 100%
rename from 0.153/libelf/elf_getdata_rawchunk.c
rename to src/libelf/elf_getdata_rawchunk.c
diff --git a/0.153/libelf/elf_getident.c b/src/libelf/elf_getident.c
similarity index 100%
rename from 0.153/libelf/elf_getident.c
rename to src/libelf/elf_getident.c
diff --git a/0.153/libelf/elf_getphdrnum.c b/src/libelf/elf_getphdrnum.c
similarity index 100%
rename from 0.153/libelf/elf_getphdrnum.c
rename to src/libelf/elf_getphdrnum.c
diff --git a/0.153/libelf/elf_getscn.c b/src/libelf/elf_getscn.c
similarity index 100%
rename from 0.153/libelf/elf_getscn.c
rename to src/libelf/elf_getscn.c
diff --git a/0.153/libelf/elf_getshdrnum.c b/src/libelf/elf_getshdrnum.c
similarity index 100%
rename from 0.153/libelf/elf_getshdrnum.c
rename to src/libelf/elf_getshdrnum.c
diff --git a/0.153/libelf/elf_getshdrstrndx.c b/src/libelf/elf_getshdrstrndx.c
similarity index 100%
rename from 0.153/libelf/elf_getshdrstrndx.c
rename to src/libelf/elf_getshdrstrndx.c
diff --git a/0.153/libelf/elf_gnu_hash.c b/src/libelf/elf_gnu_hash.c
similarity index 100%
rename from 0.153/libelf/elf_gnu_hash.c
rename to src/libelf/elf_gnu_hash.c
diff --git a/0.153/libelf/elf_hash.c b/src/libelf/elf_hash.c
similarity index 100%
rename from 0.153/libelf/elf_hash.c
rename to src/libelf/elf_hash.c
diff --git a/0.153/libelf/elf_kind.c b/src/libelf/elf_kind.c
similarity index 100%
rename from 0.153/libelf/elf_kind.c
rename to src/libelf/elf_kind.c
diff --git a/0.153/libelf/elf_memory.c b/src/libelf/elf_memory.c
similarity index 100%
rename from 0.153/libelf/elf_memory.c
rename to src/libelf/elf_memory.c
diff --git a/0.153/libelf/elf_ndxscn.c b/src/libelf/elf_ndxscn.c
similarity index 100%
rename from 0.153/libelf/elf_ndxscn.c
rename to src/libelf/elf_ndxscn.c
diff --git a/0.153/libelf/elf_newdata.c b/src/libelf/elf_newdata.c
similarity index 100%
rename from 0.153/libelf/elf_newdata.c
rename to src/libelf/elf_newdata.c
diff --git a/0.153/libelf/elf_newscn.c b/src/libelf/elf_newscn.c
similarity index 100%
rename from 0.153/libelf/elf_newscn.c
rename to src/libelf/elf_newscn.c
diff --git a/0.153/libelf/elf_next.c b/src/libelf/elf_next.c
similarity index 100%
rename from 0.153/libelf/elf_next.c
rename to src/libelf/elf_next.c
diff --git a/0.153/libelf/elf_nextscn.c b/src/libelf/elf_nextscn.c
similarity index 100%
rename from 0.153/libelf/elf_nextscn.c
rename to src/libelf/elf_nextscn.c
diff --git a/0.153/libelf/elf_rand.c b/src/libelf/elf_rand.c
similarity index 100%
rename from 0.153/libelf/elf_rand.c
rename to src/libelf/elf_rand.c
diff --git a/0.153/libelf/elf_rawdata.c b/src/libelf/elf_rawdata.c
similarity index 100%
rename from 0.153/libelf/elf_rawdata.c
rename to src/libelf/elf_rawdata.c
diff --git a/0.153/libelf/elf_rawfile.c b/src/libelf/elf_rawfile.c
similarity index 100%
rename from 0.153/libelf/elf_rawfile.c
rename to src/libelf/elf_rawfile.c
diff --git a/0.153/libelf/elf_readall.c b/src/libelf/elf_readall.c
similarity index 100%
rename from 0.153/libelf/elf_readall.c
rename to src/libelf/elf_readall.c
diff --git a/0.153/libelf/elf_scnshndx.c b/src/libelf/elf_scnshndx.c
similarity index 100%
rename from 0.153/libelf/elf_scnshndx.c
rename to src/libelf/elf_scnshndx.c
diff --git a/0.153/libelf/elf_strptr.c b/src/libelf/elf_strptr.c
similarity index 100%
rename from 0.153/libelf/elf_strptr.c
rename to src/libelf/elf_strptr.c
diff --git a/0.153/libelf/elf_update.c b/src/libelf/elf_update.c
similarity index 100%
rename from 0.153/libelf/elf_update.c
rename to src/libelf/elf_update.c
diff --git a/0.153/libelf/elf_version.c b/src/libelf/elf_version.c
similarity index 100%
rename from 0.153/libelf/elf_version.c
rename to src/libelf/elf_version.c
diff --git a/0.153/libelf/exttypes.h b/src/libelf/exttypes.h
similarity index 100%
rename from 0.153/libelf/exttypes.h
rename to src/libelf/exttypes.h
diff --git a/0.153/libelf/gelf.h b/src/libelf/gelf.h
similarity index 100%
rename from 0.153/libelf/gelf.h
rename to src/libelf/gelf.h
diff --git a/0.153/libelf/gelf_checksum.c b/src/libelf/gelf_checksum.c
similarity index 100%
rename from 0.153/libelf/gelf_checksum.c
rename to src/libelf/gelf_checksum.c
diff --git a/0.153/libelf/gelf_fsize.c b/src/libelf/gelf_fsize.c
similarity index 100%
rename from 0.153/libelf/gelf_fsize.c
rename to src/libelf/gelf_fsize.c
diff --git a/0.153/libelf/gelf_getauxv.c b/src/libelf/gelf_getauxv.c
similarity index 100%
rename from 0.153/libelf/gelf_getauxv.c
rename to src/libelf/gelf_getauxv.c
diff --git a/0.153/libelf/gelf_getclass.c b/src/libelf/gelf_getclass.c
similarity index 100%
rename from 0.153/libelf/gelf_getclass.c
rename to src/libelf/gelf_getclass.c
diff --git a/0.153/libelf/gelf_getdyn.c b/src/libelf/gelf_getdyn.c
similarity index 100%
rename from 0.153/libelf/gelf_getdyn.c
rename to src/libelf/gelf_getdyn.c
diff --git a/0.153/libelf/gelf_getehdr.c b/src/libelf/gelf_getehdr.c
similarity index 100%
rename from 0.153/libelf/gelf_getehdr.c
rename to src/libelf/gelf_getehdr.c
diff --git a/0.153/libelf/gelf_getlib.c b/src/libelf/gelf_getlib.c
similarity index 100%
rename from 0.153/libelf/gelf_getlib.c
rename to src/libelf/gelf_getlib.c
diff --git a/0.153/libelf/gelf_getmove.c b/src/libelf/gelf_getmove.c
similarity index 100%
rename from 0.153/libelf/gelf_getmove.c
rename to src/libelf/gelf_getmove.c
diff --git a/0.153/libelf/gelf_getnote.c b/src/libelf/gelf_getnote.c
similarity index 100%
rename from 0.153/libelf/gelf_getnote.c
rename to src/libelf/gelf_getnote.c
diff --git a/0.153/libelf/gelf_getphdr.c b/src/libelf/gelf_getphdr.c
similarity index 100%
rename from 0.153/libelf/gelf_getphdr.c
rename to src/libelf/gelf_getphdr.c
diff --git a/0.153/libelf/gelf_getrel.c b/src/libelf/gelf_getrel.c
similarity index 100%
rename from 0.153/libelf/gelf_getrel.c
rename to src/libelf/gelf_getrel.c
diff --git a/0.153/libelf/gelf_getrela.c b/src/libelf/gelf_getrela.c
similarity index 100%
rename from 0.153/libelf/gelf_getrela.c
rename to src/libelf/gelf_getrela.c
diff --git a/0.153/libelf/gelf_getshdr.c b/src/libelf/gelf_getshdr.c
similarity index 100%
rename from 0.153/libelf/gelf_getshdr.c
rename to src/libelf/gelf_getshdr.c
diff --git a/0.153/libelf/gelf_getsym.c b/src/libelf/gelf_getsym.c
similarity index 100%
rename from 0.153/libelf/gelf_getsym.c
rename to src/libelf/gelf_getsym.c
diff --git a/0.153/libelf/gelf_getsyminfo.c b/src/libelf/gelf_getsyminfo.c
similarity index 100%
rename from 0.153/libelf/gelf_getsyminfo.c
rename to src/libelf/gelf_getsyminfo.c
diff --git a/0.153/libelf/gelf_getsymshndx.c b/src/libelf/gelf_getsymshndx.c
similarity index 100%
rename from 0.153/libelf/gelf_getsymshndx.c
rename to src/libelf/gelf_getsymshndx.c
diff --git a/0.153/libelf/gelf_getverdaux.c b/src/libelf/gelf_getverdaux.c
similarity index 100%
rename from 0.153/libelf/gelf_getverdaux.c
rename to src/libelf/gelf_getverdaux.c
diff --git a/0.153/libelf/gelf_getverdef.c b/src/libelf/gelf_getverdef.c
similarity index 100%
rename from 0.153/libelf/gelf_getverdef.c
rename to src/libelf/gelf_getverdef.c
diff --git a/0.153/libelf/gelf_getvernaux.c b/src/libelf/gelf_getvernaux.c
similarity index 100%
rename from 0.153/libelf/gelf_getvernaux.c
rename to src/libelf/gelf_getvernaux.c
diff --git a/0.153/libelf/gelf_getverneed.c b/src/libelf/gelf_getverneed.c
similarity index 100%
rename from 0.153/libelf/gelf_getverneed.c
rename to src/libelf/gelf_getverneed.c
diff --git a/0.153/libelf/gelf_getversym.c b/src/libelf/gelf_getversym.c
similarity index 100%
rename from 0.153/libelf/gelf_getversym.c
rename to src/libelf/gelf_getversym.c
diff --git a/0.153/libelf/gelf_newehdr.c b/src/libelf/gelf_newehdr.c
similarity index 100%
rename from 0.153/libelf/gelf_newehdr.c
rename to src/libelf/gelf_newehdr.c
diff --git a/0.153/libelf/gelf_newphdr.c b/src/libelf/gelf_newphdr.c
similarity index 100%
rename from 0.153/libelf/gelf_newphdr.c
rename to src/libelf/gelf_newphdr.c
diff --git a/0.153/libelf/gelf_offscn.c b/src/libelf/gelf_offscn.c
similarity index 100%
rename from 0.153/libelf/gelf_offscn.c
rename to src/libelf/gelf_offscn.c
diff --git a/0.153/libelf/gelf_update_auxv.c b/src/libelf/gelf_update_auxv.c
similarity index 100%
rename from 0.153/libelf/gelf_update_auxv.c
rename to src/libelf/gelf_update_auxv.c
diff --git a/0.153/libelf/gelf_update_dyn.c b/src/libelf/gelf_update_dyn.c
similarity index 100%
rename from 0.153/libelf/gelf_update_dyn.c
rename to src/libelf/gelf_update_dyn.c
diff --git a/0.153/libelf/gelf_update_ehdr.c b/src/libelf/gelf_update_ehdr.c
similarity index 100%
rename from 0.153/libelf/gelf_update_ehdr.c
rename to src/libelf/gelf_update_ehdr.c
diff --git a/0.153/libelf/gelf_update_lib.c b/src/libelf/gelf_update_lib.c
similarity index 100%
rename from 0.153/libelf/gelf_update_lib.c
rename to src/libelf/gelf_update_lib.c
diff --git a/0.153/libelf/gelf_update_move.c b/src/libelf/gelf_update_move.c
similarity index 100%
rename from 0.153/libelf/gelf_update_move.c
rename to src/libelf/gelf_update_move.c
diff --git a/0.153/libelf/gelf_update_phdr.c b/src/libelf/gelf_update_phdr.c
similarity index 100%
rename from 0.153/libelf/gelf_update_phdr.c
rename to src/libelf/gelf_update_phdr.c
diff --git a/0.153/libelf/gelf_update_rel.c b/src/libelf/gelf_update_rel.c
similarity index 100%
rename from 0.153/libelf/gelf_update_rel.c
rename to src/libelf/gelf_update_rel.c
diff --git a/0.153/libelf/gelf_update_rela.c b/src/libelf/gelf_update_rela.c
similarity index 100%
rename from 0.153/libelf/gelf_update_rela.c
rename to src/libelf/gelf_update_rela.c
diff --git a/0.153/libelf/gelf_update_shdr.c b/src/libelf/gelf_update_shdr.c
similarity index 100%
rename from 0.153/libelf/gelf_update_shdr.c
rename to src/libelf/gelf_update_shdr.c
diff --git a/0.153/libelf/gelf_update_sym.c b/src/libelf/gelf_update_sym.c
similarity index 100%
rename from 0.153/libelf/gelf_update_sym.c
rename to src/libelf/gelf_update_sym.c
diff --git a/0.153/libelf/gelf_update_syminfo.c b/src/libelf/gelf_update_syminfo.c
similarity index 100%
rename from 0.153/libelf/gelf_update_syminfo.c
rename to src/libelf/gelf_update_syminfo.c
diff --git a/0.153/libelf/gelf_update_symshndx.c b/src/libelf/gelf_update_symshndx.c
similarity index 100%
rename from 0.153/libelf/gelf_update_symshndx.c
rename to src/libelf/gelf_update_symshndx.c
diff --git a/0.153/libelf/gelf_update_verdaux.c b/src/libelf/gelf_update_verdaux.c
similarity index 100%
rename from 0.153/libelf/gelf_update_verdaux.c
rename to src/libelf/gelf_update_verdaux.c
diff --git a/0.153/libelf/gelf_update_verdef.c b/src/libelf/gelf_update_verdef.c
similarity index 100%
rename from 0.153/libelf/gelf_update_verdef.c
rename to src/libelf/gelf_update_verdef.c
diff --git a/0.153/libelf/gelf_update_vernaux.c b/src/libelf/gelf_update_vernaux.c
similarity index 100%
rename from 0.153/libelf/gelf_update_vernaux.c
rename to src/libelf/gelf_update_vernaux.c
diff --git a/0.153/libelf/gelf_update_verneed.c b/src/libelf/gelf_update_verneed.c
similarity index 100%
rename from 0.153/libelf/gelf_update_verneed.c
rename to src/libelf/gelf_update_verneed.c
diff --git a/0.153/libelf/gelf_update_versym.c b/src/libelf/gelf_update_versym.c
similarity index 100%
rename from 0.153/libelf/gelf_update_versym.c
rename to src/libelf/gelf_update_versym.c
diff --git a/0.153/libelf/gelf_xlate.c b/src/libelf/gelf_xlate.c
similarity index 100%
rename from 0.153/libelf/gelf_xlate.c
rename to src/libelf/gelf_xlate.c
diff --git a/0.153/libelf/gelf_xlate.h b/src/libelf/gelf_xlate.h
similarity index 100%
rename from 0.153/libelf/gelf_xlate.h
rename to src/libelf/gelf_xlate.h
diff --git a/0.153/libelf/gelf_xlatetof.c b/src/libelf/gelf_xlatetof.c
similarity index 100%
rename from 0.153/libelf/gelf_xlatetof.c
rename to src/libelf/gelf_xlatetof.c
diff --git a/0.153/libelf/gelf_xlatetom.c b/src/libelf/gelf_xlatetom.c
similarity index 100%
rename from 0.153/libelf/gelf_xlatetom.c
rename to src/libelf/gelf_xlatetom.c
diff --git a/0.153/libelf/gnuhash_xlate.h b/src/libelf/gnuhash_xlate.h
similarity index 100%
rename from 0.153/libelf/gnuhash_xlate.h
rename to src/libelf/gnuhash_xlate.h
diff --git a/0.153/libelf/libelf.h b/src/libelf/libelf.h
similarity index 100%
rename from 0.153/libelf/libelf.h
rename to src/libelf/libelf.h
diff --git a/0.153/libelf/libelf.map b/src/libelf/libelf.map
similarity index 100%
rename from 0.153/libelf/libelf.map
rename to src/libelf/libelf.map
diff --git a/0.153/libelf/libelfP.h b/src/libelf/libelfP.h
similarity index 100%
rename from 0.153/libelf/libelfP.h
rename to src/libelf/libelfP.h
diff --git a/0.153/libelf/libelf_crc32.c b/src/libelf/libelf_crc32.c
similarity index 100%
rename from 0.153/libelf/libelf_crc32.c
rename to src/libelf/libelf_crc32.c
diff --git a/0.153/libelf/libelf_next_prime.c b/src/libelf/libelf_next_prime.c
similarity index 100%
rename from 0.153/libelf/libelf_next_prime.c
rename to src/libelf/libelf_next_prime.c
diff --git a/0.153/libelf/nlist.c b/src/libelf/nlist.c
similarity index 100%
rename from 0.153/libelf/nlist.c
rename to src/libelf/nlist.c
diff --git a/0.153/libelf/nlist.h b/src/libelf/nlist.h
similarity index 100%
rename from 0.153/libelf/nlist.h
rename to src/libelf/nlist.h
diff --git a/0.153/libelf/note_xlate.h b/src/libelf/note_xlate.h
similarity index 100%
rename from 0.153/libelf/note_xlate.h
rename to src/libelf/note_xlate.h
diff --git a/0.153/libelf/version_xlate.h b/src/libelf/version_xlate.h
similarity index 100%
rename from 0.153/libelf/version_xlate.h
rename to src/libelf/version_xlate.h
diff --git a/0.153/m4/ChangeLog b/src/m4/ChangeLog
similarity index 100%
rename from 0.153/m4/ChangeLog
rename to src/m4/ChangeLog
diff --git a/0.153/m4/Makefile.am b/src/m4/Makefile.am
similarity index 100%
rename from 0.153/m4/Makefile.am
rename to src/m4/Makefile.am
diff --git a/0.153/m4/Makefile.in b/src/m4/Makefile.in
similarity index 100%
rename from 0.153/m4/Makefile.in
rename to src/m4/Makefile.in
diff --git a/0.153/m4/codeset.m4 b/src/m4/codeset.m4
similarity index 100%
rename from 0.153/m4/codeset.m4
rename to src/m4/codeset.m4
diff --git a/0.153/m4/gettext.m4 b/src/m4/gettext.m4
similarity index 100%
rename from 0.153/m4/gettext.m4
rename to src/m4/gettext.m4
diff --git a/0.153/m4/iconv.m4 b/src/m4/iconv.m4
similarity index 100%
rename from 0.153/m4/iconv.m4
rename to src/m4/iconv.m4
diff --git a/0.153/m4/lcmessage.m4 b/src/m4/lcmessage.m4
similarity index 100%
rename from 0.153/m4/lcmessage.m4
rename to src/m4/lcmessage.m4
diff --git a/0.153/m4/nls.m4 b/src/m4/nls.m4
similarity index 100%
rename from 0.153/m4/nls.m4
rename to src/m4/nls.m4
diff --git a/0.153/m4/po.m4 b/src/m4/po.m4
similarity index 100%
rename from 0.153/m4/po.m4
rename to src/m4/po.m4
diff --git a/0.153/m4/progtest.m4 b/src/m4/progtest.m4
similarity index 100%
rename from 0.153/m4/progtest.m4
rename to src/m4/progtest.m4
diff --git a/0.153/m4/zip.m4 b/src/m4/zip.m4
similarity index 100%
rename from 0.153/m4/zip.m4
rename to src/m4/zip.m4
diff --git a/0.153/po/ChangeLog b/src/po/ChangeLog
similarity index 100%
rename from 0.153/po/ChangeLog
rename to src/po/ChangeLog
diff --git a/0.153/po/LINGUAS b/src/po/LINGUAS
similarity index 100%
rename from 0.153/po/LINGUAS
rename to src/po/LINGUAS
diff --git a/0.153/po/Makefile.in.in b/src/po/Makefile.in.in
similarity index 100%
rename from 0.153/po/Makefile.in.in
rename to src/po/Makefile.in.in
diff --git a/0.153/po/Makevars b/src/po/Makevars
similarity index 100%
rename from 0.153/po/Makevars
rename to src/po/Makevars
diff --git a/0.153/po/POTFILES.in b/src/po/POTFILES.in
similarity index 100%
rename from 0.153/po/POTFILES.in
rename to src/po/POTFILES.in
diff --git a/0.153/po/Rules-quot b/src/po/Rules-quot
similarity index 100%
rename from 0.153/po/Rules-quot
rename to src/po/Rules-quot
diff --git a/0.153/po/boldquot.sed b/src/po/boldquot.sed
similarity index 100%
rename from 0.153/po/boldquot.sed
rename to src/po/boldquot.sed
diff --git a/0.153/po/de.gmo b/src/po/de.gmo
similarity index 100%
rename from 0.153/po/de.gmo
rename to src/po/de.gmo
Binary files differ
diff --git a/0.153/po/de.po b/src/po/de.po
similarity index 100%
rename from 0.153/po/de.po
rename to src/po/de.po
diff --git a/0.153/po/elfutils.pot b/src/po/elfutils.pot
similarity index 100%
rename from 0.153/po/elfutils.pot
rename to src/po/elfutils.pot
diff --git a/0.153/po/en@boldquot.gmo b/src/po/en@boldquot.gmo
similarity index 100%
rename from 0.153/po/en@boldquot.gmo
rename to src/po/en@boldquot.gmo
Binary files differ
diff --git a/0.153/po/en@boldquot.header b/src/po/en@boldquot.header
similarity index 100%
rename from 0.153/po/en@boldquot.header
rename to src/po/en@boldquot.header
diff --git a/0.153/po/en@boldquot.po b/src/po/en@boldquot.po
similarity index 100%
rename from 0.153/po/en@boldquot.po
rename to src/po/en@boldquot.po
diff --git a/0.153/po/en@quot.gmo b/src/po/en@quot.gmo
similarity index 100%
rename from 0.153/po/en@quot.gmo
rename to src/po/en@quot.gmo
Binary files differ
diff --git a/0.153/po/en@quot.header b/src/po/en@quot.header
similarity index 100%
rename from 0.153/po/en@quot.header
rename to src/po/en@quot.header
diff --git a/0.153/po/en@quot.po b/src/po/en@quot.po
similarity index 100%
rename from 0.153/po/en@quot.po
rename to src/po/en@quot.po
diff --git a/0.153/po/es.gmo b/src/po/es.gmo
similarity index 100%
rename from 0.153/po/es.gmo
rename to src/po/es.gmo
Binary files differ
diff --git a/0.153/po/es.po b/src/po/es.po
similarity index 100%
rename from 0.153/po/es.po
rename to src/po/es.po
diff --git a/0.153/po/insert-header.sin b/src/po/insert-header.sin
similarity index 100%
rename from 0.153/po/insert-header.sin
rename to src/po/insert-header.sin
diff --git a/0.153/po/ja.gmo b/src/po/ja.gmo
similarity index 100%
rename from 0.153/po/ja.gmo
rename to src/po/ja.gmo
Binary files differ
diff --git a/0.153/po/ja.po b/src/po/ja.po
similarity index 100%
rename from 0.153/po/ja.po
rename to src/po/ja.po
diff --git a/0.153/po/pl.gmo b/src/po/pl.gmo
similarity index 100%
rename from 0.153/po/pl.gmo
rename to src/po/pl.gmo
Binary files differ
diff --git a/0.153/po/pl.po b/src/po/pl.po
similarity index 100%
rename from 0.153/po/pl.po
rename to src/po/pl.po
diff --git a/0.153/po/quot.sed b/src/po/quot.sed
similarity index 100%
rename from 0.153/po/quot.sed
rename to src/po/quot.sed
diff --git a/0.153/po/remove-potcdate.sin b/src/po/remove-potcdate.sin
similarity index 100%
rename from 0.153/po/remove-potcdate.sin
rename to src/po/remove-potcdate.sin
diff --git a/0.153/po/stamp-po b/src/po/stamp-po
similarity index 100%
rename from 0.153/po/stamp-po
rename to src/po/stamp-po
diff --git a/0.153/po/uk.gmo b/src/po/uk.gmo
similarity index 100%
rename from 0.153/po/uk.gmo
rename to src/po/uk.gmo
Binary files differ
diff --git a/0.153/po/uk.po b/src/po/uk.po
similarity index 100%
rename from 0.153/po/uk.po
rename to src/po/uk.po
diff --git a/0.153/src/ChangeLog b/src/src/ChangeLog
similarity index 100%
rename from 0.153/src/ChangeLog
rename to src/src/ChangeLog
diff --git a/0.153/src/Makefile.am b/src/src/Makefile.am
similarity index 100%
rename from 0.153/src/Makefile.am
rename to src/src/Makefile.am
diff --git a/0.153/src/Makefile.in b/src/src/Makefile.in
similarity index 100%
rename from 0.153/src/Makefile.in
rename to src/src/Makefile.in
diff --git a/0.153/src/addr2line.c b/src/src/addr2line.c
similarity index 100%
rename from 0.153/src/addr2line.c
rename to src/src/addr2line.c
diff --git a/0.153/src/ar.c b/src/src/ar.c
similarity index 100%
rename from 0.153/src/ar.c
rename to src/src/ar.c
diff --git a/0.153/src/arlib-argp.c b/src/src/arlib-argp.c
similarity index 100%
rename from 0.153/src/arlib-argp.c
rename to src/src/arlib-argp.c
diff --git a/0.153/src/arlib.c b/src/src/arlib.c
similarity index 100%
rename from 0.153/src/arlib.c
rename to src/src/arlib.c
diff --git a/0.153/src/arlib.h b/src/src/arlib.h
similarity index 100%
rename from 0.153/src/arlib.h
rename to src/src/arlib.h
diff --git a/0.153/src/arlib2.c b/src/src/arlib2.c
similarity index 100%
rename from 0.153/src/arlib2.c
rename to src/src/arlib2.c
diff --git a/0.153/src/debugpred.h b/src/src/debugpred.h
similarity index 100%
rename from 0.153/src/debugpred.h
rename to src/src/debugpred.h
diff --git a/0.153/src/elf32-i386.script b/src/src/elf32-i386.script
similarity index 100%
rename from 0.153/src/elf32-i386.script
rename to src/src/elf32-i386.script
diff --git a/0.153/src/elfcmp.c b/src/src/elfcmp.c
similarity index 100%
rename from 0.153/src/elfcmp.c
rename to src/src/elfcmp.c
diff --git a/0.153/src/elflint.c b/src/src/elflint.c
similarity index 100%
rename from 0.153/src/elflint.c
rename to src/src/elflint.c
diff --git a/0.153/src/findtextrel.c b/src/src/findtextrel.c
similarity index 100%
rename from 0.153/src/findtextrel.c
rename to src/src/findtextrel.c
diff --git a/0.153/src/i386_ld.c b/src/src/i386_ld.c
similarity index 100%
rename from 0.153/src/i386_ld.c
rename to src/src/i386_ld.c
diff --git a/0.153/src/ld.c b/src/src/ld.c
similarity index 100%
rename from 0.153/src/ld.c
rename to src/src/ld.c
diff --git a/0.153/src/ld.h b/src/src/ld.h
similarity index 100%
rename from 0.153/src/ld.h
rename to src/src/ld.h
diff --git a/0.153/src/ldgeneric.c b/src/src/ldgeneric.c
similarity index 100%
rename from 0.153/src/ldgeneric.c
rename to src/src/ldgeneric.c
diff --git a/0.153/src/ldlex.c b/src/src/ldlex.c
similarity index 100%
rename from 0.153/src/ldlex.c
rename to src/src/ldlex.c
diff --git a/0.153/src/ldlex.l b/src/src/ldlex.l
similarity index 100%
rename from 0.153/src/ldlex.l
rename to src/src/ldlex.l
diff --git a/0.153/src/ldscript.c b/src/src/ldscript.c
similarity index 100%
rename from 0.153/src/ldscript.c
rename to src/src/ldscript.c
diff --git a/0.153/src/ldscript.h b/src/src/ldscript.h
similarity index 100%
rename from 0.153/src/ldscript.h
rename to src/src/ldscript.h
diff --git a/0.153/src/ldscript.y b/src/src/ldscript.y
similarity index 100%
rename from 0.153/src/ldscript.y
rename to src/src/ldscript.y
diff --git a/0.153/src/libld_elf_i386.map b/src/src/libld_elf_i386.map
similarity index 100%
rename from 0.153/src/libld_elf_i386.map
rename to src/src/libld_elf_i386.map
diff --git a/0.153/src/make-debug-archive.in b/src/src/make-debug-archive.in
similarity index 100%
rename from 0.153/src/make-debug-archive.in
rename to src/src/make-debug-archive.in
diff --git a/0.153/src/nm.c b/src/src/nm.c
similarity index 100%
rename from 0.153/src/nm.c
rename to src/src/nm.c
diff --git a/0.153/src/none_ld.c b/src/src/none_ld.c
similarity index 100%
rename from 0.153/src/none_ld.c
rename to src/src/none_ld.c
diff --git a/0.153/src/objdump.c b/src/src/objdump.c
similarity index 100%
rename from 0.153/src/objdump.c
rename to src/src/objdump.c
diff --git a/0.153/src/ranlib.c b/src/src/ranlib.c
similarity index 100%
rename from 0.153/src/ranlib.c
rename to src/src/ranlib.c
diff --git a/0.153/src/readelf.c b/src/src/readelf.c
similarity index 100%
rename from 0.153/src/readelf.c
rename to src/src/readelf.c
diff --git a/0.153/src/sectionhash.c b/src/src/sectionhash.c
similarity index 100%
rename from 0.153/src/sectionhash.c
rename to src/src/sectionhash.c
diff --git a/0.153/src/sectionhash.h b/src/src/sectionhash.h
similarity index 100%
rename from 0.153/src/sectionhash.h
rename to src/src/sectionhash.h
diff --git a/0.153/src/size.c b/src/src/size.c
similarity index 100%
rename from 0.153/src/size.c
rename to src/src/size.c
diff --git a/0.153/src/strings.c b/src/src/strings.c
similarity index 100%
rename from 0.153/src/strings.c
rename to src/src/strings.c
diff --git a/0.153/src/strip.c b/src/src/strip.c
similarity index 100%
rename from 0.153/src/strip.c
rename to src/src/strip.c
diff --git a/0.153/src/symbolhash.c b/src/src/symbolhash.c
similarity index 100%
rename from 0.153/src/symbolhash.c
rename to src/src/symbolhash.c
diff --git a/0.153/src/symbolhash.h b/src/src/symbolhash.h
similarity index 100%
rename from 0.153/src/symbolhash.h
rename to src/src/symbolhash.h
diff --git a/0.153/src/unaligned.h b/src/src/unaligned.h
similarity index 100%
rename from 0.153/src/unaligned.h
rename to src/src/unaligned.h
diff --git a/0.153/src/unstrip.c b/src/src/unstrip.c
similarity index 100%
rename from 0.153/src/unstrip.c
rename to src/src/unstrip.c
diff --git a/0.153/src/versionhash.c b/src/src/versionhash.c
similarity index 100%
rename from 0.153/src/versionhash.c
rename to src/src/versionhash.c
diff --git a/0.153/src/versionhash.h b/src/src/versionhash.h
similarity index 100%
rename from 0.153/src/versionhash.h
rename to src/src/versionhash.h
diff --git a/0.153/src/xelf.h b/src/src/xelf.h
similarity index 100%
rename from 0.153/src/xelf.h
rename to src/src/xelf.h
diff --git a/0.153/src/ylwrap b/src/src/ylwrap
similarity index 100%
rename from 0.153/src/ylwrap
rename to src/src/ylwrap
diff --git a/0.153/version.h b/src/version.h
similarity index 100%
rename from 0.153/version.h
rename to src/version.h