summaryrefslogtreecommitdiffstats
path: root/libdwfl
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-04-20 16:31:02 +0200
committerMark Wielaard <mark@klomp.org>2017-05-02 13:28:54 +0200
commit575198c29a427392823cc8f2400579a23d06a875 (patch)
treef58d3f9bd42e16dfc6c58d26a56e0dfda960c7a0 /libdwfl
parentfd9e7345b41eb2d6c11e0b8679e19df68e20171e (diff)
Avoid double-including config.h
config.h doesn't have include guards, so including it twice is bad. We deal with this by checking for PACKAGE_NAME, but only in some places. Once we start using gnulib, we will need to include config.h before any gnulib-generated headers. This is problematic if we include it transitively through our own private headers. In order to set a clear rule about inclusion of config.h, it is now included in every .c file as first header, but not in any header. This will definitely avoid double-inclusion and satisfy the condition that it has to be included before gnulib headers. It comes at the price of adding some redundancy, but there is no clean way to avoid this. Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'libdwfl')
-rw-r--r--libdwfl/ChangeLog58
-rw-r--r--libdwfl/argp-std.c4
-rw-r--r--libdwfl/cu.c4
-rw-r--r--libdwfl/derelocate.c4
-rw-r--r--libdwfl/dwfl_addrdie.c4
-rw-r--r--libdwfl/dwfl_addrdwarf.c4
-rw-r--r--libdwfl/dwfl_addrmodule.c4
-rw-r--r--libdwfl/dwfl_begin.c4
-rw-r--r--libdwfl/dwfl_build_id_find_debuginfo.c4
-rw-r--r--libdwfl/dwfl_build_id_find_elf.c4
-rw-r--r--libdwfl/dwfl_cumodule.c4
-rw-r--r--libdwfl/dwfl_dwarf_line.c4
-rw-r--r--libdwfl/dwfl_end.c4
-rw-r--r--libdwfl/dwfl_frame.c4
-rw-r--r--libdwfl/dwfl_frame_regs.c4
-rw-r--r--libdwfl/dwfl_getdwarf.c4
-rw-r--r--libdwfl/dwfl_getmodules.c4
-rw-r--r--libdwfl/dwfl_getsrc.c4
-rw-r--r--libdwfl/dwfl_getsrclines.c4
-rw-r--r--libdwfl/dwfl_line_comp_dir.c4
-rw-r--r--libdwfl/dwfl_linecu.c4
-rw-r--r--libdwfl/dwfl_lineinfo.c4
-rw-r--r--libdwfl/dwfl_linemodule.c4
-rw-r--r--libdwfl/dwfl_module.c4
-rw-r--r--libdwfl/dwfl_module_addrdie.c4
-rw-r--r--libdwfl/dwfl_module_addrname.c4
-rw-r--r--libdwfl/dwfl_module_addrsym.c4
-rw-r--r--libdwfl/dwfl_module_build_id.c4
-rw-r--r--libdwfl/dwfl_module_dwarf_cfi.c4
-rw-r--r--libdwfl/dwfl_module_eh_cfi.c4
-rw-r--r--libdwfl/dwfl_module_getdwarf.c4
-rw-r--r--libdwfl/dwfl_module_getelf.c4
-rw-r--r--libdwfl/dwfl_module_getsrc.c4
-rw-r--r--libdwfl/dwfl_module_getsrc_file.c4
-rw-r--r--libdwfl/dwfl_module_getsym.c4
-rw-r--r--libdwfl/dwfl_module_info.c4
-rw-r--r--libdwfl/dwfl_module_nextcu.c4
-rw-r--r--libdwfl/dwfl_module_register_names.c4
-rw-r--r--libdwfl/dwfl_module_report_build_id.c4
-rw-r--r--libdwfl/dwfl_module_return_value_location.c4
-rw-r--r--libdwfl/dwfl_nextcu.c4
-rw-r--r--libdwfl/dwfl_onesrcline.c4
-rw-r--r--libdwfl/dwfl_report_elf.c4
-rw-r--r--libdwfl/dwfl_validate_address.c4
-rw-r--r--libdwfl/dwfl_version.c4
-rw-r--r--libdwfl/find-debuginfo.c4
-rw-r--r--libdwfl/gzip.c4
-rw-r--r--libdwfl/image-header.c4
-rw-r--r--libdwfl/libdwflP.h3
-rw-r--r--libdwfl/lines.c4
-rw-r--r--libdwfl/linux-core-attach.c4
-rw-r--r--libdwfl/linux-pid-attach.c4
-rw-r--r--libdwfl/linux-proc-maps.c4
-rw-r--r--libdwfl/offline.c4
-rw-r--r--libdwfl/open.c4
-rw-r--r--libdwfl/relocate.c4
-rw-r--r--libdwfl/segment.c4
57 files changed, 278 insertions, 3 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index b9be1bce..1fc9da69 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,5 +1,63 @@
2017-04-20 Ulf Hermann <ulf.hermann@qt.io>
+ * libdwflP.h: Don't include config.h.
+ * argp-std.c: Include config.h.
+ * cu.c: Likewise.
+ * derelocate.c: Likewise.
+ * dwfl_addrdie.c: Likewise.
+ * dwfl_addrdwarf.c: Likewise.
+ * dwfl_addrmodule.c: Likewise.
+ * dwfl_begin.c: Likewise.
+ * dwfl_build_id_find_debuginfo.c: Likewise.
+ * dwfl_build_id_find_elf.c: Likewise.
+ * dwfl_cumodule.c: Likewise.
+ * dwfl_dwarf_line.c: Likewise.
+ * dwfl_end.c: Likewise.
+ * dwfl_frame.c: Likewise.
+ * dwfl_frame_regs.c: Likewise.
+ * dwfl_getdwarf.c: Likewise.
+ * dwfl_getmodules.c: Likewise.
+ * dwfl_getsrc.c: Likewise.
+ * dwfl_getsrclines.c: Likewise.
+ * dwfl_line_comp_dir.c: Likewise.
+ * dwfl_linecu.c: Likewise.
+ * dwfl_lineinfo.c: Likewise.
+ * dwfl_linemodule.c: Likewise.
+ * dwfl_module.c: Likewise.
+ * dwfl_module_addrdie.c: Likewise.
+ * dwfl_module_addrname.c: Likewise.
+ * dwfl_module_addrsym.c: Likewise.
+ * dwfl_module_build_id.c: Likewise.
+ * dwfl_module_dwarf_cfi.c: Likewise.
+ * dwfl_module_eh_cfi.c: Likewise.
+ * dwfl_module_getdarf.c: Likewise.
+ * dwfl_module_getelf.c: Likewise.
+ * dwfl_module_getsrc.c: Likewise.
+ * dwfl_module_getsrc_file.c: Likewise.
+ * dwfl_module_getsym.c: Likewise.
+ * dwfl_module_info.c: Likewise.
+ * dwfl_module_nextcu.c: Likewise.
+ * dwfl_module_register_names.c: Likewise.
+ * dwfl_module_report_build_id.c: Likewise.
+ * dwfl_module_return_value_location.c: Likewise.
+ * dwfl_nextcu.c: Likewise.
+ * dwfl_onesrcline.c: Likewise.
+ * dwfl_report_elf.c: Likewise.
+ * dwfl_validate_address.c: Likewise.
+ * dwfl_version.c: Likewise.
+ * find-debuginfo.c: Likewise.
+ * gzip.c: Likewise.
+ * image-header.c: Likewise.
+ * lines.c: Likewise.
+ * linux-core-attach.c: Likewise.
+ * linux-pid-attach.c: Likewise.
+ * offline.c: Likewise.
+ * open.c: Likewise.
+ * relocate.c: Likewise.
+ * segment.c: Likewise.
+
+2017-04-20 Ulf Hermann <ulf.hermann@qt.io>
+
* libdwfl.h: Use __const_attribute__.
2017-04-20 Ulf Hermann <ulf.hermann@qt.io>
diff --git a/libdwfl/argp-std.c b/libdwfl/argp-std.c
index 501530a5..347a05b4 100644
--- a/libdwfl/argp-std.c
+++ b/libdwfl/argp-std.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <argp.h>
#include <stdlib.h>
diff --git a/libdwfl/cu.c b/libdwfl/cu.c
index 5182054d..7aa23b50 100644
--- a/libdwfl/cu.c
+++ b/libdwfl/cu.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/libdwP.h"
#include "../libdw/memory-access.h"
diff --git a/libdwfl/derelocate.c b/libdwfl/derelocate.c
index 439a24e3..e5c3e12e 100644
--- a/libdwfl/derelocate.c
+++ b/libdwfl/derelocate.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
struct dwfl_relocation
diff --git a/libdwfl/dwfl_addrdie.c b/libdwfl/dwfl_addrdie.c
index 1e9b3ab6..c5b1d68e 100644
--- a/libdwfl/dwfl_addrdie.c
+++ b/libdwfl/dwfl_addrdie.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwarf_Die *
diff --git a/libdwfl/dwfl_addrdwarf.c b/libdwfl/dwfl_addrdwarf.c
index ba412eca..4f9efabf 100644
--- a/libdwfl/dwfl_addrdwarf.c
+++ b/libdwfl/dwfl_addrdwarf.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwarf *
diff --git a/libdwfl/dwfl_addrmodule.c b/libdwfl/dwfl_addrmodule.c
index 9234eb71..abf1ff48 100644
--- a/libdwfl/dwfl_addrmodule.c
+++ b/libdwfl/dwfl_addrmodule.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwfl_Module *
diff --git a/libdwfl/dwfl_begin.c b/libdwfl/dwfl_begin.c
index 44c16a92..b03f5cf4 100644
--- a/libdwfl/dwfl_begin.c
+++ b/libdwfl/dwfl_begin.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwfl *
diff --git a/libdwfl/dwfl_build_id_find_debuginfo.c b/libdwfl/dwfl_build_id_find_debuginfo.c
index f1c64bcd..273e5e5f 100644
--- a/libdwfl/dwfl_build_id_find_debuginfo.c
+++ b/libdwfl/dwfl_build_id_find_debuginfo.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <unistd.h>
diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c
index d4737c9f..ee0c1646 100644
--- a/libdwfl/dwfl_build_id_find_elf.c
+++ b/libdwfl/dwfl_build_id_find_elf.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <inttypes.h>
#include <fcntl.h>
diff --git a/libdwfl/dwfl_cumodule.c b/libdwfl/dwfl_cumodule.c
index c5cf004d..2b593f22 100644
--- a/libdwfl/dwfl_cumodule.c
+++ b/libdwfl/dwfl_cumodule.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwfl_Module *
diff --git a/libdwfl/dwfl_dwarf_line.c b/libdwfl/dwfl_dwarf_line.c
index e96f859a..e22e984c 100644
--- a/libdwfl/dwfl_dwarf_line.c
+++ b/libdwfl/dwfl_dwarf_line.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/libdwP.h"
diff --git a/libdwfl/dwfl_end.c b/libdwfl/dwfl_end.c
index 0b35bd28..74ee9e07 100644
--- a/libdwfl/dwfl_end.c
+++ b/libdwfl/dwfl_end.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <unistd.h>
diff --git a/libdwfl/dwfl_frame.c b/libdwfl/dwfl_frame.c
index 1dc0c8dd..881f735a 100644
--- a/libdwfl/dwfl_frame.c
+++ b/libdwfl/dwfl_frame.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <unistd.h>
diff --git a/libdwfl/dwfl_frame_regs.c b/libdwfl/dwfl_frame_regs.c
index 10803fe7..83b1abef 100644
--- a/libdwfl/dwfl_frame_regs.c
+++ b/libdwfl/dwfl_frame_regs.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
bool
diff --git a/libdwfl/dwfl_getdwarf.c b/libdwfl/dwfl_getdwarf.c
index 8d1d9ba7..edd088ec 100644
--- a/libdwfl/dwfl_getdwarf.c
+++ b/libdwfl/dwfl_getdwarf.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
struct module_callback_info
diff --git a/libdwfl/dwfl_getmodules.c b/libdwfl/dwfl_getmodules.c
index eed9b4ff..243cb04d 100644
--- a/libdwfl/dwfl_getmodules.c
+++ b/libdwfl/dwfl_getmodules.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
ptrdiff_t
diff --git a/libdwfl/dwfl_getsrc.c b/libdwfl/dwfl_getsrc.c
index 8d4ae022..d853aed4 100644
--- a/libdwfl/dwfl_getsrc.c
+++ b/libdwfl/dwfl_getsrc.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwfl_Line *
diff --git a/libdwfl/dwfl_getsrclines.c b/libdwfl/dwfl_getsrclines.c
index bdfcf5c6..1ce78fcb 100644
--- a/libdwfl/dwfl_getsrclines.c
+++ b/libdwfl/dwfl_getsrclines.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
int
diff --git a/libdwfl/dwfl_line_comp_dir.c b/libdwfl/dwfl_line_comp_dir.c
index bda09c46..77c3fdf1 100644
--- a/libdwfl/dwfl_line_comp_dir.c
+++ b/libdwfl/dwfl_line_comp_dir.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <dwarf.h>
diff --git a/libdwfl/dwfl_linecu.c b/libdwfl/dwfl_linecu.c
index ce78d297..2043b17f 100644
--- a/libdwfl/dwfl_linecu.c
+++ b/libdwfl/dwfl_linecu.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#undef dwfl_linecu
diff --git a/libdwfl/dwfl_lineinfo.c b/libdwfl/dwfl_lineinfo.c
index 7ddbfb07..96187128 100644
--- a/libdwfl/dwfl_lineinfo.c
+++ b/libdwfl/dwfl_lineinfo.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/libdwP.h"
diff --git a/libdwfl/dwfl_linemodule.c b/libdwfl/dwfl_linemodule.c
index e4a35e09..d243f0d2 100644
--- a/libdwfl/dwfl_linemodule.c
+++ b/libdwfl/dwfl_linemodule.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwfl_Module *
diff --git a/libdwfl/dwfl_module.c b/libdwfl/dwfl_module.c
index 515092f3..510bd691 100644
--- a/libdwfl/dwfl_module.c
+++ b/libdwfl/dwfl_module.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/cfi.h"
#include <search.h>
diff --git a/libdwfl/dwfl_module_addrdie.c b/libdwfl/dwfl_module_addrdie.c
index 20d2842a..b44ec139 100644
--- a/libdwfl/dwfl_module_addrdie.c
+++ b/libdwfl/dwfl_module_addrdie.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwarf_Die *
diff --git a/libdwfl/dwfl_module_addrname.c b/libdwfl/dwfl_module_addrname.c
index 88a8139d..3142b3eb 100644
--- a/libdwfl/dwfl_module_addrname.c
+++ b/libdwfl/dwfl_module_addrname.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
const char *
diff --git a/libdwfl/dwfl_module_addrsym.c b/libdwfl/dwfl_module_addrsym.c
index 5a7bf714..db302e63 100644
--- a/libdwfl/dwfl_module_addrsym.c
+++ b/libdwfl/dwfl_module_addrsym.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
struct search_state
diff --git a/libdwfl/dwfl_module_build_id.c b/libdwfl/dwfl_module_build_id.c
index c9a42ca7..6ca93761 100644
--- a/libdwfl/dwfl_module_build_id.c
+++ b/libdwfl/dwfl_module_build_id.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
static int
diff --git a/libdwfl/dwfl_module_dwarf_cfi.c b/libdwfl/dwfl_module_dwarf_cfi.c
index 1dac26d5..0e5b4356 100644
--- a/libdwfl/dwfl_module_dwarf_cfi.c
+++ b/libdwfl/dwfl_module_dwarf_cfi.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/cfi.h"
diff --git a/libdwfl/dwfl_module_eh_cfi.c b/libdwfl/dwfl_module_eh_cfi.c
index dbe43b0f..c296e399 100644
--- a/libdwfl/dwfl_module_eh_cfi.c
+++ b/libdwfl/dwfl_module_eh_cfi.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/cfi.h"
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index c8b839dc..9775aced 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <inttypes.h>
#include <fcntl.h>
diff --git a/libdwfl/dwfl_module_getelf.c b/libdwfl/dwfl_module_getelf.c
index f20fb042..6358de4c 100644
--- a/libdwfl/dwfl_module_getelf.c
+++ b/libdwfl/dwfl_module_getelf.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Elf *
diff --git a/libdwfl/dwfl_module_getsrc.c b/libdwfl/dwfl_module_getsrc.c
index f7e340bc..fc99b163 100644
--- a/libdwfl/dwfl_module_getsrc.c
+++ b/libdwfl/dwfl_module_getsrc.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/libdwP.h"
diff --git a/libdwfl/dwfl_module_getsrc_file.c b/libdwfl/dwfl_module_getsrc_file.c
index 4eaaeaff..cea2ba41 100644
--- a/libdwfl/dwfl_module_getsrc_file.c
+++ b/libdwfl/dwfl_module_getsrc_file.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/libdwP.h"
diff --git a/libdwfl/dwfl_module_getsym.c b/libdwfl/dwfl_module_getsym.c
index 42d2b679..8de9a3eb 100644
--- a/libdwfl/dwfl_module_getsym.c
+++ b/libdwfl/dwfl_module_getsym.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
const char *
diff --git a/libdwfl/dwfl_module_info.c b/libdwfl/dwfl_module_info.c
index df16be41..af1faab4 100644
--- a/libdwfl/dwfl_module_info.c
+++ b/libdwfl/dwfl_module_info.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
const char *
diff --git a/libdwfl/dwfl_module_nextcu.c b/libdwfl/dwfl_module_nextcu.c
index 6f81f4cc..32ee6bc2 100644
--- a/libdwfl/dwfl_module_nextcu.c
+++ b/libdwfl/dwfl_module_nextcu.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwarf_Die *
diff --git a/libdwfl/dwfl_module_register_names.c b/libdwfl/dwfl_module_register_names.c
index 18fed373..9ea09371 100644
--- a/libdwfl/dwfl_module_register_names.c
+++ b/libdwfl/dwfl_module_register_names.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
diff --git a/libdwfl/dwfl_module_report_build_id.c b/libdwfl/dwfl_module_report_build_id.c
index b41512b4..31e17c86 100644
--- a/libdwfl/dwfl_module_report_build_id.c
+++ b/libdwfl/dwfl_module_report_build_id.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
// XXX vs report changed module: punting old file
diff --git a/libdwfl/dwfl_module_return_value_location.c b/libdwfl/dwfl_module_return_value_location.c
index 29da61fb..ff6f56f8 100644
--- a/libdwfl/dwfl_module_return_value_location.c
+++ b/libdwfl/dwfl_module_return_value_location.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
diff --git a/libdwfl/dwfl_nextcu.c b/libdwfl/dwfl_nextcu.c
index 9ea83881..64bd5219 100644
--- a/libdwfl/dwfl_nextcu.c
+++ b/libdwfl/dwfl_nextcu.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwarf_Die *
diff --git a/libdwfl/dwfl_onesrcline.c b/libdwfl/dwfl_onesrcline.c
index 4c20d657..b1e70555 100644
--- a/libdwfl/dwfl_onesrcline.c
+++ b/libdwfl/dwfl_onesrcline.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
Dwfl_Line *
diff --git a/libdwfl/dwfl_report_elf.c b/libdwfl/dwfl_report_elf.c
index 73a5511a..6950a37b 100644
--- a/libdwfl/dwfl_report_elf.c
+++ b/libdwfl/dwfl_report_elf.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <fcntl.h>
#include <unistd.h>
diff --git a/libdwfl/dwfl_validate_address.c b/libdwfl/dwfl_validate_address.c
index 7334c3e2..15e2602a 100644
--- a/libdwfl/dwfl_validate_address.c
+++ b/libdwfl/dwfl_validate_address.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
int
diff --git a/libdwfl/dwfl_version.c b/libdwfl/dwfl_version.c
index d1c5d918..c27d4f6d 100644
--- a/libdwfl/dwfl_version.c
+++ b/libdwfl/dwfl_version.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
const char *
diff --git a/libdwfl/find-debuginfo.c b/libdwfl/find-debuginfo.c
index 80515dbd..6d5a42a6 100644
--- a/libdwfl/find-debuginfo.c
+++ b/libdwfl/find-debuginfo.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <stdio.h>
#include <fcntl.h>
diff --git a/libdwfl/gzip.c b/libdwfl/gzip.c
index 078e1da4..c2c13baf 100644
--- a/libdwfl/gzip.c
+++ b/libdwfl/gzip.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "system.h"
diff --git a/libdwfl/image-header.c b/libdwfl/image-header.c
index 62ccc3e3..25fbfd99 100644
--- a/libdwfl/image-header.c
+++ b/libdwfl/image-header.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "system.h"
diff --git a/libdwfl/libdwflP.h b/libdwfl/libdwflP.h
index 2a83646e..7d5f795c 100644
--- a/libdwfl/libdwflP.h
+++ b/libdwfl/libdwflP.h
@@ -29,9 +29,6 @@
#ifndef _LIBDWFLP_H
#define _LIBDWFLP_H 1
-#ifndef PACKAGE_NAME
-# include <config.h>
-#endif
#include <libdwfl.h>
#include <libebl.h>
#include <assert.h>
diff --git a/libdwfl/lines.c b/libdwfl/lines.c
index 721e29cc..128c0c97 100644
--- a/libdwfl/lines.c
+++ b/libdwfl/lines.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include "../libdw/libdwP.h"
diff --git a/libdwfl/linux-core-attach.c b/libdwfl/linux-core-attach.c
index f82ed032..9f05f72a 100644
--- a/libdwfl/linux-core-attach.c
+++ b/libdwfl/linux-core-attach.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <fcntl.h>
#include "system.h"
diff --git a/libdwfl/linux-pid-attach.c b/libdwfl/linux-pid-attach.c
index 398df96d..e6a5c419 100644
--- a/libdwfl/linux-pid-attach.c
+++ b/libdwfl/linux-pid-attach.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libelfP.h"
#include "libdwflP.h"
#include <sys/types.h>
diff --git a/libdwfl/linux-proc-maps.c b/libdwfl/linux-proc-maps.c
index 094dd53d..c4438c0f 100644
--- a/libdwfl/linux-proc-maps.c
+++ b/libdwfl/linux-proc-maps.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <inttypes.h>
#include <sys/types.h>
diff --git a/libdwfl/offline.c b/libdwfl/offline.c
index c0a25992..80c80a16 100644
--- a/libdwfl/offline.c
+++ b/libdwfl/offline.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
#include <fcntl.h>
#include <unistd.h>
diff --git a/libdwfl/open.c b/libdwfl/open.c
index 92f2798b..4e0461bd 100644
--- a/libdwfl/open.c
+++ b/libdwfl/open.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "../libelf/libelfP.h"
#undef _
#include "libdwflP.h"
diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c
index a44126e8..17682433 100644
--- a/libdwfl/relocate.c
+++ b/libdwfl/relocate.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
typedef uint8_t GElf_Byte;
diff --git a/libdwfl/segment.c b/libdwfl/segment.c
index 2983cf23..d9599a7f 100644
--- a/libdwfl/segment.c
+++ b/libdwfl/segment.c
@@ -26,6 +26,10 @@
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libdwflP.h"
GElf_Addr