diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
index cecdc6145546..e2a57fd7abfa 100644
--- a/include/asm-sparc/Kbuild
+++ b/include/asm-sparc/Kbuild
@@ -1,13 +1,6 @@
 include include/asm-generic/Kbuild.asm
 
-header-y += apc.h asi.h asmmacro.h auxio.h bitext.h bpp.h \
-	bsderrno.h btfixup.h clock.h contregs.h cpudata.h cypress.h \
-	ebus.h ecc.h eeprom.h fbio.h floppy.h head.h hw_irq.h \
-	idprom.h io-unit.h iommu.h ipc.h jsflash.h \
-	kdebug.h machines.h mbus.h memreg.h mostek.h mpmbox.h msi.h \
-	mxcc.h obio.h openprom.h openpromio.h oplib.h pbm.h pcic.h \
-	pconf.h perfctr.h pgtsrmmu.h pgtsun4.h pgtsun4c.h psr.h reg.h \
-	ross.h sbi.h sbus.h sfp-machine.h smpprim.h \
-	solerrno.h spinlock.h sun4paddr.h sun4prom.h sunbpp.h svr4.h \
-	swift.h sysen.h timer.h traps.h tsunami.h turbosparc.h \
-	vac-ops.h vaddrs.h vfc_ioctls.h viking.h winmacro.h
+unifdef-y += fbio.h perfctr.h psr.h
+header-y += apc.h asi.h auxio.h bpp.h head.h ipc.h jsflash.h	\
+	openpromio.h pbm.h pconf.h pgtsun4.h reg.h traps.h	\
+	turbosparc.h vfc_ioctls.h winmacro.h
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
index 5edf7643a209..c78d44bb195f 100644
--- a/include/asm-sparc64/Kbuild
+++ b/include/asm-sparc64/Kbuild
@@ -1,16 +1,10 @@
 include include/asm-generic/Kbuild.asm
 
 ALTARCH := sparc
-ARCHDEF := defined __sparc__ && defined __arch64__ 
+ARCHDEF := defined __sparc__ && defined __arch64__
 ALTARCHDEF := defined __sparc__ && !defined __arch64__
 
-header-y += agp.h apb.h asi.h auxio.h bbc.h bpp.h bsderrno.h \
-	chafsr.h chmctrl.h compat.h const.h cpudata.h dcr.h dcu.h \
-	display7seg.h ebus.h envctrl.h estate.h fbio.h fhc.h floppy.h \
-	fpumacro.h head.h hw_irq.h idprom.h iommu.h \
-	ipc.h isa.h kdebug.h lsu.h mostek.h ns87303.h \
-	openprom.h openpromio.h oplib.h parport.h pbm.h pconf.h \
-	perfctr.h pil.h psrcompat.h pstate.h reg.h sbus.h \
-	sfp-machine.h solerrno.h spinlock.h spitfire.h starfire.h \
-	sunbpp.h svr4.h timer.h ttable.h uctx.h upa.h utrap.h vga.h \
-	visasm.h watchdog.h
+unifdef-y := fbio.h perfctr.h
+header-y += apb.h asi.h bbc.h bpp.h display7seg.h envctrl.h floppy.h	\
+	ipc.h kdebug.h mostek.h openprom.h openpromio.h parport.h	\
+	pconf.h psrcompat.h pstate.h reg.h uctx.h utrap.h watchdog.h