diff --git a/src/common/arg_desc.c b/src/common/arg_desc.c
index 16dea709db5f6634ede183de1ceb6153dd6ddf18..888c41c895fb730851fb28642d88fa91e0f9e4ec 100644
--- a/src/common/arg_desc.c
+++ b/src/common/arg_desc.c
@@ -1,3 +1,27 @@
+/****************************************************************************\
+ *  arg_desc.c
+ *****************************************************************************
+ *  Copyright (C) 2005 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  UCRL-CODE-2002-040.
+ *
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\****************************************************************************/
 #include <string.h>
 #include "src/common/arg_desc.h"
 #include "src/common/macros.h"
diff --git a/src/common/arg_desc.h b/src/common/arg_desc.h
index 1de433503a8db131fd0335005e4728a482d9dde5..b5fcd9858fb6626cf65d5453768a1e28d91ae144 100644
--- a/src/common/arg_desc.h
+++ b/src/common/arg_desc.h
@@ -1,3 +1,27 @@
+/****************************************************************************\
+ *  arg_desc.h
+ *****************************************************************************
+ *  Copyright (C) 2005 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  UCRL-CODE-2002-040.
+ *
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\****************************************************************************/
 #ifndef __ARG_DESC_H__
 #define __ARG_DESC_H__
 
diff --git a/src/common/dist_tasks.c b/src/common/dist_tasks.c
index d84e8c01dae7a4c4340a034f904540846e90cfcc..eb129d7ef53bccd58119eb196792c895b3958297 100644
--- a/src/common/dist_tasks.c
+++ b/src/common/dist_tasks.c
@@ -6,6 +6,7 @@
  *  Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
  *  Written by Chris Holmes, <cholmes@hp.com>, who borrowed heavily
  *  from other parts of SLURM.
+ *  UCRL-CODE-2002-040.
  *  
  *  This file is part of SLURM, a resource management program.
  *  For details, see <http://www.llnl.gov/linux/slurm/>.
diff --git a/src/common/dist_tasks.h b/src/common/dist_tasks.h
index 8089eb067c59f5e3f9127ac9a5b0156026fd324f..ba9583544dbab11d5783816743875ae086fad23d 100644
--- a/src/common/dist_tasks.h
+++ b/src/common/dist_tasks.h
@@ -6,6 +6,7 @@
  *  Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
  *  Written by Chris Holmes, <cholmes@hp.com>, who borrowed heavily
  *  from other parts of SLURM.
+ *  UCRL-CODE-2002-040.
  *  
  *  This file is part of SLURM, a resource management program.
  *  For details, see <http://www.llnl.gov/linux/slurm/>.
diff --git a/src/common/net.h b/src/common/net.h
index 9f023b3868de4b3170473f43e2b996cbcd914aca..00a9c3fde2e7d57e9b67ec94fd5c5d9a85c59d83 100644
--- a/src/common/net.h
+++ b/src/common/net.h
@@ -1,3 +1,29 @@
+/*****************************************************************************\
+ *  net.h - basic network communications for user application I/O
+ *****************************************************************************
+ *  Copyright (C) 2002 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Mark Grondona <grondona1@llnl.gov>, Kevin Tew <tew1@llnl.gov>,
+ *  et. al.
+ *  UCRL-CODE-2002-040.
+ *
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
 
 #ifndef _NET_H
 #define _NET_H
diff --git a/src/common/safeopen.c b/src/common/safeopen.c
index 5221b66ce7ee6192366802e463653950e7c14b7a..5354824ed9d536a288cd835c58c9d9cd7ae90afe 100644
--- a/src/common/safeopen.c
+++ b/src/common/safeopen.c
@@ -1,7 +1,28 @@
-/* $Id$ */
-
-/* safer interface to open()
- */
+/*****************************************************************************\
+ *  safeopen.c - safer interface to open()
+ *  $Id$
+ *****************************************************************************
+ *  Copyright (C) 2002 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  UCRL-CODE-2002-040.
+ *
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
 
 
 #if HAVE_CONFIG_H
diff --git a/src/common/safeopen.h b/src/common/safeopen.h
index f5815218ed124612294810105d03200bfacd933b..39dfc43913554f875952376884a1014ab128b7cd 100644
--- a/src/common/safeopen.h
+++ b/src/common/safeopen.h
@@ -1,8 +1,28 @@
-/* $Id$ */
-
-/* safer interface to open():
+/*****************************************************************************\
+ *  safeopen.h - safer interface to open()
+ *  $Id$
+ *****************************************************************************
+ *  Copyright (C) 2002 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  UCRL-CODE-2002-040.
  *
- */
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
 
 #ifndef _SAFEOPEN_H
 #define _SAFEOPEN_H
diff --git a/src/common/unsetenv.h b/src/common/unsetenv.h
index f664206605957e353680881ad052a533e11f8ae4..39039e0b50cf821326d4ebb4e0c972b8a3c42a59 100644
--- a/src/common/unsetenv.h
+++ b/src/common/unsetenv.h
@@ -1,3 +1,29 @@
+/*****************************************************************************\
+ *  src/common/unsetenv.h - Kludge for unsetenv on AIX
+ *****************************************************************************
+ *  Copyright (C) 2004 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Morris Jette <jette1@llnl.gov>.
+ *  UCRL-CODE-2002-040.
+ *
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
+
 #ifndef _UNSETENV_H
 #define _UNSETENV_H
 
diff --git a/src/common/xassert.c b/src/common/xassert.c
index 9211dd14a0679278cc48e2ad4aacdd2d93af5639..9cf93eb080210c6b846ec9622e26c2a1d6baaa80 100644
--- a/src/common/xassert.c
+++ b/src/common/xassert.c
@@ -1,9 +1,30 @@
-/* $Id$ */
-
-/* 
-** xassert: replacement for assert which sends error to log instead of stderr
-**
-*/
+/*****************************************************************************\
+ *  xassert.c - replacement for assert which sends error to log instead 
+ *		of stderr
+ *  $Id$
+ *****************************************************************************
+ *  Copyright (C) 2004 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Moe Jette <jette@llnl.gov>.
+ *  UCRL-CODE-2002-040.
+ *
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
 
 #if HAVE_CONFIG_H
 #  include "config.h"
diff --git a/src/common/xassert.h b/src/common/xassert.h
index 22c61399083cf5c5e4206ad132d2f523636697af..1fb7213ea87d64c24651397c6523ac588dabc53a 100644
--- a/src/common/xassert.h
+++ b/src/common/xassert.h
@@ -1,10 +1,31 @@
-/* $Id$ */
-
-/*
- * xassert: assert type macro with configurable handling
- *          If NDEBUG is defined, do nothing.
- *          If not, and expression is zero, log an error message and abort.
- */
+/*****************************************************************************\
+ *  xassert.h: assert type macro with configurable handling
+ *             If NDEBUG is defined, do nothing.
+ *             If not, and expression is zero, log an error message and abort.
+ *  $Id$
+ *****************************************************************************
+ *  Copyright (C) 2004 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Moe Jette <jette@llnl.gov>.
+ *  UCRL-CODE-2002-040.
+ *
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
 
 #ifndef _XASSERT_H
 #define _XASSERT_H	1
diff --git a/src/plugins/jobacct/log/jobacct_log.c b/src/plugins/jobacct/log/jobacct_log.c
index 317b3a85d8e9120a6d32f6c74a497a4fd7d88b24..b279b9e62ba4fc304d0fec4d31199731fc186a04 100644
--- a/src/plugins/jobacct/log/jobacct_log.c
+++ b/src/plugins/jobacct/log/jobacct_log.c
@@ -5,6 +5,7 @@
  *  Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
  *  Written by Andy Riebs, <andy.riebs@hp.com>, who borrowed heavily
  *  from other parts of SLURM.
+ *  UCRL-CODE-2002-040.
  *  
  *  This file is part of SLURM, a resource management program.
  *  For details, see <http://www.llnl.gov/linux/slurm/>.
diff --git a/src/plugins/jobacct/none/jobacct_none.c b/src/plugins/jobacct/none/jobacct_none.c
index df52725a78a29691503229bb15851af2952f3f4c..382d4d4499cfdac501dc566d202820d11d9d1f15 100644
--- a/src/plugins/jobacct/none/jobacct_none.c
+++ b/src/plugins/jobacct/none/jobacct_none.c
@@ -5,6 +5,7 @@
  *
  *  Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
  *  Written by Andy Riebs, <andy.riebs@hp.com>.
+ *  UCRL-CODE-2002-040.
  *  
  *  This file is part of SLURM, a resource management program.
  *  For details, see <http://www.llnl.gov/linux/slurm/>.
diff --git a/src/plugins/jobcomp/script/job_record.c b/src/plugins/jobcomp/script/job_record.c
index 4b45acde80612bf9dd23cdb0a807da19071b9d07..3794ef23eee511a9fcfd3e3fb0cf10fd3f6f7443 100644
--- a/src/plugins/jobcomp/script/job_record.c
+++ b/src/plugins/jobcomp/script/job_record.c
@@ -4,6 +4,7 @@
  *  Produced at Center for High Performance Computing, North Dakota State
  *  University
  *  Written by Nathan Huff <nhuff@acm.org>
+ *  UCRL-CODE-2002-040.
  *
  *  This file is part of SLURM, a resource management program.
  *  For details, see <http://www.llnl.gov/linux/slurm/>.
diff --git a/src/plugins/mpi/mpichgm/mpi_mpichgm.c b/src/plugins/mpi/mpichgm/mpi_mpichgm.c
index 9a20e1db3125d90d96c046ff99ffef438b3a6262..08a4dd4279b33467b1c0a1cf8a6dfe1fea2786e4 100644
--- a/src/plugins/mpi/mpichgm/mpi_mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpi_mpichgm.c
@@ -1,5 +1,5 @@
 /*****************************************************************************\
- **  mpi_gmpi.c - Library routines for initiating jobs on with gmpi type mpi 
+ **  mpi_mpichgm.c - Library routines for initiating jobs on with gmpi type mpi 
  **  $Id$
  *****************************************************************************
  *  Copyright (C) 2004 The Regents of the University of California.
diff --git a/src/srun/fname.c b/src/srun/fname.c
index ac02edf804a2d581f4e70d318f97d3e6201cb6c5..2ebc5b734f6117e3f199bb7bb4a25a23f02455d3 100644
--- a/src/srun/fname.c
+++ b/src/srun/fname.c
@@ -1,3 +1,28 @@
+/*****************************************************************************\
+ *  src/srun/fname.h - IO filename type implementation (srun specific)
+ *****************************************************************************
+ *  Copyright (C) 2002 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Mark Grondona <mgrondona@llnl.gov>.
+ *  UCRL-CODE-2002-040.
+ *
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
 
 #include <stdio.h>
 #include <stdarg.h>