Fixed #include lines to be <kerberosIV/foo.h>

Removed #include <mit-copyright.h> and replaced it with the Kerberos V5
copyright notice.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3576 dc483132-0cff-0310-8789-dd5450dbe970

29 files changed, 504 insertions, 168 deletions

diff --git a/src/include/kerberosIV/addr_comp.h b/src/include/kerberosIV/addr_comp.h
index 43e6547ad..471d5ddea 100644
--- a/src/include/kerberosIV/addr_comp.h
+++ b/src/include/kerberosIV/addr_comp.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1987, 1988, 1989 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
+ * Copyright 1987-1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Include file for address comparison macros.
  */
 
-#include <mit-copyright.h>
-
 #ifndef ADDR_COMP_DEFS
 #define ADDR_COMP_DEFS
 
diff --git a/src/include/kerberosIV/admin_server.h b/src/include/kerberosIV/admin_server.h
index b0657106d..08f43337e 100644
--- a/src/include/kerberosIV/admin_server.h
+++ b/src/include/kerberosIV/admin_server.h
@@ -3,16 +3,27 @@
  * $Author$
  * $Header$
  *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987-1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * Include file for the Kerberos administration server. 
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  */
 
-#include <mit-copyright.h>
-
 #ifndef ADMIN_SERVER_DEFS
 #define ADMIN_SERVER_DEFS
 
diff --git a/src/include/kerberosIV/conf-bsd386i.h b/src/include/kerberosIV/conf-bsd386i.h
index 4cda8fe1d..673724eda 100644
--- a/src/include/kerberosIV/conf-bsd386i.h
+++ b/src/include/kerberosIV/conf-bsd386i.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1989 by the Massachusetts Institute of Technology.
+ * Copyright 1989-1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  *
  * Machine-type definitions: Sun 386i using SunOS (~BSD)
  */
 
-#include <mit-copyright.h>
-
 #define BITS32
 #define BIG
 #define LSBFIRST
diff --git a/src/include/kerberosIV/conf-bsdapollo.h b/src/include/kerberosIV/conf-bsdapollo.h
index 693728f3a..80d6c3309 100644
--- a/src/include/kerberosIV/conf-bsdapollo.h
+++ b/src/include/kerberosIV/conf-bsdapollo.h
@@ -3,16 +3,26 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Description.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
-#include <mit-copyright.h>
-
 #define BSDUNIX
 #define BITS32
 #define BIG
diff --git a/src/include/kerberosIV/conf-bsdibm032.h b/src/include/kerberosIV/conf-bsdibm032.h
index ce77a0783..cfa7ef84e 100644
--- a/src/include/kerberosIV/conf-bsdibm032.h
+++ b/src/include/kerberosIV/conf-bsdibm032.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  *
  * Machine-type definitions: IBM 032 (RT/PC)
  */
 
-#include <mit-copyright.h>
-
 #define BSDUNIX
 #define IBMWS
 #define IBMWSASM
diff --git a/src/include/kerberosIV/conf-bsdm68k.h b/src/include/kerberosIV/conf-bsdm68k.h
index 12b9ddaa6..cbc15befe 100644
--- a/src/include/kerberosIV/conf-bsdm68k.h
+++ b/src/include/kerberosIV/conf-bsdm68k.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  *
  * Machine-type definitions: 68000 with BSD Unix, e.g. SUN
  */
 
-#include <mit-copyright.h>
-
 #define BITS32
 #define BIG
 #define MSBFIRST
diff --git a/src/include/kerberosIV/conf-bsdsparc.h b/src/include/kerberosIV/conf-bsdsparc.h
index c9cdf4c02..f31a55725 100644
--- a/src/include/kerberosIV/conf-bsdsparc.h
+++ b/src/include/kerberosIV/conf-bsdsparc.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Machine-type definitions: SPARC with BSD Unix, e.g. SUN-4
  */
 
-#include <mit-copyright.h>
-
 #define BITS32
 #define BIG
 #define MSBFIRST
diff --git a/src/include/kerberosIV/conf-bsdtahoe.h b/src/include/kerberosIV/conf-bsdtahoe.h
index f4818f063..02c51e657 100644
--- a/src/include/kerberosIV/conf-bsdtahoe.h
+++ b/src/include/kerberosIV/conf-bsdtahoe.h
@@ -3,13 +3,27 @@
  * $Author$
  * $Header$
  *
- * Copyright 1989 by the Regents of the University of California
+ * Copyright 1989, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * Machine Description : TAHOE.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  */
 
-#include <mit-copyright.h>
-
 #define	TAHOE
 #define BSDUNIX
 #define BITS32
diff --git a/src/include/kerberosIV/conf-bsdvax.h b/src/include/kerberosIV/conf-bsdvax.h
index 04416661a..0daae5f12 100644
--- a/src/include/kerberosIV/conf-bsdvax.h
+++ b/src/include/kerberosIV/conf-bsdvax.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Machine-type definitions: VAX
  */
 
-#include <mit-copyright.h>
-
 #define VAX
 #define BITS32
 #define BIG
diff --git a/src/include/kerberosIV/conf-ibm370.h b/src/include/kerberosIV/conf-ibm370.h
index 1fd620d1b..8bff74bbb 100644
--- a/src/include/kerberosIV/conf-ibm370.h
+++ b/src/include/kerberosIV/conf-ibm370.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Machine-type definitions: IBM 370
  */
 
-#include <mit-copyright.h>
-
 /* What else? */
 #define BIG
 #define NONASCII
diff --git a/src/include/kerberosIV/conf-pc.h b/src/include/kerberosIV/conf-pc.h
index 09cc2d874..79af2b78a 100644
--- a/src/include/kerberosIV/conf-pc.h
+++ b/src/include/kerberosIV/conf-pc.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Machine-type definitions: IBM PC 8086
  */
 
-#include <mit-copyright.h>
-
 #define IBMPC
 #define BITS16
 #define CROSSMSDOS
diff --git a/src/include/kerberosIV/conf-pyr.h b/src/include/kerberosIV/conf-pyr.h
index 08cd0e6fe..4a03700f0 100644
--- a/src/include/kerberosIV/conf-pyr.h
+++ b/src/include/kerberosIV/conf-pyr.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1989 by the Massachusetts Institute of Technology.
+ * Copyright 1989, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  *
  * Machine-type definitions: Pyramid
  */
 
-#include <mit-copyright.h>
-
 #define BITS32
 #define BIG
 #define MSBFIRST
diff --git a/src/include/kerberosIV/conf-ultmips2.h b/src/include/kerberosIV/conf-ultmips2.h
index cc14c76ae..5a15cb9a8 100644
--- a/src/include/kerberosIV/conf-ultmips2.h
+++ b/src/include/kerberosIV/conf-ultmips2.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Machine-type definitions: DECstation 3100 (MIPS R2000)
  */
  
-#include <mit-copyright.h>
- 
 #define MIPS2
 #define BITS32
 #define BIG
diff --git a/src/include/kerberosIV/conf.h b/src/include/kerberosIV/conf.h
index a438a7266..7e0e865ab 100644
--- a/src/include/kerberosIV/conf.h
+++ b/src/include/kerberosIV/conf.h
@@ -3,11 +3,25 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Configuration info for operating system, hardware description,
  * language implementation, C library, etc.
  *
@@ -19,8 +33,6 @@
 
 #ifndef _CONF_H_
 
-#include <mit-copyright.h>
-
 #include "osconf.h"
 
 #ifdef SHORTNAMES
diff --git a/src/include/kerberosIV/des.h b/src/include/kerberosIV/des.h
index ce1f67f6d..cff0aeaba 100644
--- a/src/include/kerberosIV/des.h
+++ b/src/include/kerberosIV/des.h
@@ -3,11 +3,25 @@
  * $Author$
  * $Header$ 
  *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1987, 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Include file for the Data Encryption Standard library.
  */
 
@@ -15,8 +29,6 @@
 #ifndef DES_DEFS
 #define DES_DEFS
 
-#include <mit-copyright.h>
-
 typedef unsigned char des_cblock[8];	/* crypto-block size */
 /* Key schedule */
 typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16];
diff --git a/src/include/kerberosIV/highc.h b/src/include/kerberosIV/highc.h
index a217b0196..7ef7c40a0 100644
--- a/src/include/kerberosIV/highc.h
+++ b/src/include/kerberosIV/highc.h
@@ -3,17 +3,29 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Known breakage in the version of Metaware's High C compiler that
  * we've got available....
  */
 
-#include <mit-copyright.h>
-
 #define const
 /*#define volatile*/
 
diff --git a/src/include/kerberosIV/kadm.h b/src/include/kerberosIV/kadm.h
index dc491b96f..66cd1d912 100644
--- a/src/include/kerberosIV/kadm.h
+++ b/src/include/kerberosIV/kadm.h
@@ -3,18 +3,31 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Definitions for Kerberos administration server & client
  */
 
 #ifndef KADM_DEFS
 #define KADM_DEFS
 
-#include <mit-copyright.h>
 /*
  * kadm.h
  * Header file for the fourth attempt at an admin server
@@ -28,8 +41,8 @@
 
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <krb.h>
-#include <des.h>
+#include <kerberosIV/krb.h>
+#include <kerberosIV/des.h>
 
 /* The global structures for the client and server */
 typedef struct {
diff --git a/src/include/kerberosIV/kdc.h b/src/include/kerberosIV/kdc.h
index 393fb0e20..3ddb145b7 100644
--- a/src/include/kerberosIV/kdc.h
+++ b/src/include/kerberosIV/kdc.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
+ * Copyright 1987, 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Include file for the Kerberos Key Distribution Center. 
  */
 
-#include <mit-copyright.h>
-
 #ifndef KDC_DEFS
 #define KDC_DEFS
 
diff --git a/src/include/kerberosIV/klog.h b/src/include/kerberosIV/klog.h
index b795386d4..44d67bf29 100644
--- a/src/include/kerberosIV/klog.h
+++ b/src/include/kerberosIV/klog.h
@@ -3,17 +3,29 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  *
  * This file defines the types of log messages logged by klog.  Each
  * type of message may be selectively turned on or off. 
  */
 
-#include <mit-copyright.h>
-
 #ifndef KLOG_DEFS
 #define KLOG_DEFS
 
diff --git a/src/include/kerberosIV/kparse.h b/src/include/kerberosIV/kparse.h
index a91932377..fd39ad0b7 100644
--- a/src/include/kerberosIV/kparse.h
+++ b/src/include/kerberosIV/kparse.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Include file for kparse routines.
  */
 
-#include <mit-copyright.h>
-
 #ifndef KPARSE_DEFS
 #define KPARSE_DEFS
 
diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 78e406ac0..06b84ba43 100644
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -3,22 +3,34 @@
  * $Author$
  * $Header$ 
  *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * Include file for the Kerberos library. 
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
+ * Include file for the Kerberos V4 library. 
  */
 
 /* Only one time, please */
 #ifndef	KRB_DEFS
 #define KRB_DEFS
 
-#include <mit-copyright.h>
-
 /* Need some defs from des.h	 */
-#include <des.h>
+#include <kerberosIV/des.h>
 
 /* Text describing error codes */
 #define		MAX_KRB_ERRORS	256
diff --git a/src/include/kerberosIV/krb4-proto.h b/src/include/kerberosIV/krb4-proto.h
index e73b5bf22..33e6b53ee 100644
--- a/src/include/kerberosIV/krb4-proto.h
+++ b/src/include/kerberosIV/krb4-proto.h
@@ -3,7 +3,7 @@
  * $Author$
  * $Id$
  *
- * Copyright 1991 by the Massachusetts Institute of Technology.
+ * Copyright 1991, 1994 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
  * Export of this software from the United States of America may
diff --git a/src/include/kerberosIV/krb_conf.h b/src/include/kerberosIV/krb_conf.h
index 85e956152..8e9e21d60 100644
--- a/src/include/kerberosIV/krb_conf.h
+++ b/src/include/kerberosIV/krb_conf.h
@@ -3,11 +3,25 @@
  * $Author$
  * $Header$ 
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * This file contains configuration information for the Kerberos library
  * which is machine specific; currently, this file contains
  * configuration information for the vax, the "ibm032" (RT), and the
@@ -22,8 +36,6 @@
 #ifndef KRB_CONF_DEFS
 #define KRB_CONF_DEFS
 
-#include <mit-copyright.h>
-
 /* Byte ordering */
 extern int krbONE;
 #define		HOST_BYTE_ORDER	(* (char *) &krbONE)
diff --git a/src/include/kerberosIV/krb_db.h b/src/include/kerberosIV/krb_db.h
index 3a3790624..6b49b10eb 100644
--- a/src/include/kerberosIV/krb_db.h
+++ b/src/include/kerberosIV/krb_db.h
@@ -3,11 +3,25 @@
  * $Author$
  * $Header$ 
  *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
+ * Copyright 1987, 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * spm		Project Athena  8/85 
  *
  * This file defines data structures for the kerberos
@@ -16,8 +30,6 @@
  * They MUST correspond to those defined in *.rel 
  */
 
-#include <mit-copyright.h>
-
 #ifndef KRB_DB_DEFS
 #define KRB_DB_DEFS
 
diff --git a/src/include/kerberosIV/lsb_addr_comp.h b/src/include/kerberosIV/lsb_addr_comp.h
index 80b9b36fb..82ad54d30 100644
--- a/src/include/kerberosIV/lsb_addr_comp.h
+++ b/src/include/kerberosIV/lsb_addr_comp.h
@@ -3,16 +3,29 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Comparison macros to emulate LSBFIRST comparison results of network
  * byte-order quantities
  */
 
-#include <mit-copyright.h>
 #ifndef LSB_ADDR_COMP_DEFS
 #define LSB_ADDR_COMP_DEFS
 
diff --git a/src/include/kerberosIV/osconf.h b/src/include/kerberosIV/osconf.h
index 9d6a9bb06..ab5667725 100644
--- a/src/include/kerberosIV/osconf.h
+++ b/src/include/kerberosIV/osconf.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Athena configuration.
  */
 
-#include <mit-copyright.h>
-
 #ifdef tahoe
 #include "conf-bsdtahoe.h"
 #else /* !tahoe */
diff --git a/src/include/kerberosIV/passwd_server.h b/src/include/kerberosIV/passwd_server.h
index 08bb2977e..74baafcac 100644
--- a/src/include/kerberosIV/passwd_server.h
+++ b/src/include/kerberosIV/passwd_server.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$ 
  *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
+ * Copyright 1987, 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Include file for password server
  */
 
-#include <mit-copyright.h>
-
 #ifndef PASSWD_SERVER_DEFS
 #define PASSWD_SERVER_DEFS
 
diff --git a/src/include/kerberosIV/principal.h b/src/include/kerberosIV/principal.h
index f1149426e..f0b254318 100644
--- a/src/include/kerberosIV/principal.h
+++ b/src/include/kerberosIV/principal.h
@@ -3,16 +3,28 @@
  * $Author$
  * $Header$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Definitions for principal names.
  */
 
-#include <mit-copyright.h>
-
 #ifndef PRINCIPAL_DEFS
 #define PRINCIPAL_DEFS
 
diff --git a/src/include/kerberosIV/prot.h b/src/include/kerberosIV/prot.h
index ff792715f..dbd80ff1a 100644
--- a/src/include/kerberosIV/prot.h
+++ b/src/include/kerberosIV/prot.h
@@ -4,18 +4,29 @@
  * $Author$
  * $Header$
  *
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Copyright 1985-1994 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
  * Include file with authentication protocol information.
  */
 
-#include <mit-copyright.h>
-
-#include <krb_conf.h>
+#include <kerberosIV/krb_conf.h>
 
 #ifndef PROT_DEFS
 #define PROT_DEFS