diff -Naru lkcdutils-4.1/lcrash/include/lcrash.h lkcdutils-4.1-ia64/lcrash/include/lcrash.h
--- lkcdutils-4.1/lcrash/include/lcrash.h	Wed Apr  3 10:14:48 2002
+++ lkcdutils-4.1-ia64/lcrash/include/lcrash.h	Tue Apr  1 19:46:33 2003
@@ -21,7 +21,7 @@
 do{\
 	if(!(CHECK_ITER_THRESHOLD(COUNTER))){\
 		fprintf(OFP, "\nWARNING: Iteration threshold reached. "\
-			"Current threshold: %llu.\n         "\
+			"Current threshold: %"FMT64"u.\n         "\
 			"Use \"-i\" to change threshold.\n", iter_threshold);\
 	}\
 }while(0)
diff -Naru lkcdutils-4.1/liballoc/alloc.c lkcdutils-4.1-ia64/liballoc/alloc.c
--- lkcdutils-4.1/liballoc/alloc.c	Thu Dec  6 17:55:35 2001
+++ lkcdutils-4.1-ia64/liballoc/alloc.c	Tue Apr  1 16:27:01 2003
@@ -122,7 +122,7 @@
 	item->prev->next = item->next;
 }
 
-static struct sigaction sig_ign = { {(__sighandler_t)SIG_IGN}, {{0}}, 0, 0 };
+static struct sigaction sig_ign = { {(__sighandler_t)SIG_IGN},};
 static struct sigaction sigint_hold;
 static struct sigaction sigpipe_hold;
 
diff -Naru lkcdutils-4.1/libklib/arch/ia64/kl_kern.c lkcdutils-4.1-ia64/libklib/arch/ia64/kl_kern.c
--- lkcdutils-4.1/libklib/arch/ia64/kl_kern.c	Mon Apr 29 15:33:56 2002
+++ lkcdutils-4.1-ia64/libklib/arch/ia64/kl_kern.c	Tue Apr  1 19:30:31 2003
@@ -5,18 +5,19 @@
  * Copyright 1999 Silicon Graphics, Inc. All rights reserved.
  * Copyright 2001 Silicon Graphics, Inc. All rights reserved.
  */
-#include <klib.h>
 
 /* We the following include files are necessary to pick up ARCH 
  * specific defines
  */
 #ifndef __KERNEL__
 #define __KERNEL__
+#include <klib.h>
 #include <asm/page.h>
 #include <asm/system.h>
 #include <asm/processor.h>
 #undef __KERNEL__
 #else
+#include <klib.h>
 #include <asm/page.h>
 #include <asm/system.h>
 #include <asm/processor.h>
diff -Naru lkcdutils-4.1/libklib/include/asm-ia64/dump.h lkcdutils-4.1-ia64/libklib/include/asm-ia64/dump.h
--- lkcdutils-4.1/libklib/include/asm-ia64/dump.h	Sun Mar  3 23:07:41 2002
+++ lkcdutils-4.1-ia64/libklib/include/asm-ia64/dump.h	Tue Apr  1 19:36:11 2003
@@ -17,7 +17,6 @@
 #define DUMP_ASM_VERSION_NUMBER   0x3            /* version number          */
 
 #ifdef __KERNEL__
-#include <asm/efi.h>
 #include <asm/pal.h>
 #ifdef CONFIG_SMP
 extern int (*dump_ipi_function_ptr)(struct pt_regs *);
diff -Naru lkcdutils-4.1/libklib/kl_cmp.c lkcdutils-4.1-ia64/libklib/kl_cmp.c
--- lkcdutils-4.1/libklib/kl_cmp.c	Thu Apr 11 17:01:44 2002
+++ lkcdutils-4.1-ia64/libklib/kl_cmp.c	Tue Apr  1 19:39:33 2003
@@ -1133,7 +1133,7 @@
 			fprintf(KL_ERRORFP,
 				"__cmppindexcreate(): "
 				"addr = 0x%"FMTPTR"x, hash = %-6d, "
-				"counter = %-6d, cur_addr = 0x%llx\n",
+				"counter = %-6d, cur_addr = 0x%"FMTPTR"x\n",
 				ptr1->addr, ptr1->hash, counter, cur_addr);
 		}
 
diff -Naru lkcdutils-4.1/lkcd_config/lkcd_config.c lkcdutils-4.1-ia64/lkcd_config/lkcd_config.c
--- lkcdutils-4.1/lkcd_config/lkcd_config.c	Thu Apr  4 15:39:12 2002
+++ lkcdutils-4.1-ia64/lkcd_config/lkcd_config.c	Tue Apr  1 19:53:13 2003
@@ -5,13 +5,20 @@
  *
  * This source code is released under the terms of version 2 of the GNU GPL.
  */
+#ifndef __KERNEL__
+#define __KERNEL__
 #include <lcrash.h>
 #include <stdio.h>
 #include <linux/module.h>
+#undef __KERNEL__
+#else   /* __KERNEL__ */
+#include <lcrash.h>
+#include <stdio.h>
+#include <linux/module.h>
+#endif  /* __KERNEL__ */
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <stdio.h>
diff -Naru lkcdutils-4.1/lkcd_ksyms/main.c lkcdutils-4.1-ia64/lkcd_ksyms/main.c
--- lkcdutils-4.1/lkcd_ksyms/main.c	Tue Nov 20 07:02:09 2001
+++ lkcdutils-4.1-ia64/lkcd_ksyms/main.c	Tue Apr  1 19:47:22 2003
@@ -4,9 +4,17 @@
  *
  * $Id: main.c,v 1.3 2001/11/19 22:02:09 tjm Exp $
  */
+#ifndef __KERNEL__
+#define __KERNEL__
 #include <lcrash.h>
 #include <stdio.h>
 #include <linux/module.h>
+#undef __KERNEL__
+#else   /* __KERNEL__ */
+#include <lcrash.h>
+#include <stdio.h>
+#include <linux/module.h>
+#endif  /* __KERNEL__ */
 
 #define	GK_LINE_LENGTH	255	/* ksyms' a line length */
 
