28 files changed, 132 insertions, 153 deletions
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index 51e0b2e32..f31788b22 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 set(io_SRC
   bufferstream.cpp
diff --git a/src/io/Makefile.tst b/src/io/Makefile.tst
index 1d6789fd2..2e3142d42 100644
--- a/src/io/Makefile.tst
+++ b/src/io/Makefile.tst
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 ##############################################
 #
 # Test makefile for InkscapeStreams
diff --git a/src/io/bufferstream.cpp b/src/io/bufferstream.cpp
index 235c0de77..1723ee1ff 100644
--- a/src/io/bufferstream.cpp
+++ b/src/io/bufferstream.cpp
@@ -1,4 +1,6 @@
-/*
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -6,25 +8,13 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ *//*
  * Authors:
+ * see git history
  *   Bob Jamison
  *
- * Copyright (C) 2006 Bob Jamison
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library 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
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (C) 2018 Authors
+ * Released under GNU LGPL v2.1+, read the file 'COPYING' for more information.
  */
 
 /**
diff --git a/src/io/bufferstream.h b/src/io/bufferstream.h
index 81b278a51..811ab0d57 100644
--- a/src/io/bufferstream.h
+++ b/src/io/bufferstream.h
@@ -1,5 +1,4 @@
-#ifndef SEEN_BUFFERSTREAM_H
-#define SEEN_BUFFERSTREAM_H
+// SPDX-License-Identifier: LGPL-2.1-or-later
 /**
  * @file
  * Phoebe DOM Implementation.
@@ -9,27 +8,17 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- */
-/*
+ *//*
  * Authors:
+ * see git history
  *   Bob Jamison
  *
- * Copyright (C) 2006 Bob Jamison
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library 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
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (C) 2018 Authors
+ * Released under GNU LGPL v2.1+, read the file 'COPYING' for more information.
  */
+#ifndef SEEN_BUFFERSTREAM_H
+#define SEEN_BUFFERSTREAM_H
+
 
 #include <vector>
 #include "inkscapestream.h"
diff --git a/src/io/dir-util.cpp b/src/io/dir-util.cpp
index 44c9a58d8..69a01f1fb 100644
--- a/src/io/dir-util.cpp
+++ b/src/io/dir-util.cpp
@@ -1,3 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * TODO: insert short description here
+ *//*
+ * Authors: see git history
+ *
+ * Copyright (C) 2018 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
 /**
  * @file
  * Utility functions for filenames.
diff --git a/src/io/dir-util.h b/src/io/dir-util.h
index 327e1ad5f..91f07c882 100644
--- a/src/io/dir-util.h
+++ b/src/io/dir-util.h
@@ -1,3 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * TODO: insert short description here
+ *//*
+ * Authors: see git history
+ *
+ * Copyright (C) 2016 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
 #ifndef SEEN_DIR_UTIL_H
 #define SEEN_DIR_UTIL_H
 
diff --git a/src/io/doc2html.xsl b/src/io/doc2html.xsl
index f8734a1c2..9a98c23f2 100644
--- a/src/io/doc2html.xsl
+++ b/src/io/doc2html.xsl
@@ -1,4 +1,5 @@
 <?xml version='1.0'?>
+<!-- SPDX-License-Identifier: GPL-2.0-or-later -->
 <xsl:stylesheet
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 <xsl:output method="html"/>
diff --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp
index 82e20a08f..03960b004 100644
--- a/src/io/gzipstream.cpp
+++ b/src/io/gzipstream.cpp
@@ -1,29 +1,19 @@
-/*
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/** @file
  * Zlib-enabled input and output streams
+ *//*
+ * Authors:
+ * see git history
+ * Bob Jamison <rjamison@titan.com>
+ * 
  *
+ * Copyright (C) 2018 Authors
+ * Released under GNU LGPL v2.1+, read the file 'COPYING' for more information.
+ */
+/*
  * This is a thin wrapper of libz calls, in order
  * to provide a simple interface to our developers
  * for gzip input and output.
- *
- * Authors:
- *   Bob Jamison <rjamison@titan.com>
- *
- * Copyright (C) 2004
- *
-
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library 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
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "gzipstream.h"
diff --git a/src/io/gzipstream.h b/src/io/gzipstream.h
index 26eee2af4..fc80f974c 100644
--- a/src/io/gzipstream.h
+++ b/src/io/gzipstream.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef SEEN_INKSCAPE_IO_GZIPSTREAM_H
 #define SEEN_INKSCAPE_IO_GZIPSTREAM_H
 /**
@@ -14,7 +15,7 @@
  *
  * Copyright (C) 2004 Inkscape.org
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #include <vector>
diff --git a/src/io/http.cpp b/src/io/http.cpp
index 164c96783..6fdb24c05 100644
--- a/src/io/http.cpp
+++ b/src/io/http.cpp
@@ -1,18 +1,11 @@
-/*
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
  * Inkscape::IO::HTTP - make internet requests using libsoup
+ *//*
+ * Authors: see git history
  *
- * Authors:
- *   Martin Owens <doctormo@gmail.com>
- *
- * Copyright (C) 2017 Authors
- *
- * 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.
- *
- * See the file COPYING for details.
- *
+ * Copyright (C) 2018 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 /*
diff --git a/src/io/http.h b/src/io/http.h
index 70676e156..398d699b1 100644
--- a/src/io/http.h
+++ b/src/io/http.h
@@ -1,16 +1,11 @@
-/*
- * Authors:
- *   Martin Owens <doctormo@gmail.com>
- *
- * Copyright (C) 2017 Authors
- *
- * 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.
- *
- * See the file COPYING for details.
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Inkscape::IO::HTTP - make internet requests using libsoup
+ *//*
+ * Authors: see git history
  *
+ * Copyright (C) 2018 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #ifndef SEEN_INKSCAPE_IO_HTTP_H
diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp
index 63cea38ab..56ef7854e 100644
--- a/src/io/inkscapestream.cpp
+++ b/src/io/inkscapestream.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Our base input/output stream classes.  These are is directly
  * inherited from iostreams, and includes any extra
@@ -8,7 +9,7 @@
  *
  * Copyright (C) 2004 Inkscape.org
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #include <cstdlib>
diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h
index b2e836267..68c28baa1 100644
--- a/src/io/inkscapestream.h
+++ b/src/io/inkscapestream.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef SEEN_INKSCAPE_IO_INKSCAPESTREAM_H
 #define SEEN_INKSCAPE_IO_INKSCAPESTREAM_H
 /*
@@ -6,7 +7,7 @@
  *
  * Copyright (C) 2004 Inkscape.org
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #include <cstdio>
diff --git a/src/io/registrytool.cpp b/src/io/registrytool.cpp
index 89442bc36..169e49721 100644
--- a/src/io/registrytool.cpp
+++ b/src/io/registrytool.cpp
@@ -1,24 +1,13 @@
-/*
- * Inkscape Registry Tool
- *
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** \file
+ * Inkscape registry tool
+ *//*
  * Authors:
+ *   see git history
  *   Bob Jamison
- *
- * Copyright (C) 2005-2008 Bob Jamison
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library 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
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (C) 2005-2018 Authors
+ * 
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #include "registrytool.h"
diff --git a/src/io/registrytool.h b/src/io/registrytool.h
index 335a8bd52..3bb7d101a 100644
--- a/src/io/registrytool.h
+++ b/src/io/registrytool.h
@@ -1,26 +1,18 @@
-#ifndef SEEN_REGISTRYTOOL_H
-#define SEEN_REGISTRYTOOL_H
-/*
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** \file
+ * Inkscape registry tool
+ *//*
  * Authors:
+ *   see git history
  *   Bob Jamison
- *
- * Copyright (C) 2005 Bob Jamison
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library 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
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (C) 2005-2018 Authors
+ * 
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#ifndef SEEN_REGISTRYTOOL_H
+#define SEEN_REGISTRYTOOL_H
+
 namespace Glib {
     class ustring;
 }
diff --git a/src/io/resource-manager.cpp b/src/io/resource-manager.cpp
index 6a455a8cc..ada60390e 100644
--- a/src/io/resource-manager.cpp
+++ b/src/io/resource-manager.cpp
@@ -1,9 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Inkscape::ResourceManager - tracks external resources such as image and css files.
  *
  * Copyright 2011  Jon A. Cruz  <jon@joncruz.org>
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #include <string>
diff --git a/src/io/resource-manager.h b/src/io/resource-manager.h
index b4d88c7e6..48f0687b2 100644
--- a/src/io/resource-manager.h
+++ b/src/io/resource-manager.h
@@ -1,9 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Inkscape::ResourceManager - Manages external resources such as image and css files.
  *
  * Copyright 2011  Jon A. Cruz  <jon@joncruz.org>
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #ifndef SEEN_INKSCAPE_RESOURCE_MANAGER_H
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index a373a658f..7ca9e79c3 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -1,19 +1,13 @@
-/*
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
  * Inkscape::IO::Resource - simple resource API
- *
+ *//*
  * Authors:
  *   MenTaLguY <mental@rydia.net>
  *   Martin Owens <doctormo@gmail.com>
  *
- * Copyright (C) 2006-2017 Authors
- *
- * 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.
- *
- * See the file COPYING for details.
- *
+ * Copyright (C) 2018 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/io/resource.h b/src/io/resource.h
index 7a11fd8fa..1b409b6ec 100644
--- a/src/io/resource.h
+++ b/src/io/resource.h
@@ -1,17 +1,13 @@
-/*
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * TODO: insert short description here
+ *//*
  * Authors:
  *   MenTaLguY <mental@rydia.net>
  *   Martin Owens <doctormo@gmail.com>
  *
- * Copyright (C) 2006-2017 Authors
- *
- * 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.
- *
- * See the file COPYING for details.
- *
+ * Copyright (C) 2018 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #ifndef SEEN_INKSCAPE_IO_RESOURCE_H
diff --git a/src/io/streamtest.cpp b/src/io/streamtest.cpp
index ec59ac4a6..5d270580b 100644
--- a/src/io/streamtest.cpp
+++ b/src/io/streamtest.cpp
@@ -1,3 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * TODO: insert short description here
+ *//*
+ * Authors: see git history
+ *
+ * Copyright (C) 2015 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
 
 
 #include <stdio.h>
diff --git a/src/io/stringstream.cpp b/src/io/stringstream.cpp
index 360cc7fc9..0259869f7 100644
--- a/src/io/stringstream.cpp
+++ b/src/io/stringstream.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Our base String stream classes.  We implement these to
  * be based on Glib::ustring
@@ -7,7 +8,7 @@
  *
  * Copyright (C) 2004 Inkscape.org
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 
diff --git a/src/io/stringstream.h b/src/io/stringstream.h
index 215e9b6a0..3afb9a870 100644
--- a/src/io/stringstream.h
+++ b/src/io/stringstream.h
@@ -1,3 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * TODO: insert short description here
+ *//*
+ * Authors: see git history
+ *
+ * Copyright (C) 2018 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
 #ifndef __INKSCAPE_IO_STRINGSTREAM_H__
 #define __INKSCAPE_IO_STRINGSTREAM_H__
 
diff --git a/src/io/sys.cpp b/src/io/sys.cpp
index 47b6d4e78..ee1956fc5 100644
--- a/src/io/sys.cpp
+++ b/src/io/sys.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * System abstraction utility routines
@@ -7,7 +8,7 @@
  *
  * Copyright (C) 2004-2005 Authors
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 
diff --git a/src/io/sys.h b/src/io/sys.h
index 39ba399f5..f159ac66b 100644
--- a/src/io/sys.h
+++ b/src/io/sys.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef SEEN_SYS_H
 #define SEEN_SYS_H
 
@@ -9,7 +10,7 @@
  *
  * Copyright (C) 2004-2005 Authors
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 #include <cstdio>
diff --git a/src/io/uristream.cpp b/src/io/uristream.cpp
index dc797472d..2ff7460e0 100644
--- a/src/io/uristream.cpp
+++ b/src/io/uristream.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Our base String stream classes.  We implement these to
  * be based on Glib::ustring
@@ -7,7 +8,7 @@
  *
  * Copyright (C) 2004 Inkscape.org
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 
diff --git a/src/io/uristream.h b/src/io/uristream.h
index bcd599012..f0544d876 100644
--- a/src/io/uristream.h
+++ b/src/io/uristream.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef SEEN_INKSCAPE_IO_URISTREAM_H
 #define SEEN_INKSCAPE_IO_URISTREAM_H
 /**
@@ -11,7 +12,7 @@
  *
  * Copyright (C) 2004 Inkscape.org
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 
diff --git a/src/io/xsltstream.cpp b/src/io/xsltstream.cpp
index 916cb0ed0..882db30b2 100644
--- a/src/io/xsltstream.cpp
+++ b/src/io/xsltstream.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * XSL Transforming input and output classes
  *
@@ -6,7 +7,7 @@
  *
  * Copyright (C) 2004-2008 Inkscape.org
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
 
diff --git a/src/io/xsltstream.h b/src/io/xsltstream.h
index 7ee3f9a9d..7410ddcee 100644
--- a/src/io/xsltstream.h
+++ b/src/io/xsltstream.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef SEEN_INKSCAPE_IO_XSLTSTREAM_H
 #define SEEN_INKSCAPE_IO_XSLTSTREAM_H
 /**
@@ -10,7 +11,7 @@
  *
  * Copyright (C) 2004-2008 Inkscape.org
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */