diff --git a/sys/arch/sh3/sh3/genassym.cf b/sys/arch/sh3/sh3/genassym.cf
index d5db8da59bdd..0a323b1357ef 100644
--- a/sys/arch/sh3/sh3/genassym.cf
+++ b/sys/arch/sh3/sh3/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.10 2005/12/11 12:19:00 christos Exp $
+#	$NetBSD: genassym.cf,v 1.11 2007/03/24 21:32:11 uwe Exp $
 
 #-
 # Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,12 +35,10 @@
 
 include <sys/param.h>
 include <sys/proc.h>
-include <sys/signal.h>
 include <sys/mbuf.h>
 include <sys/user.h>
 include <sys/errno.h>
 include <uvm/uvm_extern.h>
-include <sh3/locore.h>
 include <sh3/vmparam.h>
 
 define	TF_SIZE			sizeof(struct trapframe)
@@ -68,15 +66,6 @@ define	TF_R1			offsetof(struct trapframe, tf_r1)
 define	TF_R0			offsetof(struct trapframe, tf_r0)
 define	TF_R15			offsetof(struct trapframe, tf_r15)
 
-define	L_ADDR			offsetof(struct lwp, l_addr)
-define	L_BACK			offsetof(struct lwp, l_back)
-define	L_FORW			offsetof(struct lwp, l_forw)
-define	L_STAT			offsetof(struct lwp, l_stat)
-define	L_WCHAN			offsetof(struct lwp, l_wchan)
-
-define	L_MD_UPTE		offsetof(struct lwp, l_md.md_upte)
-define	L_MD_PCB		offsetof(struct lwp, l_md.md_pcb)
-
 define	SF_SIZE			sizeof(struct switchframe)
 define	SF_SR			offsetof(struct switchframe, sf_sr)
 define	SF_R15			offsetof(struct switchframe, sf_r15)
@@ -90,14 +79,12 @@ define	SF_PR			offsetof(struct switchframe, sf_pr)
 define	SF_R6_BANK		offsetof(struct switchframe, sf_r6_bank)
 define	SF_R7_BANK		offsetof(struct switchframe, sf_r7_bank)
 
-define	SC_EFLAGS		offsetof(struct sigcontext, sc_ssr)
+define	L_MD_UPTE		offsetof(struct lwp, l_md.md_upte)
+define	L_MD_PCB		offsetof(struct lwp, l_md.md_pcb)
 
 define	PCB_ONFAULT		offsetof(struct pcb, pcb_onfault)
 define	PCB_FAULTBAIL		offsetof(struct pcb, pcb_faultbail)
 
-define	LSONPROC		LSONPROC
-define	LSRUN			LSRUN
-
 define	UVMEXP_INTRS		offsetof(struct uvmexp, intrs)
 
 define	VM_MAXUSER_ADDRESS	VM_MAXUSER_ADDRESS