diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0efcb7215c..20a8a8b753 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-25  Pedro Alves  <palves@redhat.com>
+
+	* infrun.c (stepping_past_instruction_at)
+	(clear_exit_convenience_vars): Point at infrun.h instead of
+	inferior.h.
+	(handle_signal_stop): Fix typo.
+
 2014-09-24  Yao Qi  <yao@codesourcery.com>
 
 	* arm-tdep.c (thumb_in_function_epilogue_p): Fix typo in the
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 3725f2da08..dc696e9264 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1026,7 +1026,7 @@ clear_step_over_info (void)
   step_over_info.address = 0;
 }
 
-/* See inferior.h.  */
+/* See infrun.h.  */
 
 int
 stepping_past_instruction_at (struct address_space *aspace,
@@ -4003,7 +4003,7 @@ handle_signal_stop (struct execution_control_state *ecs)
          watchpoint expression.  We do this by single-stepping the
 	 target.
 
-	 It may not be necessary to disable the watchpoint to stop over
+	 It may not be necessary to disable the watchpoint to step over
 	 it.  For example, the PA can (with some kernel cooperation)
 	 single step over a watchpoint without disabling the watchpoint.
 
@@ -7124,7 +7124,7 @@ save_inferior_ptid (void)
   return make_cleanup (restore_inferior_ptid, saved_ptid_ptr);
 }
 
-/* See inferior.h.  */
+/* See infrun.h.  */
 
 void
 clear_exit_convenience_vars (void)