diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index e80c872a76..cd019772b6 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,16 @@
+2008-06-19  Andreas Schwab  <schwab@suse.de>
+
+	* basic_blocks.c: Always include "gprof.h" first.
+	* cg_arcs.c: Likewise.
+	* cg_dfn.c: Likewise.
+	* cg_print.c: Likewise.
+	* corefile.c: Likewise.
+	* gprof.c: Likewise.
+	* hist.c: Likewise.
+	* search_list.c: Likewise.
+	* sym_ids.c: Likewise.
+	* utils.c: Likewise.
+
 2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure: Regenerate.
diff --git a/gprof/basic_blocks.c b/gprof/basic_blocks.c
index d188ec581c..bd24d00b8b 100644
--- a/gprof/basic_blocks.c
+++ b/gprof/basic_blocks.c
@@ -22,8 +22,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "basic_blocks.h"
 #include "corefile.h"
 #include "gmon_io.h"
diff --git a/gprof/cg_arcs.c b/gprof/cg_arcs.c
index a46b442d44..10f3f973ab 100644
--- a/gprof/cg_arcs.c
+++ b/gprof/cg_arcs.c
@@ -26,8 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"
diff --git a/gprof/cg_dfn.c b/gprof/cg_dfn.c
index 50be4be0b9..6d19afcb58 100644
--- a/gprof/cg_dfn.c
+++ b/gprof/cg_dfn.c
@@ -26,8 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"
diff --git a/gprof/cg_print.c b/gprof/cg_print.c
index 4799bc7822..2557997e59 100644
--- a/gprof/cg_print.c
+++ b/gprof/cg_print.c
@@ -19,8 +19,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"
diff --git a/gprof/corefile.c b/gprof/corefile.c
index fa0db2c453..4aec15c980 100644
--- a/gprof/corefile.c
+++ b/gprof/corefile.c
@@ -20,8 +20,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"
diff --git a/gprof/gprof.c b/gprof/gprof.c
index aca143c8b8..e5e8863567 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "bfdver.h"
 #include "search_list.h"
 #include "source.h"
diff --git a/gprof/hist.c b/gprof/hist.c
index 0b86c03dee..d0c02d3f0d 100644
--- a/gprof/hist.c
+++ b/gprof/hist.c
@@ -20,8 +20,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"
diff --git a/gprof/search_list.c b/gprof/search_list.c
index 200c3282dc..66b5d20b6b 100644
--- a/gprof/search_list.c
+++ b/gprof/search_list.c
@@ -19,8 +19,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-#include "libiberty.h"
 #include "gprof.h"
+#include "libiberty.h"
 #include "search_list.h"
 
 
diff --git a/gprof/sym_ids.c b/gprof/sym_ids.c
index 492e825136..657957e8c8 100644
--- a/gprof/sym_ids.c
+++ b/gprof/sym_ids.c
@@ -19,9 +19,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
+#include "gprof.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
-#include "gprof.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"
diff --git a/gprof/utils.c b/gprof/utils.c
index cf79fd6a94..f34984108e 100644
--- a/gprof/utils.c
+++ b/gprof/utils.c
@@ -26,8 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "demangle.h"
 #include "gprof.h"
+#include "demangle.h"
 #include "search_list.h"
 #include "source.h"
 #include "symtab.h"