Nits

diff --git a/dwarflint/check_debug_info.cc b/dwarflint/check_debug_info.cc
index 7dafb46cb545f2d866ec8254b5791ec1ba8d8393..c839d77b5412b739a2246cf6f0b7faebb20f2346 100644 (file)
--- a/dwarflint/check_debug_info.cc
+++ b/dwarflint/check_debug_info.cc
@@ -30,7 +30,6 @@
 
 #include <cassert>
 #include <algorithm>
-#include "../libdw/dwarf.h"
 #include "../libdw/c++/dwarf"
 
 #include "messages.hh"

diff --git a/dwarflint/check_debug_loc_range.cc b/dwarflint/check_debug_loc_range.cc
index af89c31df802198885c1b833663b4ea84a2db018..751d54f1a26ae909c764a2a0ce221bcb4e4c7758 100644 (file)
--- a/dwarflint/check_debug_loc_range.cc
+++ b/dwarflint/check_debug_loc_range.cc
@@ -35,14 +35,15 @@
 #include <cassert>
 #include <sstream>
 #include <algorithm>
+
 #include "../libdw/c++/dwarf"
+#include "../src/dwarf-opcodes.h"
 
 #include "elf_file.hh"
 #include "check_debug_loc_range.hh"
 #include "check_debug_info.hh"
 #include "sections.hh"
 #include "checked_read.hh"
-#include "../src/dwarf-opcodes.h"
 #include "pri.hh"
 #include "misc.hh"
 

diff --git a/dwarflint/check_expected_trees.cc b/dwarflint/check_expected_trees.cc
index 63b44752a04353d8367813a2b626e10ba3c22de6..f3eaae10a821046792c2211c9f09b13e4815b6d5 100644 (file)
--- a/dwarflint/check_expected_trees.cc
+++ b/dwarflint/check_expected_trees.cc
@@ -27,11 +27,12 @@
 # include <config.h>
 #endif
 
+#include "../libdw/c++/dwarf-knowledge.cc"
+#include "../libdw/c++/dwarf"
+
 #include "check_debug_info.hh"
 #include "highlevel_check.hh"
 #include "expected.hh"
-#include "../src/dwarfstrings.h"
-#include "../libdw/c++/dwarf-knowledge.cc"
 #include "messages.hh"
 
 using elfutils::dwarf;

diff --git a/dwarflint/dwarf_version.cc b/dwarflint/dwarf_version.cc
index d3401449b10c74054eaeb3f5b030f62d67b74291..14e7961a8d39281a80e6cd5f7017639b49de8332 100644 (file)
--- a/dwarflint/dwarf_version.cc
+++ b/dwarflint/dwarf_version.cc
@@ -31,6 +31,12 @@
 # include <config.h>
 #endif
 
+#include <map>
+#include <cassert>
+#include <string.h>
+
+#include "../libdw/c++/dwarf"
+
 #include "dwarf_version.hh"
 #include "dwarf_2.hh"
 #include "dwarf_3.hh"
@@ -38,12 +44,6 @@
 #include "dwarf_gnu.hh"
 #include "dwarf_mips.hh"
 #include "check_debug_info.hh"
-#include "c++/dwarf"
-
-#include "../libdw/dwarf.h"
-#include <map>
-#include <cassert>
-#include <string.h>
 
 dw_class_set::dw_class_set (dw_class a, dw_class b, dw_class c,
                            dw_class d, dw_class e)

diff --git a/dwarflint/expected.hh b/dwarflint/expected.hh
index bcb0de5be2217d8319668be660f99e287aab7687..d7f4ffbdb59c6a53c69dd6da0ab23f9c736760e2 100644 (file)
--- a/dwarflint/expected.hh
+++ b/dwarflint/expected.hh
@@ -30,7 +30,7 @@
 #include <sstream>
 #include <cassert>
 
-#include "c++/dwarf"
+#include "../libdw/c++/dwarf"
 
 enum optionality
 {

diff --git a/dwarflint/highlevel_check.hh b/dwarflint/highlevel_check.hh
index 4c3bb72550d87560e893ffb8d4225234102ea7c2..d4d61d916a56da07aa06b15936cac5176289a7bd 100644 (file)
--- a/dwarflint/highlevel_check.hh
+++ b/dwarflint/highlevel_check.hh
@@ -31,7 +31,7 @@
 #endif
 
 #include "checks.hh"
-#include "c++/dwarf"
+#include "../libdw/c++/dwarf"
 #include "../libdwfl/libdwfl.h"
 
 class open_highlevel_dwarf

diff --git a/dwarflint/pri.cc b/dwarflint/pri.cc
index c246be55b56406fae3ba9c2dd4998be2e6237002..de01463f9b26b2d496634417ca5f6c2fd5b0484a 100644 (file)
--- a/dwarflint/pri.cc
+++ b/dwarflint/pri.cc
@@ -27,10 +27,12 @@
 # include <config.h>
 #endif
 
+#include <sstream>
+
 #include "../src/dwarfstrings.h"
+#include "../libdw/c++/dwarf"
+
 #include "pri.hh"
-#include <sstream>
-#include "c++/dwarf"
 
 std::ostream &
 pri::operator << (std::ostream &os, pri::pribase const &obj)