Corrected all copyright headers, and misc cleanups.

Signed-off-by: Bradley Smith <brad@brad-smith.co.uk>

34 files changed, 269 insertions, 255 deletions

diff --git a/Makefile.am b/Makefile.am
index 370477e..6c0ec25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## Makefile.am
 ##
@@ -14,10 +15,9 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 AUTOMAKE_OPTIONS     = 1.8.5
-SUBDIRS              = contrib doc getopt include lib maps scheme src
+SUBDIRS              = contrib doc include lib maps scheme src
 EXTRA_DIST           = build
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure
 
diff --git a/THANKS b/THANKS
index 3942c1f..faf3e05 100644
--- a/THANKS
+++ b/THANKS
@@ -1,9 +1,9 @@
 GNU Robots THANKS file
 
-GNU Robots was originally written by Jim Hall.
-Other people contributed by reporting problems,
-suggesting various improvements, or submitting
-actual code. Here is a list of those people.
+GNU Robots was originally written by Jim Hall, and is now maintained by
+Bradley Smith. Other people contributed by reporting problems, suggesting
+various improvements, or submitting actual code. Here is a list of those
+people.
 
 Daniel M. B. Fortes Manoel  <dmbfm2@uol.com.br>
 David Madore                <david.madore@ens.fr>
@@ -11,4 +11,3 @@ Pawel Turnau                <uzturnau@cyf-kr.edu.pl>
 Steinar Hamre               <steinarh@stud.fim.ntnu.no>
 Tim Northover               <tim@pnorthover.freeserve.co.uk>
 Zeeshan Ali Khattak         <zeenix@gmail.com>
-
diff --git a/TODO b/TODO
index 704142f..b28374b 100644
--- a/TODO
+++ b/TODO
@@ -7,6 +7,8 @@ _____________________________________________________________________
 THINGS TO DO:
 _____________________________________________________________________
 
+* src/sign.c needs to go.
+
 * Improve the graphics, to make everything look better.  I think I
   need a graphic designer to help me do this.  GTK+ would be nice.
 
diff --git a/config.h.in b/config.h.in
index 76779e6..cd1997e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,6 +3,9 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
diff --git a/configure.ac b/configure.ac
index ba6c54e..a4714e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +1,21 @@
-dnl
-dnl configure.ac for GNU Robots
-dnl Copyright (C) 1998 Jim Hall <jhall1@isd.net>
-dnl Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
-dnl
-dnl GNU Robots is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl GNU Robots is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Robots; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-dnl
+## Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+##
+## configure.ac for GNU Robots
+##
+## GNU Robots 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.
+##
+## GNU Robots 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 GNU Robots; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT([GNU Robots], [1.0.90], [brad@brad-smith.co.uk], [gnurobots])
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e2e5a02..3878804 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## contrib/Makefile.am
 ##
@@ -14,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 EXTRA_DIST =\
  mapedit.c
diff --git a/contrib/mapedit.c b/contrib/mapedit.c
index fc16bda..1700046 100644
--- a/contrib/mapedit.c
+++ b/contrib/mapedit.c
@@ -1,23 +1,22 @@
-/* Map editor for GNU robots game */
-
-/* Copyright (C) 2000 Tim Northover, tim@pnorthover.freeserve.co.uk 
-   using xpms from Tim Whittock*/
-
-/*
-  This program 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.
-
-  This program 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 this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/* Copyright (C) 2000 Tim Northover <tim@pnorthover.freeserve.co.uk>
+ * using xpms from Tim Whittock
+ *
+ * Map editor for GNU robots game
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 /* compile with:
    gcc mapedit.c -omapedit -I../lib `gtk-config --cflags --libs` */
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8983896..39e81dd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## doc/Makefile.am
 ##
@@ -14,10 +15,8 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 EXTRA_DIST =\
  contrib\
- guile-proj.scm\
  Robots-HOWTO
 
diff --git a/doc/contrib b/doc/contrib
index c4c6d74..dfec041 100644
--- a/doc/contrib
+++ b/doc/contrib
@@ -1,6 +1,9 @@
 CONTRIBUTORS TO GNU ROBOTS:
 _____________________________________________________________________
 
+* Bradley Smith <brad@brad-smith.co.uk>
+  Current author
+
 * Jim Hall, <jhall1@isd.net>
   author
 
diff --git a/doc/guile-proj.scm b/doc/guile-proj.scm
deleted file mode 100644
index b07020c..0000000
--- a/doc/guile-proj.scm
+++ /dev/null
@@ -1,44 +0,0 @@
-;;;How To Submit A Project
-;;;
-;;;The first thing to do is look at the Guile Project Mail Submission
-;;;doc. This will tell you all you need to know about describing your
-;;;project. Then, send a mail to me (Greg.Harvey@thezone.net) with the
-;;;subject "Guile Project Submission". Optionally, you can send it to
-;;;(Greg.Harvey+guile-project@thezone.net).  Please do one or the
-;;;other, or else there's a good chance it'll end up in the spam
-;;;box. The body should contain your submission(s).
-;;;
-;;;How To Update A Project
-;;;
-;;;It's the exact same thing as making the initial submission, but you
-;;;don't have to include every field, just whatever you want
-;;;updated. So, say if you want to add a license field to your
-;;;existing entry, you'd just have ((name "foo") (license "bar")) as a
-;;;submission.
-
-((name "robots")
-
- (category "Games")
- (keywords "Game " "robots " "diversion")
- 
- (description "A game/diversion where you construct a robot (using Scheme) "
-              "then set him loose and watch him explore a world on his own."
-	      "The GNU Robot program is written in Scheme, and implemented "
-	      "using GNU Guile.")
-
- (location (url "http://www.gnu.org/software/robots/" "GNU Robots homepage"))
-
- (authors "Jim Hall")
- (maintainer (email "Jim Hall" "jhall1@isd.net"))
-
- (status "GNU Robots has finally been released as version 1.0!!")
-
- (help-wanted "GNU Robots could really use a port to GTK+, for GNOME. "
-	      "Also, it would be great if someone wrote a GNU Robots  "
-	      "code generator, that generated a robot Scheme program  "
-	      "based on the user contructing a robot program using    "
-	      "little icons that are dropped into place and ordered   "
-	      "using special connector wires.  This would be a good   "
-	      "senior project for a computer science student!")
-
- (license "GPL"))
diff --git a/include/Makefile.am b/include/Makefile.am
index bdd9f2d..5f57db1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## include/Makefile.am
 ##
@@ -14,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 EXTRA_DIST =\
  api.h\
diff --git a/include/api.h b/include/api.h
index e04f27b..7ca15ad 100644
--- a/include/api.h
+++ b/include/api.h
@@ -1,22 +1,22 @@
-/* Robot API for the GNU Robots game */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-  This program 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.
-
-  This program 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 this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * Robot API for the GNU Robots game
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef _API_H
 #define _API_H
diff --git a/include/configs.h b/include/configs.h
index 622548b..58330cd 100644
--- a/include/configs.h
+++ b/include/configs.h
@@ -1,3 +1,22 @@
+/* Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots Game.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef CONFIGS_H
 #define CONFIGS_H
 
diff --git a/include/grobot.h b/include/grobot.h
index 1ef0031..5495e0c 100644
--- a/include/grobot.h
+++ b/include/grobot.h
@@ -1,3 +1,22 @@
+/* Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * Robot object for GNU Robots Game.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _G_ROBOT_H
 #define _G_ROBOT_H
 /* MACROS */
diff --git a/include/main.h b/include/main.h
index d09ac65..4cbca0f 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,4 +1,21 @@
-/* Functions */
+/* Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots Game.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include <glib.h>
 #include <grobot.h>
diff --git a/include/map.h b/include/map.h
index 1526dd7..f8f8263 100644
--- a/include/map.h
+++ b/include/map.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007  Bradley Smith <brad@brad-smith.co.uk>
+/* Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
  * This file is part of GNU Robots.
  *
diff --git a/include/sign.h b/include/sign.h
index f98c6c1..05fe87d 100644
--- a/include/sign.h
+++ b/include/sign.h
@@ -1,3 +1,5 @@
+/* This needs to go. */
+
 #include <glib.h>
 
 gint sign (gint n);
diff --git a/include/userinterface.h b/include/userinterface.h
index ba5ade9..691e847 100644
--- a/include/userinterface.h
+++ b/include/userinterface.h
@@ -1,23 +1,21 @@
-/* $Id: userinterface.h,v 1.7 2005/09/06 19:55:40 zeenix Exp $ */
-
-/* GNU Robots game engine. This is the header file for user_interface module */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine. This is the header file for user_interface module
+ *
+ * GNU Robots 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __USER_INTERFACE_H__
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0386a82..0712921 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## lib/Makefile.am
 ##
@@ -14,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 SUBDIRS = xpm
 
diff --git a/lib/cursesplugin.c b/lib/cursesplugin.c
index 06b1cba..3fb6e47 100644
--- a/lib/cursesplugin.c
+++ b/lib/cursesplugin.c
@@ -1,23 +1,21 @@
-/* $Id: cursesplugin.c,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-
-/* GNU Robots game engine. */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <glib.h>
diff --git a/lib/cursesplugin.h b/lib/cursesplugin.h
index 7f72d0e..3f6beba 100644
--- a/lib/cursesplugin.h
+++ b/lib/cursesplugin.h
@@ -1,23 +1,21 @@
-/* $Id: cursesplugin.h,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-
-/* GNU Robots game engine. */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __CURSES_PLUGIN_H__
diff --git a/lib/textplugin.c b/lib/textplugin.c
index 0c3059c..75a6800 100644
--- a/lib/textplugin.c
+++ b/lib/textplugin.c
@@ -1,23 +1,21 @@
-/* $Id: textplugin.c,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-
-/* GNU Robots game engine. */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <glib.h>
diff --git a/lib/textplugin.h b/lib/textplugin.h
index fd9eb7b..f720b2a 100644
--- a/lib/textplugin.h
+++ b/lib/textplugin.h
@@ -1,23 +1,21 @@
-/* $Id: textplugin.h,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-
-/* GNU Robots game engine. */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __TEXT_PLUGIN_H__
diff --git a/lib/x11plugin.c b/lib/x11plugin.c
index 9145784..f259606 100644
--- a/lib/x11plugin.c
+++ b/lib/x11plugin.c
@@ -1,16 +1,14 @@
-/* $Id: x11plugin.c,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-/*
- * GNU Robots game engine.
- *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
  * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
- * This program is free software; you can redistribute it and/or modify
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
  *
- * This program is distributed in the hope that it will be useful,
+ * GNU Robots 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.
diff --git a/lib/x11plugin.h b/lib/x11plugin.h
index 4419bdc..8c9b01e 100644
--- a/lib/x11plugin.h
+++ b/lib/x11plugin.h
@@ -1,15 +1,14 @@
-/* $Id: x11plugin.h,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-/* GNU Robots game engine.
- *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
  * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
- * This program is free software; you can redistribute it and/or modify
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
  *
- * This program is distributed in the hope that it will be useful,
+ * GNU Robots 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.
diff --git a/lib/xpm/Makefile.am b/lib/xpm/Makefile.am
index 60cb556..069cada 100644
--- a/lib/xpm/Makefile.am
+++ b/lib/xpm/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## xpm/Makefile.am
 ##
@@ -14,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 EXTRA_DIST =\
  baddie.xpm\
diff --git a/maps/Makefile.am b/maps/Makefile.am
index 79c4634..877c935 100644
--- a/maps/Makefile.am
+++ b/maps/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## maps/Makefile.am
 ##
@@ -14,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 mapsdir = $(pkgdatadir)/maps
 
diff --git a/scheme/Makefile.am b/scheme/Makefile.am
index 1a379e9..67def40 100644
--- a/scheme/Makefile.am
+++ b/scheme/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## scheme/Makefile.am
 ##
@@ -14,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 schemedir = $(pkgdatadir)/scheme
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 36751cc..eb3496b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,21 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+##
+## src/Makefile.am
+##
+## GNU Robots 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.
+##
+## GNU Robots 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 GNU Robots; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 bin_PROGRAMS = gnurobots
 
 INCLUDES = $(GLIB2_CFLAGS) $(GUILE_CFLAGS) -I$(top_builddir)/include \
diff --git a/src/api.c b/src/api.c
index c0cee3e..a34c065 100644
--- a/src/api.c
+++ b/src/api.c
@@ -1,10 +1,8 @@
-/* $Id: api.c,v 1.16 2005/09/06 19:55:40 zeenix Exp $ */
-/*
- * Robot API for the GNU Robots game
- *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
  * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
+ * Robot API for the GNU Robots game
+ *
  * GNU Robots 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
diff --git a/src/grobot.c b/src/grobot.c
index f54224d..6f99335 100644
--- a/src/grobot.c
+++ b/src/grobot.c
@@ -1,9 +1,8 @@
-/*
- * Robot object for the GNU Robots game
- *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
  * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
+ * Robot object for the GNU Robots game
+ *
  * GNU Robots 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
diff --git a/src/main.c b/src/main.c
index fc0d6b6..ed5378a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,11 +1,9 @@
-/* $Id: main.c,v 1.28 2005/09/06 19:55:40 zeenix Exp $ */
-/*
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
  * GNU Robots game engine. This is the main() program, using GNU
  * Guile as the backend to handle the language.
  *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
- * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
- *
  * GNU Robots 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
diff --git a/src/map.c b/src/map.c
index 16acc93..85019f2 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,9 +1,8 @@
-/*
- * GNU Robots.
- *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
  * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
+ * GNU Robots Map object.
+ *
  * GNU Robots 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
diff --git a/src/userinterface.c b/src/userinterface.c
index 8562454..e973460 100644
--- a/src/userinterface.c
+++ b/src/userinterface.c
@@ -1,10 +1,8 @@
-/* $Id: userinterface.c,v 1.7 2004/10/21 19:24:30 zeenix Exp $ */
-/*
- * GNU Robots game engine.  This is the User Interface module
- *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
  * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
+ * GNU Robots game engine.  This is the User Interface module
+ *
  * GNU Robots 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