diff --git a/src/x86/Gstep.c b/src/x86/Gstep.c
index c1fff616..e4055ae0 100644
--- a/src/x86/Gstep.c
+++ b/src/x86/Gstep.c
@@ -23,13 +23,6 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <signal.h>
-
 #include "unwind_i.h"
 #include "offsets.h"
 
@@ -37,7 +30,7 @@ PROTECTED int
 unw_step (unw_cursor_t *cursor)
 {
   struct cursor *c = (struct cursor *) cursor;
-  int ret, i, format;
+  int ret, i;
 
   Debug (1, "(cursor=%p, ip=0x%08x)\n", c, (unsigned) c->dwarf.ip);
 
diff --git a/src/x86_64/Gstep.c b/src/x86_64/Gstep.c
index d286d445..d23be8ea 100644
--- a/src/x86_64/Gstep.c
+++ b/src/x86_64/Gstep.c
@@ -27,7 +27,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include "unwind_i.h"
 #include <signal.h>
-#include <stddef.h>
 
 PROTECTED int
 unw_step (unw_cursor_t *cursor)