diff -ruN linux-2.4.20-pre7-tux/include/linux/sched.h linux-2.4.20-pre7-jam0/include/linux/sched.h
--- linux-2.4.20-pre7-tux/include/linux/sched.h	2002-09-18 12:52:33.000000000 +0200
+++ linux-2.4.20-pre7-jam0/include/linux/sched.h	2002-09-20 16:32:14.000000000 +0200
@@ -442,10 +442,12 @@
 	void *notifier_data;
 	sigset_t *notifier_mask;
 
+#if defined(CONFIG_TUX) || defined(CONFIG_TUX_MODULE)
 	/* TUX state */
 	void *tux_info;
 	void (*tux_exit)(void);
-	
+#endif
+
 /* Thread group tracking */
    	u32 parent_exec_id;
    	u32 self_exec_id;
diff -ruN linux-2.4.20-pre7-tux/include/net/sock.h linux-2.4.20-pre7-jam0/include/net/sock.h
--- linux-2.4.20-pre7-tux/include/net/sock.h	2002-09-18 12:56:07.000000000 +0200
+++ linux-2.4.20-pre7-jam0/include/net/sock.h	2002-09-20 16:32:47.000000000 +0200
@@ -668,9 +668,11 @@
 
 	/* RPC layer private data */
 	void			*user_data;
-  
+
+#if defined(CONFIG_TUX) || defined(CONFIG_TUX_MODULE)
 	/* TUX application layer private data */
 	void			*tux_data;
+#endif
 
 	/* Callbacks */
 	void			(*state_change)(struct sock *sk);
diff -ruN linux-2.4.20-pre7-tux/kernel/exit.c linux-2.4.20-pre7-jam0/kernel/exit.c
--- linux-2.4.20-pre7-tux/kernel/exit.c	2002-09-18 10:23:38.000000000 +0200
+++ linux-2.4.20-pre7-jam0/kernel/exit.c	2002-09-20 16:34:03.000000000 +0200
@@ -504,6 +504,7 @@
 #ifdef CONFIG_BSD_PROCESS_ACCT
 	acct_process(code);
 #endif
+#if defined(CONFIG_TUX) || defined(CONFIG_TUX_MODULE)
 	if (current->tux_info) {
 #ifdef CONFIG_TUX_DEBUG
 		printk("Possibly unexpected TUX-thread exit(%ld) at %p?\n",
@@ -511,6 +512,7 @@
 #endif
 		current->tux_exit();
 	}
+#endif
 	__exit_mm(tsk);
 
 	bproc_hook(do_exit, (tsk,code));
diff -ruN linux-2.4.20-pre7-tux/kernel/fork.c linux-2.4.20-pre7-jam0/kernel/fork.c
--- linux-2.4.20-pre7-tux/kernel/fork.c	2002-09-18 10:23:38.000000000 +0200
+++ linux-2.4.20-pre7-jam0/kernel/fork.c	2002-09-20 16:33:36.000000000 +0200
@@ -669,7 +669,9 @@
 		goto fork_out;
 
 	*p = *current;
+#if defined(CONFIG_TUX) || defined(CONFIG_TUX_MODULE)
 	p->tux_info = NULL;
+#endif
 
 	retval = -EAGAIN;
 	/*
diff -ruN linux-2.4.20-pre7-tux/net/netsyms.c linux-2.4.20-pre7-jam0/net/netsyms.c
--- linux-2.4.20-pre7-tux/net/netsyms.c	2002-09-18 10:23:38.000000000 +0200
+++ linux-2.4.20-pre7-jam0/net/netsyms.c	2002-09-20 16:36:47.000000000 +0200
@@ -612,6 +612,8 @@
 
 #endif  /* CONFIG_NET */
 
+#if defined(CONFIG_TUX) || defined(CONFIG_TUX_MODULE)
 EXPORT_SYMBOL(tux_Dprintk);
 EXPORT_SYMBOL(tux_TDprintk);
+#endif
 
diff -ruN linux-2.4.20-pre7-tux/net/socket.c linux-2.4.20-pre7-jam0/net/socket.c
--- linux-2.4.20-pre7-tux/net/socket.c	2002-09-18 10:23:38.000000000 +0200
+++ linux-2.4.20-pre7-jam0/net/socket.c	2002-09-20 16:35:56.000000000 +0200
@@ -1743,8 +1743,10 @@
 #endif
 }
 
+#if defined(CONFIG_TUX) || defined(CONFIG_TUX_MODULE)
 int tux_Dprintk;
 int tux_TDprintk = 1;
+#endif
 
 int socket_get_info(char *buffer, char **start, off_t offset, int length)
 {