diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c
index eef6576..8ce3c3d 100644
--- a/arch/metag/kernel/metag_ksyms.c
+++ b/arch/metag/kernel/metag_ksyms.c
@@ -6,10 +6,8 @@
 #include <linux/interrupt.h>
 #include <linux/hardirq.h>
 
-#include <asm/setup.h>
 #include <asm/checksum.h>
 #include <asm/uaccess.h>
-#include <asm/traps.h>
 #include <asm/ftrace.h>
 #include <asm/tbx.h>
 
@@ -27,9 +25,6 @@
 EXPORT_SYMBOL(strnlen_user);
 EXPORT_SYMBOL(__do_clear_user);
 
-EXPORT_SYMBOL(pTBI_get);
-EXPORT_SYMBOL(meta_memoffset);
-
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(empty_zero_page);
diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c
index 9803ca4..dd6c5ad 100644
--- a/arch/metag/kernel/setup.c
+++ b/arch/metag/kernel/setup.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <linux/export.h>
 #include <linux/bootmem.h>
 #include <linux/console.h>
 #include <linux/cpu.h>
@@ -141,6 +142,7 @@
  * probably only be used via them.
  */
 unsigned int meta_memoffset;
+EXPORT_SYMBOL(meta_memoffset);
 
 static char __initdata *original_cmd_line;
 
@@ -579,6 +581,7 @@
 {
 	return per_cpu(pTBI, cpu);
 }
+EXPORT_SYMBOL(pTBI_get);
 
 #if defined(CONFIG_METAG_DSP) && defined(CONFIG_METAG_FPU)
 char capabilites[] = "dsp fpu";