diff --git a/src/arch/armv7/include/common.h b/src/arch/armv7/include/common.h
index 2d4d020f37..a2cd9ae44b 100644
--- a/src/arch/armv7/include/common.h
+++ b/src/arch/armv7/include/common.h
@@ -24,9 +24,6 @@
 #ifndef __COMMON_H_
 #define __COMMON_H_	1
 
-#undef	_LINUX_CONFIG_H
-#define _LINUX_CONFIG_H 1	/* avoid reading Linux autoconf.h file	*/
-
 #ifndef __ASSEMBLER__		/* put C only stuff in this section */
 
 typedef unsigned char		uchar;
@@ -36,17 +33,7 @@ typedef volatile unsigned char	vu_char;
 typedef unsigned long ulong;
 typedef unsigned int uint;
 
-//#include <config.h>
-//#include <asm-offsets.h>
-//#include <linux/bitops.h>
-//#include <linux/string.h>
-//#include <asm/ptrace.h>
 #include <types.h>
-//#include <stdarg.h>
-
-//#include <part.h>
-//#include <flash.h>
-//#include <image.h>
 
 #ifdef	DEBUG
 #define debug(fmt,args...)	printf (fmt ,##args)
diff --git a/src/arch/armv7/include/ptrace.h b/src/arch/armv7/include/ptrace.h
deleted file mode 100644
index e981cadc47..0000000000
--- a/src/arch/armv7/include/ptrace.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __ASM_ARM_PTRACE_H
-#define __ASM_ARM_PTRACE_H
-
-#define PTRACE_GETREGS		12
-#define PTRACE_SETREGS		13
-#define PTRACE_GETFPREGS	14
-#define PTRACE_SETFPREGS	15
-
-#define PTRACE_SETOPTIONS	21
-
-/* options set using PTRACE_SETOPTIONS */
-#define PTRACE_O_TRACESYSGOOD	0x00000001
-
-#include <asm/proc/ptrace.h>
-
-#ifndef __ASSEMBLER__
-#define pc_pointer(v) \
-	((v) & ~PCMASK)
-
-#define instruction_pointer(regs) \
-	(pc_pointer((regs)->ARM_pc))
-
-extern void show_regs(struct pt_regs *);
-
-#define predicate(x)	(x & 0xf0000000)
-#define PREDICATE_ALWAYS	0xe0000000
-
-#endif /* __ASSEMBLER__ */
-
-#endif
diff --git a/src/arch/armv7/lib/interrupts.c b/src/arch/armv7/lib/interrupts.c
index 6ee3f267ef..ab9a80ca91 100644
--- a/src/arch/armv7/lib/interrupts.c
+++ b/src/arch/armv7/lib/interrupts.c
@@ -36,7 +36,6 @@
  */
 
 #include <common.h>
-//#include <asm/proc-armv/ptrace.h>
 
 DECLARE_GLOBAL_DATA_PTR;