diff -ruN klic-3.003-2001-11-18/include/klic/alloc.h klic-3.003-2001-11-19/include/klic/alloc.h
--- klic-3.003-2001-11-18/include/klic/alloc.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/alloc.h	Sun Nov 18 21:21:45 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_ALLOC_H_
+#define _KLIC_ALLOC_H_
+
 q *klic_interrupt();
 
 /* Reverse allocation from "heaptop" */
@@ -19,3 +22,5 @@
 
 #define heapalloc(s, words, maketype)\
   revalloc(s, words, maketype)
+
+#endif /* _KLIC_ALLOC_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/asyncio.h klic-3.003-2001-11-19/include/klic/asyncio.h
--- klic-3.003-2001-11-18/include/klic/asyncio.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/asyncio.h	Sun Nov 18 21:22:07 2001
@@ -4,9 +4,15 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_ASYNCIO_H_
+#define _KLIC_ASYNCIO_H_
+
 enum sigiotype {
   KLIC_SIGIO_NONE,
   KLIC_SIGIO_IN,
   KLIC_SIGIO_OUT,
   KLIC_SIGIO_INOUT
 };
+
+#endif /* _KLIC_ASYNCIO_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/atomstuffs.h klic-3.003-2001-11-19/include/klic/atomstuffs.h
--- klic-3.003-2001-11-18/include/klic/atomstuffs.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/atomstuffs.h	Sun Nov 18 21:22:35 2001
@@ -5,8 +5,13 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_ATOMSTUFFS_H_
+#define _KLIC_ATOMSTUFFS_H_
+
 /* atomnumber staffs */
 extern unsigned char **atomname;
 #define ATOMNUMBERBASE 2
 #define functoratomname(f) atomname[functoratom(f) - ATOMNUMBERBASE]
 #define namestringof(a) atomname[symval(a) - ATOMNUMBERBASE]
+
+#endif /* _KLIC_ATOMSTUFFS_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/basic.h klic-3.003-2001-11-19/include/klic/basic.h
--- klic-3.003-2001-11-18/include/klic/basic.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/basic.h	Sun Nov 18 21:22:56 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_BASIC_H_
+#define _KLIC_BASIC_H_
+
 #include <klic/config.h>
 
 #ifdef MAIN
@@ -67,3 +70,5 @@
 extern void klic_fprintf();
 
 #define klic_local_fprintf fprintf
+
+#endif /* _KLIC_BASIC_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/bb.h klic-3.003-2001-11-19/include/klic/bb.h
--- klic-3.003-2001-11-18/include/klic/bb.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/bb.h	Sun Nov 18 21:23:14 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_BB_H_
+#define _KLIC_BB_H_
+
 /*
   Addition
 */
@@ -618,3 +621,6 @@
 
 #define bblt_current_node_no_check(x, y) \
 {  x = makeint(my_node);  y = makeint(total_node); }
+
+
+#endif /* _KLIC_BB_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/control.h klic-3.003-2001-11-19/include/klic/control.h
--- klic-3.003-2001-11-18/include/klic/control.h	Sun Nov 18 15:19:38 2001
+++ klic-3.003-2001-11-19/include/klic/control.h	Sun Nov 18 21:23:34 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_CONTROL_H_
+#define _KLIC_CONTROL_H_
+
 /* Reasons of interruption */
 #define EXTEVENT	makeint(0)
 #define FAILURE		makeint(1)
@@ -96,3 +99,5 @@
 { \
   qp = enqueue_throw_goal((node), (goal), (oldqp), allocp);\
 }
+
+#endif /* _KLIC_CONTROL_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/functorstuffs.h klic-3.003-2001-11-19/include/klic/functorstuffs.h
--- klic-3.003-2001-11-18/include/klic/functorstuffs.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/functorstuffs.h	Sun Nov 18 21:24:20 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_FUNCTORSTUFFS_H_
+#define _KLIC_FUNCTORSTUFFS_H_
+
 /* functor staffs */
 extern unsigned long *arities;
 extern unsigned long *functors;
@@ -12,3 +15,4 @@
 #define functoratom(f) functors[symval(f) - FUNCTORNUMBERBASE]
 #define arityof(f) arities[symval(f) - FUNCTORNUMBERBASE]
 
+#endif /* _KLIC_FUNCTORSTUFFS_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_basic.h klic-3.003-2001-11-19/include/klic/g_basic.h
--- klic-3.003-2001-11-18/include/klic/g_basic.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_basic.h	Sun Nov 18 21:24:42 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_G_BASIC_H_
+#define _KLIC_G_BASIC_H_
+
 /* external module/class reference */
 
 #define G_USE_PREDICATE(name) \
@@ -139,3 +143,4 @@
 extern voidfn G_error;
 #endif
 
+#endif /* _KLIC_G_BASIC_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_extern.h klic-3.003-2001-11-19/include/klic/g_extern.h
--- klic-3.003-2001-11-18/include/klic/g_extern.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_extern.h	Sun Nov 18 21:25:00 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_G_EXTERN_H_
+#define _KLIC_G_EXTERN_H_
+
 extern q general_gc( /* q *term, q* allocp */ );
 
 extern general_print( /* q *a, FILE stream, unsigned long depth,length */ );
@@ -14,3 +17,5 @@
 extern struct predicate predicate_generic_xnew_3;
 extern struct predicate predicate_generic_xroot_4;
 extern struct predicate predicate_generic_xmethod_4;
+
+#endif /* _KLIC_G_EXTERN_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_extinl.h klic-3.003-2001-11-19/include/klic/g_extinl.h
--- klic-3.003-2001-11-18/include/klic/g_extinl.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_extinl.h	Sun Nov 18 21:25:36 2001
@@ -4,9 +4,15 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_G_EXTINL_H_
+#define _KLIC_G_EXTINL_H_
+
 extern void GD_suspend();
 extern void GD_make_argblock();
 extern void GD_make_var();
 extern void GD_make_goal_of_new();
 extern void GD_make_goal_of_root();
 extern void GD_make_goal_of_mehtod();
+
+#endif /* _KLIC_G_EXTINL_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_float.h klic-3.003-2001-11-19/include/klic/g_float.h
--- klic-3.003-2001-11-18/include/klic/g_float.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_float.h	Sun Nov 18 21:25:55 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_G_FLOAT_H_
+#define _KLIC_G_FLOAT_H_
+
 struct float_object {
   struct data_object_method_table *method_table;
   double value;
@@ -15,3 +18,5 @@
 { &float_g_data_method_table, value }
 #define makefloat(x)		makefunctor(&x)
 #define float_value(x) (((float_structure_type *)functorp(x))->value)
+
+#endif /* _KLIC_G_FLOAT_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_methtab.h klic-3.003-2001-11-19/include/klic/g_methtab.h
--- klic-3.003-2001-11-18/include/klic/g_methtab.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_methtab.h	Sun Nov 18 21:26:21 2001
@@ -5,8 +5,8 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
-#ifndef G_METHOD_TABLE_H
-#define G_METHOD_TABLE_H
+#ifndef _KLIC_G_METHTAB_H_
+#define _KLIC_G_METHTAB_H_
 
 #define GENERIC_SUCCEEDED (q)0
 #define GENERIC_FAILED    (q)1
@@ -103,4 +103,4 @@
   struct generator_object_method_table *method_table;
 };
 
-#endif
+#endif /* _KLIC_G_METHTAB_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_pointer.h klic-3.003-2001-11-19/include/klic/g_pointer.h
--- klic-3.003-2001-11-18/include/klic/g_pointer.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_pointer.h	Sun Nov 18 21:26:44 2001
@@ -5,7 +5,12 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_G_POINTER_H_
+#define _KLIC_G_POINTER_H_
+
 struct pointer_object {
   struct data_object_method_table *method_table;
   char *pointer;
 };
+
+#endif /* _KLIC_G_POINTER_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_string.h klic-3.003-2001-11-19/include/klic/g_string.h
--- klic-3.003-2001-11-18/include/klic/g_string.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_string.h	Sun Nov 18 21:27:00 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_G_STRING_H_
+#define _KLIC_G_STRING_H_
+
 struct byte_string_object {
   struct data_object_method_table *method_table;
   q next;
@@ -33,3 +36,5 @@
   0,				/* ismbdiff */		\
   (unsigned char *)body		/* body */		\
 }
+
+#endif /* _KLIC_G_STRING_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_termarray.h klic-3.003-2001-11-19/include/klic/g_termarray.h
--- klic-3.003-2001-11-18/include/klic/g_termarray.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_termarray.h	Sun Nov 18 21:27:19 2001
@@ -5,8 +5,13 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_G_TERMARRAY_H_
+#define _KLIC_G_TERMARRAY_H_
+
 struct termarray_object {
   struct data_object_method_table *method_table;
   unsigned long nterm;
   q terms[1];
 };
+
+#endif /* _KLIC_G_TERMARRAY_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/g_vector.h klic-3.003-2001-11-19/include/klic/g_vector.h
--- klic-3.003-2001-11-18/include/klic/g_vector.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/g_vector.h	Sun Nov 18 21:27:37 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_G_VECTOR_H_
+#define _KLIC_G_VECTOR_H_
+
 struct vector_object {
   struct data_object_method_table *method_table;
   q next;
@@ -33,3 +36,5 @@
 }
 
 extern q create_vector();
+
+#endif /* _KLIC_G_VECTOR_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gb.h klic-3.003-2001-11-19/include/klic/gb.h
--- klic-3.003-2001-11-18/include/klic/gb.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gb.h	Sun Nov 18 21:27:58 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GB_H_
+#define _KLIC_GB_H_
+
 extern q builtin_compare_terms();
 extern q builtin_hash_term();
 
@@ -244,3 +247,5 @@
 
 #define gblt_tag(x, y, faillab)   y = makeint(ptagof(x))
 #define gblt_value(x, y, faillab) y = makeint(((unsigned long)x)>>ATAGBITS)
+
+#endif /* _KLIC_GB_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gc_macro.h klic-3.003-2001-11-19/include/klic/gc_macro.h
--- klic-3.003-2001-11-18/include/klic/gc_macro.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gc_macro.h	Sun Nov 18 21:28:24 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GC_MACRO_H_
+#define _KLIC_GC_MACRO_H_
+
 extern q GC_wakeup_g_new();
 extern q *G_MAKE_THE_NEW_GOAL();
 extern q *do_shallow_unify(), *do_shallow_unify_value();
@@ -525,3 +528,5 @@
   gp->args[1] = y; \
   resume_same_prio(gp); \
 }
+
+#endif /* _KLIC_GC_MACRO_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gc_methtab.h klic-3.003-2001-11-19/include/klic/gc_methtab.h
--- klic-3.003-2001-11-18/include/klic/gc_methtab.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gc_methtab.h	Sun Nov 18 21:28:42 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_GC_METHTAB_H_
+#define _KLIC_GC_METHTAB_H_
+
 extern q * GC_STD_UNIFY();
 extern long GC_STD_PRINT();
 extern q *GC_STD_GC();
@@ -61,3 +65,5 @@
  GC_rappend(encode) 
 #endif
 };
+
+#endif /* _KLIC_GC_METHTAB_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gcobject.h klic-3.003-2001-11-19/include/klic/gcobject.h
--- klic-3.003-2001-11-18/include/klic/gcobject.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gcobject.h	Sun Nov 18 21:29:03 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_GCOBJECT_H_
+#define _KLIC_GCOBJECT_H_
+
 #include <klic/basic.h>
 #include <klic/struct.h>
 #include <klic/primitives.h>
@@ -15,3 +19,5 @@
 #include <klic/g_methtab.h>
 #include <klic/g_extern.h>
 #include <klic/g_extinl.h>
+
+#endif /* _KLIC_GCOBJECT_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gd_macro.h klic-3.003-2001-11-19/include/klic/gd_macro.h
--- klic-3.003-2001-11-18/include/klic/gd_macro.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gd_macro.h	Sun Nov 18 21:29:25 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GD_MACRO_H_
+#define _KLIC_GD_MACRO_H_
+
 extern q eq_terms_body();
 extern q *GD_MAKE_GENERIC_GOAL(), *G_MAKE_THE_NEW_GOAL();
 extern q *do_shallow_unify(), *do_shallow_unify_value();
@@ -523,3 +526,5 @@
  q \
   GD_rappend(encode) (GD_SELF) \
     GD_OBJ_TYPE * GD_SELF;
+
+#endif /* _KLIC_GD_MACRO_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gd_methtab.h klic-3.003-2001-11-19/include/klic/gd_methtab.h
--- klic-3.003-2001-11-18/include/klic/gd_methtab.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gd_methtab.h	Sun Nov 18 21:29:43 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GD_METHTAB_H_
+#define _KLIC_GD_METHTAB_H_
+
 extern q GD_STD_GUNIFY();
 extern q * GD_STD_UNIFY();
 extern long GD_STD_PRINT();
@@ -99,3 +102,5 @@
  GD_rappend(encode)
 #endif
 };
+
+#endif /* _KLIC_GD_METHTAB_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gdobject.h klic-3.003-2001-11-19/include/klic/gdobject.h
--- klic-3.003-2001-11-18/include/klic/gdobject.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gdobject.h	Sun Nov 18 21:30:02 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_GDOBJECT_H_
+#define _KLIC_GDOBJECT_H_
+
 #include <klic/basic.h>
 #include <klic/struct.h>
 #include <klic/primitives.h>
@@ -15,3 +19,5 @@
 #include <klic/g_extern.h>
 #include <klic/g_extinl.h>
 #include <klic/g_methtab.h>
+
+#endif /* _KLIC_GDOBJECT_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/ge_exref.h klic-3.003-2001-11-19/include/klic/ge_exref.h
--- klic-3.003-2001-11-18/include/klic/ge_exref.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/ge_exref.h	Sun Nov 18 21:30:19 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GE_EXREF_H_
+#define _KLIC_GE_EXREF_H_
+
 struct exref_object{
   struct generator_object_method_table *method_table;
   long node;
@@ -13,3 +16,5 @@
   q    to_exref;
   long gc_flag;
 };
+
+#endif /* _KLIC_GE_EXREF_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/generic.h klic-3.003-2001-11-19/include/klic/generic.h
--- klic-3.003-2001-11-18/include/klic/generic.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/generic.h	Sun Nov 18 21:30:33 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_GENERIC_H_
+#define _KLIC_GENERIC_H_
+
 #include <klic/g_methtab.h>
 
 extern q *gd_generic();
@@ -40,3 +44,5 @@
 
 #define declare_method_table_of(class) \
   extern struct data_object_method_table data_object_method_table_of(class)
+
+#endif /* _KLIC_GENERIC_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gg_macro.h klic-3.003-2001-11-19/include/klic/gg_macro.h
--- klic-3.003-2001-11-18/include/klic/gg_macro.h	Sun Nov 18 15:21:07 2001
+++ klic-3.003-2001-11-19/include/klic/gg_macro.h	Sun Nov 18 21:30:57 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GG_MACRO_H_
+#define _KLIC_GG_MACRO_H_
+
 extern q GC_wakeup_g_new();
 extern q *G_MAKE_THE_NEW_GOAL();
 extern q *do_shallow_unify(), *do_shallow_unify_value();
@@ -350,3 +353,5 @@
     GG_OBJ_TYPE *GG_SELF;\
     combuf *buffer;\
     long depth;
+
+#endif /* _KLIC_GG_MACRO_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gg_methtab.h klic-3.003-2001-11-19/include/klic/gg_methtab.h
--- klic-3.003-2001-11-18/include/klic/gg_methtab.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gg_methtab.h	Sun Nov 18 21:31:13 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GG_METHTAB_H_
+#define _KLIC_GG_METHTAB_H_
+
 extern q * GG_STD_UNIFY();
 extern q GG_STD_SUSPEND();
 extern long GG_STD_PRINT();
@@ -76,3 +79,5 @@
 #endif
 
 };
+
+#endif /* _KLIC_GG_METHTAB_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gmodule.h klic-3.003-2001-11-19/include/klic/gmodule.h
--- klic-3.003-2001-11-18/include/klic/gmodule.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gmodule.h	Sun Nov 18 21:31:33 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GMODULE_H_
+#define _KLIC_GMODULE_H_
+
 struct module_object {
   struct data_object_method_table *method_table;
   q name;
@@ -35,3 +38,5 @@
 }
 
 #define makepred(x)		makefunctor(&x)
+
+#endif /* _KLIC_GMODULE_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/goalobj.h klic-3.003-2001-11-19/include/klic/goalobj.h
--- klic-3.003-2001-11-18/include/klic/goalobj.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/goalobj.h	Sun Nov 18 21:31:50 2001
@@ -3,8 +3,13 @@
 %       (Read COPYRIGHT for detailed information.) 
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GOALOBJ_H_
+#define _KLIC_GOALOBJ_H_
+
 struct goal_object {
   struct data_object_method_table *method_table;
   struct goalrec *goal;
   unsigned long id;
 };
+
+#endif /* _KLIC_GOALOBJ_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gobj.h klic-3.003-2001-11-19/include/klic/gobj.h
--- klic-3.003-2001-11-18/include/klic/gobj.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gobj.h	Sun Nov 18 21:32:04 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_GOBJ_H_
+#define _KLIC_GOBJ_H_
+
 #include <klic/g_methtab.h>
 
 /*
@@ -105,3 +108,5 @@
   this variable for new method has not already used
 struct generic *new_term;
 */
+
+#endif /* _KLIC_GOBJ_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/gobjutil.h klic-3.003-2001-11-19/include/klic/gobjutil.h
--- klic-3.003-2001-11-18/include/klic/gobjutil.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/gobjutil.h	Sun Nov 18 21:32:25 2001
@@ -4,7 +4,9 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
-/**** header file for using data and functions defined in kernel ****/ 
+/**** header file for using data and functions defined in kernel ****/
+#ifndef _KLIC_GOBJUTIL_H_
+#define _KLIC_GOBJUTIL_H_
 
 /* temporary */
 
@@ -63,3 +65,5 @@
   this variable for new method has not already used
 struct generic *new_term;
 */
+
+#endif /* _KLIC_GOBJUTIL_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/index.h klic-3.003-2001-11-19/include/klic/index.h
--- klic-3.003-2001-11-18/include/klic/index.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/index.h	Sun Nov 18 21:32:42 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_INDEX_H_
+#define _KLIC_INDEX_H_
+
 #define deref_and_switch(x, susp, atomic, cons, funct)	\
 { \
   while (1) { \
@@ -50,3 +53,5 @@
 #define not_cons(x)		((tag = ptagof(x)) != CONS)
 #define not_functor()		(tag <= CONS)
 #define not_atomic()		(tag == 0)
+
+#endif /* _KLIC_INDEX_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/interpe.h klic-3.003-2001-11-19/include/klic/interpe.h
--- klic-3.003-2001-11-18/include/klic/interpe.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/interpe.h	Sun Nov 18 21:32:56 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_INTERPE_H_
+#define _KLIC_INTERPE_H_
+
 #include <malloc.h>
 #ifdef __alpha
 /* dec malloc.h does not supply function return value decralations */
@@ -195,3 +199,4 @@
 
 #define ERROR_STOP for(;;)
 
+#endif /* _KLIC_INTERPE_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/klichdr.h klic-3.003-2001-11-19/include/klic/klichdr.h
--- klic-3.003-2001-11-18/include/klic/klichdr.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/klichdr.h	Sun Nov 18 21:33:18 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_KLICHDR_H_
+#define _KLIC_KLICHDR_H_
+
 #include <klic/basic.h>
 #include <klic/struct.h>
 #include <klic/primitives.h>
@@ -17,3 +20,5 @@
 #include <klic/g_vector.h>
 #include <klic/g_float.h>
 #include <klic/gmodule.h>
+
+#endif /* _KLIC_KLICHDR_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/msgfmt.h klic-3.003-2001-11-19/include/klic/msgfmt.h
--- klic-3.003-2001-11-18/include/klic/msgfmt.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/msgfmt.h	Sun Nov 18 21:33:38 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_MSGFMT_H_
+#define _KLIC_MSGFMT_H_
+
 struct exref_id {
   long node;
   long id;
@@ -58,4 +61,4 @@
   long wtc;
 };
 
-
+#endif /* _KLIC_MSGFMT_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/newatom.h klic-3.003-2001-11-19/include/klic/newatom.h
--- klic-3.003-2001-11-18/include/klic/newatom.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/newatom.h	Sun Nov 18 21:33:53 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_NEWATOM_H_
+#define _KLIC_NEWATOM_H_
+
 /* #include <klic/functorstuffs.h> */
 /* functor staffs  */
 #define FUNCTORNUMBERBASE 0
@@ -76,3 +79,5 @@
 #define numberOfAtoms initial_atoms
 
 #define numberOfFunctors initial_functors
+
+#endif /* _KLIC_NEWATOM_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/options.h klic-3.003-2001-11-19/include/klic/options.h
--- klic-3.003-2001-11-18/include/klic/options.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/options.h	Sun Nov 18 21:34:06 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_OPTIONS_H_
+#define _KLIC_OPTIONS_H_
+
 union all_type {
     int i;
     long l;
@@ -112,3 +115,5 @@
     0, 0,
 };
 #endif /* MAIN */
+
+#endif /* _KLIC_OPTIONS_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/param.h klic-3.003-2001-11-19/include/klic/param.h
--- klic-3.003-2001-11-18/include/klic/param.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/param.h	Sun Nov 18 21:34:23 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_PARAM_H_
+#define _KLIC_PARAM_H_
+
 #define HEAPSIZE	24576L	/* default heap size (in words) */
 #define INCREMENTSIZE	1024L	/* reserved heap size (in words) */
 #define MAXSUSPENSION	1024L	/* how many suspension reasons can exist */
@@ -21,3 +24,5 @@
 #define PRIOQRECBULK	64	/* how many priority queue records to */
 				/* allocate at a time */
 #define GCSTACKSIZE	1024L	/* initial GC stack size */
+
+#endif /* _KLIC_PARAM_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/predinfo.h klic-3.003-2001-11-19/include/klic/predinfo.h
--- klic-3.003-2001-11-18/include/klic/predinfo.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/predinfo.h	Sun Nov 18 21:34:37 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_PREDINFO_H_
+#define _KLIC_PREDINFO_H_
+
 struct predinfo {
   Const unsigned char *name;
   Const struct predicate *predstruct;
@@ -13,3 +17,5 @@
   Const unsigned char *name;
   Const struct predinfo * Const *preds;
 };
+
+#endif /* _KLIC_PREDINFO_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/primitives.h klic-3.003-2001-11-19/include/klic/primitives.h
--- klic-3.003-2001-11-18/include/klic/primitives.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/primitives.h	Sun Nov 18 21:35:00 2001
@@ -5,5 +5,10 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_PRIMITIVES_H_
+#define _KLIC_PRIMITIVES_H_
+
 #include <klic/alloc.h>
 #include <klic/control.h>
+
+#endif /* _KLIC_PRIMITIVES_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/rmon.h klic-3.003-2001-11-19/include/klic/rmon.h
--- klic-3.003-2001-11-18/include/klic/rmon.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/rmon.h	Sun Nov 18 21:35:15 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ---------------------------------------------------------- */
 
+#ifndef _KLIC_RMON_H_
+#define _KLIC_RMON_H_
+
 /************* For profiling ************************/
 
 #define PROF_GATHER_INTERVAL_SEC 2
@@ -55,3 +58,5 @@
 Extern int gathered_count Init(0);
 
 Extern long *send_pbuf;
+
+#endif /* _KLIC_RMON_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/schedule.h klic-3.003-2001-11-19/include/klic/schedule.h
--- klic-3.003-2001-11-18/include/klic/schedule.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/schedule.h	Sun Nov 18 21:35:32 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_SCHEDULE_H_
+#define _KLIC_SCHEDULE_H_
+
 struct prioqrec
 *more_priorec();
 
@@ -13,3 +16,4 @@
 extern struct goalrec * get_top_priority_queue();
 void put_top_priority_queue();
 
+#endif /* _KLIC_SCHEDULE_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/shm.h klic-3.003-2001-11-19/include/klic/shm.h
--- klic-3.003-2001-11-18/include/klic/shm.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/shm.h	Sun Nov 18 21:35:44 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_SHM_H_
+#define _KLIC_SHM_H_
+
 /* Machine depending Dec */
 #include <klic/shm_machine.h>
 
@@ -282,3 +285,4 @@
 /* for debugging */
 #define debug_wait() { while(!*pe_status) {} }
 
+#endif /* _KLIC_SHM_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/shm_machine.h klic-3.003-2001-11-19/include/klic/shm_machine.h
--- klic-3.003-2001-11-18/include/klic/shm_machine.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/shm_machine.h	Sun Nov 18 21:36:02 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_SHM_MACHINE_H_
+#define _KLIC_SHM_MACHINE_H_
+
   /* lock-unlock */
 #ifdef SPARC
 
@@ -214,3 +217,5 @@
 #define klic_barrier() {;} 
 
 #endif
+
+#endif /* _KLIC_SHM_MACHINE_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/sighndl.h klic-3.003-2001-11-19/include/klic/sighndl.h
--- klic-3.003-2001-11-18/include/klic/sighndl.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/sighndl.h	Sun Nov 18 21:11:57 2001
@@ -35,4 +35,5 @@
 #endif
 
 #endif
-#endif
+
+#endif /* _KLIC_SIGHNDL_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/struct.h klic-3.003-2001-11-19/include/klic/struct.h
--- klic-3.003-2001-11-18/include/klic/struct.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/struct.h	Sun Nov 18 21:36:41 2001
@@ -3,6 +3,9 @@
 %       (Read COPYRIGHT for detailed information.) 
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_STRUCT_H_
+#define _KLIC_STRUCT_H_
+
 /*
   struct.h
 
@@ -356,3 +359,5 @@
 
 Extern q suspension_reason;
 Extern q rest_of_stream;
+
+#endif /* _KLIC_STRUCT_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/susp.h klic-3.003-2001-11-19/include/klic/susp.h
--- klic-3.003-2001-11-18/include/klic/susp.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/susp.h	Sun Nov 18 21:36:55 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_SUSP_H_
+#define _KLIC_SUSP_H_
+
 /******************************
   Suspension Structures
 *******************************/
@@ -133,3 +136,4 @@
   struct suspended_goal_rec *next;
 };
 
+#endif /* _KLIC_SUSP_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/timer.h klic-3.003-2001-11-19/include/klic/timer.h
--- klic-3.003-2001-11-18/include/klic/timer.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/timer.h	Sun Nov 18 21:37:10 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_TIMER_H_
+#define _KLIC_TIMER_H_
+
 struct klic_timer_wait_rec {
   struct klic_timer_wait_rec *next;
   struct timeval on_at;
@@ -47,3 +51,5 @@
   call_after_specified_interval(),
   call_at_time_intervals(),
   init_virtualized_timer();
+
+#endif /* _KLIC_TIMER_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/timing.h klic-3.003-2001-11-19/include/klic/timing.h
--- klic-3.003-2001-11-18/include/klic/timing.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/timing.h	Sun Nov 18 21:37:28 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_TIMING_H_
+#define _KLIC_TIMING_H_
+
 #include <sys/types.h>
 
 #define  field_diff(field)	(after.field - before.field)
@@ -35,3 +39,5 @@
 Extern int gcums Init(0);
 Extern int gcsms Init(0);
 Extern int measure_gc Init(0);
+
+#endif /* _KLIC_TIMING_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/trace.h klic-3.003-2001-11-19/include/klic/trace.h
--- klic-3.003-2001-11-18/include/klic/trace.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/trace.h	Sun Nov 18 21:37:48 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_TRACE_H_
+#define _KLIC_TRACE_H_
+
 /*
   Tracer Status Information
 */
@@ -64,3 +67,5 @@
 
 enum trace_port {
   Call, Susp, Reduce, Fail, AllPorts, NoMorePort, UnknownPort };
+
+#endif /* _KLIC_TRACE_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/traceio.h klic-3.003-2001-11-19/include/klic/traceio.h
--- klic-3.003-2001-11-18/include/klic/traceio.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/traceio.h	Sun Nov 18 21:38:23 2001
@@ -4,6 +4,10 @@
 %   (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
+
+#ifndef _KLIC_TRACEIO_H_
+#define _KLIC_TRACEIO_H_
+
 #ifdef DIST
 #define TRACE_ATTACHIO()	AttachIO()
 #define TRACE_DETACHIO()	DetachIO()
@@ -18,3 +22,5 @@
 #define TRACE_DETACHIO()
 # endif
 #endif
+
+#endif /* _KLIC_TRACEIO_H_ */
diff -ruN klic-3.003-2001-11-18/include/klic/unify.h klic-3.003-2001-11-19/include/klic/unify.h
--- klic-3.003-2001-11-18/include/klic/unify.h	Fri Jul 28 11:01:41 2000
+++ klic-3.003-2001-11-19/include/klic/unify.h	Sun Nov 18 21:38:39 2001
@@ -5,6 +5,9 @@
 %       (Read COPYRIGHT-JIPDEC for detailed information.)
 ----------------------------------------------------------- */
 
+#ifndef _KLIC_UNIFY_H_
+#define _KLIC_UNIFY_H_
+
 extern q
   *do_unify(), *do_unify2(), *do_unify3(), *do_unify4(),
   *do_unify_value(), *do_unify_value2(),
@@ -59,3 +62,5 @@
   unify_value((u), (v));					\
 }
 #endif
+
+#endif /* _KLIC_UNIFY_H_ */