diff --git a/COPYING.LESSER b/COPYING.LESSER
new file mode 100644
index 0000000000000000000000000000000000000000..341c30bda4457610db4829294e5d7e526d4c835b
--- /dev/null
+++ b/COPYING.LESSER
@@ -0,0 +1,166 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
diff --git a/LICENSE.CORPUS2 b/LICENSE.CORPUS2
new file mode 100644
index 0000000000000000000000000000000000000000..0d38d8e4f5ed87170acc8e6fa07a5cb04b938c47
--- /dev/null
+++ b/LICENSE.CORPUS2
@@ -0,0 +1,27 @@
+Corpus2 includes libpwrutils, libcorpus2, libcorpus2_whole and optionally poliqarp library
+which makes Corpus2 have dual licensing - GNU LGPL or GNU GPL.
+
+Corpus2 WITHOUT poliqarp library is released under GNU LGPL:
+
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+
+    This program 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 3 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 Lesser General Public License for
+more details.
+
+    You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, see <http://www.gnu.org/licenses>.
+
+    Additional permission under GNU GPL version 3 section 7
+
+    If you modify this Program, or any covered work, by linking or combining
+it with Morfeusz (or a modified version of that library),
+containing parts covered by the terms of the Morfeusz license, the
+licensors of this Program grant you additional permission to convey the
+resulting work. 
diff --git a/LICENSE b/LICENSE.POLIQARP
similarity index 82%
rename from LICENSE
rename to LICENSE.POLIQARP
index 596d24b785c82395238612d8c64cd3a20d8d442c..2baf50b3e719b518b5dab92f52f62aacd3fd5524 100644
--- a/LICENSE
+++ b/LICENSE.POLIQARP
@@ -1,3 +1,8 @@
+Corpus2 includes libpwrutils, libcorpus2, libcorpus2_whole and optionally poliqarp library
+which makes Corpus2 have dual licensing - GNU LGPL or GNU GPL.
+
+Corpus2 WITH poliqarp library is released under GNU GPL:
+
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/LICENSE.in b/LICENSE.in
index ae2735182a96111fad99d5f11c166c8ef92385c7..be7e6125b50ca8280e45e3acfe91f645ca66424d 100644
--- a/LICENSE.in
+++ b/LICENSE.in
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
diff --git a/libcorpus2/ann/annotatedsentence.cpp b/libcorpus2/ann/annotatedsentence.cpp
index 097fe4ef740fcbae9b0805320469d5b364104eb1..d37958c4903f6ca7d99d9be09593152084a46694 100644
--- a/libcorpus2/ann/annotatedsentence.cpp
+++ b/libcorpus2/ann/annotatedsentence.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/ann/annotatedsentence.h>
 #include <libcorpus2/ann/view.h>
 #include <boost/make_shared.hpp>
diff --git a/libcorpus2/ann/annotatedsentence.h b/libcorpus2/ann/annotatedsentence.h
index d186248e652f85660b68bf21c24adc01ad02a5db..65b3a0353d94266b6e18edf0054497881e77a72d 100644
--- a/libcorpus2/ann/annotatedsentence.h
+++ b/libcorpus2/ann/annotatedsentence.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_ANN_ANNOTATEDSENTENCE_H
 #define LIBCORPUS2_ANN_ANNOTATEDSENTENCE_H
 
diff --git a/libcorpus2/ann/channel.cpp b/libcorpus2/ann/channel.cpp
index c8be1779dfba2fa43c3bbdb0547d2eccf0f4bc4b..2ae9e4e74eff4dbd6d812b29cdf1c3c017dbce7f 100644
--- a/libcorpus2/ann/channel.cpp
+++ b/libcorpus2/ann/channel.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/ann/channel.h>
 #include <libpwrutils/foreach.h>
 #include <algorithm>
diff --git a/libcorpus2/ann/channel.h b/libcorpus2/ann/channel.h
index d0ba7218a190c10ee069a6e5c76ca516d5fb9a8b..fe955ce07c7459af4e4d180807baa685acade085 100644
--- a/libcorpus2/ann/channel.h
+++ b/libcorpus2/ann/channel.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_ANN_CHANNEL_H
 #define LIBCORPUS2_ANN_CHANNEL_H
 
diff --git a/libcorpus2/ann/iob.cpp b/libcorpus2/ann/iob.cpp
index ef44b49da661d88834d2e524097285ffa046691c..cf1e568918751ecf3cdc962c3e43c3b5b69b447d 100644
--- a/libcorpus2/ann/iob.cpp
+++ b/libcorpus2/ann/iob.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/ann/iob.h>
 
 namespace Corpus2 {
diff --git a/libcorpus2/ann/iob.h b/libcorpus2/ann/iob.h
index 7be4086926855240d7dacdd77f3ff8d2d2bc0f4a..dd11e00c18ccb68aa9461eb390e882e50e54d82c 100644
--- a/libcorpus2/ann/iob.h
+++ b/libcorpus2/ann/iob.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_ANN_IOB_H
 #define LIBCORPUS2_ANN_IOB_H
 
diff --git a/libcorpus2/ann/view.cpp b/libcorpus2/ann/view.cpp
index ac06b1e2a82029130700a2b3fc5371f61426ca9e..f579b6531a1b763e6ea0af6b957830f029aedcb1 100644
--- a/libcorpus2/ann/view.cpp
+++ b/libcorpus2/ann/view.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/ann/view.h>
 #include <libcorpus2/ann/annotatedsentence.h>
 #include <boost/make_shared.hpp>
diff --git a/libcorpus2/ann/view.h b/libcorpus2/ann/view.h
index 45e75fecc9739314b74008d1fa8de1ea98217dc9..144ab7e050790769a19af90bc18fd035d486195e 100644
--- a/libcorpus2/ann/view.h
+++ b/libcorpus2/ann/view.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_ANN_VIEW_H
 #define LIBCORPUS2_ANN_VIEW_H
 
diff --git a/libcorpus2/chunk.cpp b/libcorpus2/chunk.cpp
index 5994145d48c8300a4a5fa0951c2afbe4356d9cd1..cc710406e1f0cab4b75a7e2ca25f38602e316f8c 100644
--- a/libcorpus2/chunk.cpp
+++ b/libcorpus2/chunk.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/chunk.h>
diff --git a/libcorpus2/chunk.h b/libcorpus2/chunk.h
index c1c8f705366489bdbcec8a1d5f9cebca1de903da..a97f1138ae7f23f1b6506ea8478c209be4f29789 100644
--- a/libcorpus2/chunk.h
+++ b/libcorpus2/chunk.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_CHUNK_H
diff --git a/libcorpus2/exception.cpp b/libcorpus2/exception.cpp
index 75785daccce584853830683f0f9cc94911f2323b..608c848a79d4562144f6f90fde562b60613a3600 100644
--- a/libcorpus2/exception.cpp
+++ b/libcorpus2/exception.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/exception.h>
diff --git a/libcorpus2/exception.h b/libcorpus2/exception.h
index 7e22a9eb50609d5992dd813d0c77e5b7b26bd9ee..f8a5ee80a6a484733060ec231425a96e7cb5a7bc 100644
--- a/libcorpus2/exception.h
+++ b/libcorpus2/exception.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_EXCEPTION_H
diff --git a/libcorpus2/io/cclreader.cpp b/libcorpus2/io/cclreader.cpp
index 312c4809c7d72f8115ad352477ccf42634ed47c1..0aa71c7e2e9a314052d5c26318bbb6215a0fcf12 100644
--- a/libcorpus2/io/cclreader.cpp
+++ b/libcorpus2/io/cclreader.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/cclreader.h>
diff --git a/libcorpus2/io/cclreader.h b/libcorpus2/io/cclreader.h
index 59c8e8b1b85ad4cd42bdb071f2da4570a2551a0e..6b9265c8ec9132561896966767a423115bce10f6 100644
--- a/libcorpus2/io/cclreader.h
+++ b/libcorpus2/io/cclreader.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_CCLREADER_H
diff --git a/libcorpus2/io/cclwriter.cpp b/libcorpus2/io/cclwriter.cpp
index b5ecf86a6eb53edc2d16af7177d5df89c9496721..d559904d076755bd9eee12cf401c82b5180ad21f 100644
--- a/libcorpus2/io/cclwriter.cpp
+++ b/libcorpus2/io/cclwriter.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/io/cclwriter.h>
 #include <libpwrutils/foreach.h>
 #include <libcorpus2/ann/annotatedsentence.h>
diff --git a/libcorpus2/io/cclwriter.h b/libcorpus2/io/cclwriter.h
index b3bf42b219c0b4e19eac15aa579f8c157dcb049f..5306aae2270ec9d327c3a236c8b10c789e46bf35 100644
--- a/libcorpus2/io/cclwriter.h
+++ b/libcorpus2/io/cclwriter.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_IO_CCLWRITER_H
 #define LIBCORPUS2_IO_CCLWRITER_H
 
diff --git a/libcorpus2/io/conllwriter.cpp b/libcorpus2/io/conllwriter.cpp
index eea52b36246d08a40e9d8e52c5712b91bca66a6a..ac6e5943e296e10016614e73888f621112362824 100644
--- a/libcorpus2/io/conllwriter.cpp
+++ b/libcorpus2/io/conllwriter.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include "conllwriter.h"
 #include <libpwrutils/foreach.h>
 #include <boost/algorithm/string.hpp>
diff --git a/libcorpus2/io/conllwriter.h b/libcorpus2/io/conllwriter.h
index b16e4c0fb37c1c34eb63edd3970defa66230d8dd..36ca2e141bd1d007da61fe69374c9e0a0c058d64 100644
--- a/libcorpus2/io/conllwriter.h
+++ b/libcorpus2/io/conllwriter.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef CONLLWRITER_H
 #define CONLLWRITER_H
 
diff --git a/libcorpus2/io/fastxces.cpp b/libcorpus2/io/fastxces.cpp
index f2e0f30d95d17a92cc29461fcd1079e15e29ad07..0e2d0fa95fbd927a3dac341211a2e19f9e0b5978 100644
--- a/libcorpus2/io/fastxces.cpp
+++ b/libcorpus2/io/fastxces.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/io/fastxces.h>
 #include <boost/make_shared.hpp>
 #include <boost/regex.hpp>
diff --git a/libcorpus2/io/fastxces.h b/libcorpus2/io/fastxces.h
index 365ad09ddef7871d020d2373b1a25f340cf22d88..10b39bd88b92fc20a0ec357d8a782b48b31aca69 100644
--- a/libcorpus2/io/fastxces.h
+++ b/libcorpus2/io/fastxces.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_IO_FASTXCES_H
 #define LIBCORPUS2_IO_FASTXCES_H
 
diff --git a/libcorpus2/io/helpers.cpp b/libcorpus2/io/helpers.cpp
index 9aac87844ee18597100b350a75af290b724aed34..8ebdf857586b1844295e21e3f9b78d4b5d93b4ca 100644
--- a/libcorpus2/io/helpers.cpp
+++ b/libcorpus2/io/helpers.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/io/helpers.h>
 #include <libcorpus2/io/reader.h>
 #include <sstream>
diff --git a/libcorpus2/io/helpers.h b/libcorpus2/io/helpers.h
index 92d8a896e4342572b399f91c9ccf82f2387d10ac..c61a90413dc46badd9f978f19fa9ba3e3407888a 100644
--- a/libcorpus2/io/helpers.h
+++ b/libcorpus2/io/helpers.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_IO_HELPERS_H
 #define LIBCORPUS2_IO_HELPERS_H
 
diff --git a/libcorpus2/io/iob-chan.cpp b/libcorpus2/io/iob-chan.cpp
index c7b3ab4884a9cb88753e95a7570ef6c70d1b1a8d..5a30a166a3e1e6b987b98ee46e331bf12c5eacb0 100644
--- a/libcorpus2/io/iob-chan.cpp
+++ b/libcorpus2/io/iob-chan.cpp
@@ -1,17 +1,17 @@
 /*
-	Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
-	Part of the libcorpus2 project
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
 
-	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
+    This program 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 3 of the License, or (at your option)
 any later version.
 
-	This program is distributed in the hope that it will be useful, but
+    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.
+or FITNESS FOR A PARTICULAR PURPOSE. 
 
-	See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/iob-chan.h>
diff --git a/libcorpus2/io/iob-chan.h b/libcorpus2/io/iob-chan.h
index 378e8503d16d3952b35f085c57d2c36b6fb2739d..d1e9e2f4dc344abe4f1b03a97a4a3069365c394c 100644
--- a/libcorpus2/io/iob-chan.h
+++ b/libcorpus2/io/iob-chan.h
@@ -1,17 +1,17 @@
 /*
-	Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
-	Part of the libcorpus2 project
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
 
-	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
+    This program 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 3 of the License, or (at your option)
 any later version.
 
-	This program is distributed in the hope that it will be useful, but
+    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.
+or FITNESS FOR A PARTICULAR PURPOSE. 
 
-	See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBSORPUS2_IO_IOB_CHAN_H
diff --git a/libcorpus2/io/nonewriter.cpp b/libcorpus2/io/nonewriter.cpp
index 2aaf4eecd5ef0be0c4367637bc368a1ad289902b..38610e8e29ba910bbba65b0a4cd08c0ec5b4882f 100644
--- a/libcorpus2/io/nonewriter.cpp
+++ b/libcorpus2/io/nonewriter.cpp
@@ -1,3 +1,18 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
 #include <libcorpus2/io/nonewriter.h>
 
 namespace Corpus2 {
diff --git a/libcorpus2/io/nonewriter.h b/libcorpus2/io/nonewriter.h
index 8d6a7190fc1e4255966823a0516967a17a1ac116..5d9f81a816edc072489dbe8c38d9745caa93a433 100644
--- a/libcorpus2/io/nonewriter.h
+++ b/libcorpus2/io/nonewriter.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_IO_NONEWRITER_H
 #define LIBCORPUS2_IO_NONEWRITER_H
 
diff --git a/libcorpus2/io/orthwriter.cpp b/libcorpus2/io/orthwriter.cpp
index 11393a8dc866f399d992aa76eb1b7292a0d58530..0b5806ae164a83b3786ca053389766b396abd537 100644
--- a/libcorpus2/io/orthwriter.cpp
+++ b/libcorpus2/io/orthwriter.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/orthwriter.h>
diff --git a/libcorpus2/io/orthwriter.h b/libcorpus2/io/orthwriter.h
index f002e51783ddf991c8c0ab45c3a818221392cdcf..ec518e4537c6cdfceeedb41abe0476cb5be2875f 100644
--- a/libcorpus2/io/orthwriter.h
+++ b/libcorpus2/io/orthwriter.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_ORTHWRITER_H
diff --git a/libcorpus2/io/pathwriter.cpp b/libcorpus2/io/pathwriter.cpp
index a1abcdad990fb08648af46b5088bd29606783bb9..b5a3a499047713a1bc4f70728a9694a0ae64a69b 100644
--- a/libcorpus2/io/pathwriter.cpp
+++ b/libcorpus2/io/pathwriter.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/io/pathwriter.h>
 
 namespace Corpus2 {
diff --git a/libcorpus2/io/pathwriter.h b/libcorpus2/io/pathwriter.h
index 1f9bcc88105ba73b3beb5cd7c0fc1f27b6c17b18..c9d0af7958e613c83e3808e23bef08568cd15d87 100644
--- a/libcorpus2/io/pathwriter.h
+++ b/libcorpus2/io/pathwriter.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_IO_PATHWRITER_H
 #define LIBCORPUS2_IO_PATHWRITER_H
 
diff --git a/libcorpus2/io/plainreader.cpp b/libcorpus2/io/plainreader.cpp
index 2d322cf19ab8e4ba3300feec2208f4beb9bc0a65..28c685032eac50d6481d9662783839a0d38f9367 100644
--- a/libcorpus2/io/plainreader.cpp
+++ b/libcorpus2/io/plainreader.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/io/plainreader.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libcorpus2/io/plainreader.h b/libcorpus2/io/plainreader.h
index c17cb9e3a417c353685bc5e73f80b0ee387981af..9304b01842bb9010631bd2db60070c1a0700bc4f 100644
--- a/libcorpus2/io/plainreader.h
+++ b/libcorpus2/io/plainreader.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_IO_PLAINREADER_H
 #define LIBCORPUS2_IO_PLAINREADER_H
 
diff --git a/libcorpus2/io/plainwriter.cpp b/libcorpus2/io/plainwriter.cpp
index 7ab72e7fc103182785362cfe9efc0a722a288165..f75a52f12dc2970fe732b84a120120d05e03e1ca 100644
--- a/libcorpus2/io/plainwriter.cpp
+++ b/libcorpus2/io/plainwriter.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/plainwriter.h>
diff --git a/libcorpus2/io/plainwriter.h b/libcorpus2/io/plainwriter.h
index 2a852bef8a8fe2ecfd34ff6f5c98677ab65388fa..f97353dbaf83cd88a00f5957f2ad0af2999f02b4 100644
--- a/libcorpus2/io/plainwriter.h
+++ b/libcorpus2/io/plainwriter.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_PLAIN_H
diff --git a/libcorpus2/io/premorphwriter.cpp b/libcorpus2/io/premorphwriter.cpp
index b1d39a43bc99614aacc3d0515935e0396c1a4778..6a551aa524a69753d7d75668d20bbf4069902a27 100644
--- a/libcorpus2/io/premorphwriter.cpp
+++ b/libcorpus2/io/premorphwriter.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/premorphwriter.h>
diff --git a/libcorpus2/io/premorphwriter.h b/libcorpus2/io/premorphwriter.h
index 0e1a6b8588ad513c1bd2d8c076604fc596ea5d74..b16ea400dbf5c20d968af68c5c7208f93f544410 100644
--- a/libcorpus2/io/premorphwriter.h
+++ b/libcorpus2/io/premorphwriter.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_PREMORPHWRITER_H
diff --git a/libcorpus2/io/reader.cpp b/libcorpus2/io/reader.cpp
index b3b12ac2be5f9d731186de3a486f934dff7aa9e2..211a85af6032bfaeb78d47d3d106e6563c27e304 100644
--- a/libcorpus2/io/reader.cpp
+++ b/libcorpus2/io/reader.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/reader.h>
diff --git a/libcorpus2/io/reader.h b/libcorpus2/io/reader.h
index e9d01f6e7ecf04c9bbd67c99051bf5ee14bf368e..562a830ba832c1a5df55c299900d8ecfe5a220f0 100644
--- a/libcorpus2/io/reader.h
+++ b/libcorpus2/io/reader.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_READER_H
diff --git a/libcorpus2/io/rft.cpp b/libcorpus2/io/rft.cpp
index d7366c370986b6baea9a01eedb292c6925b85fc2..bc3ad0bd5072ef2cb53485aeda3b2c742b084f0b 100644
--- a/libcorpus2/io/rft.cpp
+++ b/libcorpus2/io/rft.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/rft.h>
diff --git a/libcorpus2/io/rft.h b/libcorpus2/io/rft.h
index b87b5dd616b9df8ef614965cfdc994ea2f40c193..83e24c4e5cf0ebfc8205f0e4f5d553c2321152d1 100644
--- a/libcorpus2/io/rft.h
+++ b/libcorpus2/io/rft.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_RFT_H
diff --git a/libcorpus2/io/sax.cpp b/libcorpus2/io/sax.cpp
index 69737148704253be5e5c06338684256e18d1ed45..6d175786e52aff323c4ee0a3f97ac20eeb7dc627 100644
--- a/libcorpus2/io/sax.cpp
+++ b/libcorpus2/io/sax.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/sax.h>
diff --git a/libcorpus2/io/sax.h b/libcorpus2/io/sax.h
index 75317cb80343483b5b0db6b65190e0fe6c989598..6535c7f245fe14a65c38c6559d3faa9787c6af94 100644
--- a/libcorpus2/io/sax.h
+++ b/libcorpus2/io/sax.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_SAX_H
diff --git a/libcorpus2/io/statwriter.cpp b/libcorpus2/io/statwriter.cpp
index b77fbf77a974b8d2894b45a7783cd4d6d42948f8..36d82159abb158a2ca83a4137fee73d0bb9da5cd 100644
--- a/libcorpus2/io/statwriter.cpp
+++ b/libcorpus2/io/statwriter.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/io/statwriter.h>
 #include <libcorpus2/ann/annotatedsentence.h>
 #include <iomanip>
diff --git a/libcorpus2/io/statwriter.h b/libcorpus2/io/statwriter.h
index a022b9f4f6e1f67eaf864193039d54c89b2c1497..92c2a56c8739d1852093731b076759d94364b0fe 100644
--- a/libcorpus2/io/statwriter.h
+++ b/libcorpus2/io/statwriter.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_IO_STATWRITER_H
 #define LIBCORPUS2_IO_STATWRITER_H
 
diff --git a/libcorpus2/io/writer.cpp b/libcorpus2/io/writer.cpp
index 4315343b11418e047e278976c8d940a210cac580..166ae62d4f48ed475efce0a3368ae0235cd30ef1 100644
--- a/libcorpus2/io/writer.cpp
+++ b/libcorpus2/io/writer.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/writer.h>
diff --git a/libcorpus2/io/writer.h b/libcorpus2/io/writer.h
index ae9b2cd0b0067cc9ecd00da5008c580b8bdc2a0e..9e8978e02567f17032f4194f7e448f2664fca2bb 100644
--- a/libcorpus2/io/writer.h
+++ b/libcorpus2/io/writer.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_WRITER_H
diff --git a/libcorpus2/io/xces.cpp b/libcorpus2/io/xces.cpp
index bd780c01865dfdd4f45a3bdbb9c78a4c44397245..4baacb60f2d73c226f7254125bb88c67a54a4803 100644
--- a/libcorpus2/io/xces.cpp
+++ b/libcorpus2/io/xces.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/xces.h>
diff --git a/libcorpus2/io/xces.h b/libcorpus2/io/xces.h
index 66bddb147ea4abc5315b22bf5a39259bac21b67f..cef03395b53e98a6682183329e9ccf1fc489054f 100644
--- a/libcorpus2/io/xces.h
+++ b/libcorpus2/io/xces.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_XCES_H
diff --git a/libcorpus2/io/xcescommon.cpp b/libcorpus2/io/xcescommon.cpp
index 52edd595542fadf7243f86655589e4921c66b772..3aea58704ac100d2b05194593a18c2c086c2f9e1 100644
--- a/libcorpus2/io/xcescommon.cpp
+++ b/libcorpus2/io/xcescommon.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/xcescommon.h>
diff --git a/libcorpus2/io/xcescommon.h b/libcorpus2/io/xcescommon.h
index 204e27280b9a0eb53d0ea4eb8544113e3b634d17..e30e535729f13025eebced0d63a5af5d74388108 100644
--- a/libcorpus2/io/xcescommon.h
+++ b/libcorpus2/io/xcescommon.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_XCESCOMMON_H
diff --git a/libcorpus2/io/xcesreader.cpp b/libcorpus2/io/xcesreader.cpp
index 6db3428d55e407ed64e14112240e747ec180059a..87bfbd7b12bb165d8dd1049a3f0cd4171353454a 100644
--- a/libcorpus2/io/xcesreader.cpp
+++ b/libcorpus2/io/xcesreader.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/xcesreader.h>
diff --git a/libcorpus2/io/xcesreader.h b/libcorpus2/io/xcesreader.h
index f1a2253d42402c6f6d08f6f3ae32d5189809947b..ff3e745ebc01a7a1ade51f5ba46bedb76b8acadf 100644
--- a/libcorpus2/io/xcesreader.h
+++ b/libcorpus2/io/xcesreader.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_XCESREADER_H
diff --git a/libcorpus2/io/xcesvalidate.cpp b/libcorpus2/io/xcesvalidate.cpp
index 8c47bfde8359d4543cc9b6f09c38bed7959f2ec0..818fe0a8a426439a0190636cd5783b36c3ee73b3 100644
--- a/libcorpus2/io/xcesvalidate.cpp
+++ b/libcorpus2/io/xcesvalidate.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/xcesvalidate.h>
diff --git a/libcorpus2/io/xcesvalidate.h b/libcorpus2/io/xcesvalidate.h
index f85bce7bfee2d30cef9cb00d789e7c0be39aeb7d..634f7d5a4458246e81562c143802a6d3d4e4fa24 100644
--- a/libcorpus2/io/xcesvalidate.h
+++ b/libcorpus2/io/xcesvalidate.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_XCESVALIDATE_H
diff --git a/libcorpus2/io/xceswriter.cpp b/libcorpus2/io/xceswriter.cpp
index bf1cd78d9da558270cc0a2d0b8fd4dc217d47fcb..afb01ec9617b3f2113ca35b0814041b96e4182ed 100644
--- a/libcorpus2/io/xceswriter.cpp
+++ b/libcorpus2/io/xceswriter.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/xcescommon.h>
diff --git a/libcorpus2/io/xceswriter.h b/libcorpus2/io/xceswriter.h
index a9c6634c3b23c2d3613c2c3d7ba806270c98ea0d..01a03da231a7cf502af5f7c312ed5ca6992d5d42 100644
--- a/libcorpus2/io/xceswriter.h
+++ b/libcorpus2/io/xceswriter.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_XCESWRITER_H
diff --git a/libcorpus2/io/xmlreader.cpp b/libcorpus2/io/xmlreader.cpp
index 773eb857cb85273f6298cc0d683d4ef0bd6beb72..3aa6917c38906f118f6020123c5990745a88c33f 100644
--- a/libcorpus2/io/xmlreader.cpp
+++ b/libcorpus2/io/xmlreader.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/xmlreader.h>
diff --git a/libcorpus2/io/xmlreader.h b/libcorpus2/io/xmlreader.h
index 8ba020187df132a065a1f8192e9cc697b664b2d9..7e7f8ea62595f46823d3297a00f97639428e9635 100644
--- a/libcorpus2/io/xmlreader.h
+++ b/libcorpus2/io/xmlreader.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_IO_XMLREADER_H
diff --git a/libcorpus2/io/xmlwriter.cpp b/libcorpus2/io/xmlwriter.cpp
index e540073ac6f8b27f062093fd467cb0d30b422f71..8f41c2b4e65657a81f8251719f9619a43c5d975d 100644
--- a/libcorpus2/io/xmlwriter.cpp
+++ b/libcorpus2/io/xmlwriter.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/io/xcescommon.h>
diff --git a/libcorpus2/io/xmlwriter.h b/libcorpus2/io/xmlwriter.h
index b8f7ccfc2e37d290d9cd1454b32adb3cbe1751a6..91ef6a575792ad9d4aba1e5946a560d77c63cb52 100644
--- a/libcorpus2/io/xmlwriter.h
+++ b/libcorpus2/io/xmlwriter.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_IO_XMLWRITER_H
 #define LIBCORPUS2_IO_XMLWRITER_H
 
diff --git a/libcorpus2/lexeme.cpp b/libcorpus2/lexeme.cpp
index d5370ed662ee7974505ec9732c904cf6377e0fc6..b6b6650956e74bdf439995cd6975f0982d4c41b3 100644
--- a/libcorpus2/lexeme.cpp
+++ b/libcorpus2/lexeme.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/lexeme.h>
diff --git a/libcorpus2/lexeme.h b/libcorpus2/lexeme.h
index 4c0119ab58d91c9b932be2eba46cf4373272040b..2ba90d649353afced37f67b4f1cba31494bb49fe 100644
--- a/libcorpus2/lexeme.h
+++ b/libcorpus2/lexeme.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_LEXEME_H
diff --git a/libcorpus2/sentence.cpp b/libcorpus2/sentence.cpp
index aaacf628f542a10d59be5718d05c2fea47020328..10b3b7db627b57c8fc407cbd3a2a52cff921cfff 100644
--- a/libcorpus2/sentence.cpp
+++ b/libcorpus2/sentence.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/sentence.h>
diff --git a/libcorpus2/sentence.h b/libcorpus2/sentence.h
index 5c465e417c398c9f3d6239402d6b4b1fb631b7ea..d182fdac34c7f0d35c98ac10d570da1f1ab128c5 100644
--- a/libcorpus2/sentence.h
+++ b/libcorpus2/sentence.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_SENTENCE_H
diff --git a/libcorpus2/tag.cpp b/libcorpus2/tag.cpp
index fc263d374707d3b7c60595c973475a7d883c7f2a..81a7a9a52cf0ca4423451632e8c22737f797ddbb 100644
--- a/libcorpus2/tag.cpp
+++ b/libcorpus2/tag.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/tag.h>
diff --git a/libcorpus2/tag.h b/libcorpus2/tag.h
index d2e61557cc32b93db75263d6f6ee90fd9dee0735..9d3d1ffd6c8589a1b4c2b8e1b08dc32d13c0abd7 100644
--- a/libcorpus2/tag.h
+++ b/libcorpus2/tag.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TAG_H
diff --git a/libcorpus2/tagging.cpp b/libcorpus2/tagging.cpp
index ffcfdd015209a01366b4959a7b491d726e82b528..9b65484f8f738955bad78ef10fa9efc7a187b966 100644
--- a/libcorpus2/tagging.cpp
+++ b/libcorpus2/tagging.cpp
@@ -1,17 +1,17 @@
 /*
-	Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
-	Part of the libcorpus2 project
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
 
-	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
+    This program 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 3 of the License, or (at your option)
 any later version.
 
-	This program is distributed in the hope that it will be useful, but
+    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.
+or FITNESS FOR A PARTICULAR PURPOSE. 
 
-	See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/tagging.h>
diff --git a/libcorpus2/tagging.h b/libcorpus2/tagging.h
index 6d65211f40e2ea059af6afbee278a96c2fd37541..4beaba5096ac616291e822824971838aa33e2142 100644
--- a/libcorpus2/tagging.h
+++ b/libcorpus2/tagging.h
@@ -1,17 +1,17 @@
 /*
-	Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
-	Part of the libcorpus2 project
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
 
-	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
+    This program 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 3 of the License, or (at your option)
 any later version.
 
-	This program is distributed in the hope that it will be useful, but
+    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.
+or FITNESS FOR A PARTICULAR PURPOSE. 
 
-	See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TAGGING_H
diff --git a/libcorpus2/tagset.cpp b/libcorpus2/tagset.cpp
index ab4781696318cbdb397cf9b20f5b946c5f6a66ce..4ec7b824be5a5df149702ba3f61d9864bab636b2 100644
--- a/libcorpus2/tagset.cpp
+++ b/libcorpus2/tagset.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/exception.h>
diff --git a/libcorpus2/tagset.h b/libcorpus2/tagset.h
index 821ec9a3ac5bca71dccf434441ace7c8edc1774f..18151c60f7eb8d785ffc7380b9d46d6c6bab7bc1 100644
--- a/libcorpus2/tagset.h
+++ b/libcorpus2/tagset.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TAGSET_H
diff --git a/libcorpus2/tagsetmanager.cpp b/libcorpus2/tagsetmanager.cpp
index 610234f7449f30358d022c11febec0693727ba36..0f3fe430ae0afc0c415bf5931999d3d32dda490c 100644
--- a/libcorpus2/tagsetmanager.cpp
+++ b/libcorpus2/tagsetmanager.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/tagsetmanager.h>
diff --git a/libcorpus2/tagsetmanager.h b/libcorpus2/tagsetmanager.h
index a5dc06422a97e9cfdb13b968c1fc27076ffb1ee1..c5576e52d93f2d912fb30a6e2d58af7c8166298c 100644
--- a/libcorpus2/tagsetmanager.h
+++ b/libcorpus2/tagsetmanager.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TAGSETMANAGER_H
diff --git a/libcorpus2/tagsetparser.cpp b/libcorpus2/tagsetparser.cpp
index 0e37c3cb1fc5dada804cc6ba08c0139f6f21388e..0c3b16cc162526804eda76a2aac77e6380fe5eca 100644
--- a/libcorpus2/tagsetparser.cpp
+++ b/libcorpus2/tagsetparser.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/tagsetparser.h>
diff --git a/libcorpus2/tagsetparser.h b/libcorpus2/tagsetparser.h
index 9dc0792a194ae90511a161613a3247d2b8be964d..11822a6891ff8e4f743d719e50b003e9c4e03ab6 100644
--- a/libcorpus2/tagsetparser.h
+++ b/libcorpus2/tagsetparser.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TAGSETPARSER_H
diff --git a/libcorpus2/token.cpp b/libcorpus2/token.cpp
index 5438c4b2caad75c58c4d81c0aced6850fe37ae1f..63352b7392e83325d796f124f0c5fe74e73025b0 100644
--- a/libcorpus2/token.cpp
+++ b/libcorpus2/token.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/token.h>
diff --git a/libcorpus2/token.h b/libcorpus2/token.h
index 5c992a5ed9ea6e7a9c4988cd6596d1f9e9cd1a77..f40e6688881dec4d1de953752207fea84aea7ff1 100644
--- a/libcorpus2/token.h
+++ b/libcorpus2/token.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TOKEN_H
diff --git a/libcorpus2/tokenmetadata.cpp b/libcorpus2/tokenmetadata.cpp
index 88ae6deaa9c168bb3828870455f7b17d0a93083d..41ce6b852417ac486b37719957ba0a55c88e5ec8 100644
--- a/libcorpus2/tokenmetadata.cpp
+++ b/libcorpus2/tokenmetadata.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/tokenmetadata.h>
diff --git a/libcorpus2/tokenmetadata.h b/libcorpus2/tokenmetadata.h
index fb367a6c512c5ad7d79854c192650589517dab5d..da28c117d6be22feaa530fc64637299dec83b7e9 100644
--- a/libcorpus2/tokenmetadata.h
+++ b/libcorpus2/tokenmetadata.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TOKENMETADATA_H
diff --git a/libcorpus2/tokensource.h b/libcorpus2/tokensource.h
index 3bfbd2d8d191691ed39e5eea10d0066cd69d03c6..fccb38017db59ba2f13f85a9a3def42f277af567 100644
--- a/libcorpus2/tokensource.h
+++ b/libcorpus2/tokensource.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TOKEN_SOURCE_H
diff --git a/libcorpus2/typedefs.h b/libcorpus2/typedefs.h
index f4afbece11e582517eed36bd309579f4afc127ae..2c549d9815c182857fe8d5769ec2a8fa6bce2be7 100644
--- a/libcorpus2/typedefs.h
+++ b/libcorpus2/typedefs.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_TYPEDEFS_H
diff --git a/libcorpus2/util/ioformat-options.cpp b/libcorpus2/util/ioformat-options.cpp
index 0ed6ccf7e71c50004231cc9cab3c488da1b87691..0c1c360ea2cb24fb0976685c0f25f85c7395aedb 100644
--- a/libcorpus2/util/ioformat-options.cpp
+++ b/libcorpus2/util/ioformat-options.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #include <libcorpus2/util/ioformat-options.h>
 #include <boost/algorithm/string/join.hpp>
 
diff --git a/libcorpus2/util/ioformat-options.h b/libcorpus2/util/ioformat-options.h
index cab00546d311f2db27d3b2924f579702b2fa90fc..6cb717c5ec67ce195b41c46190ba0c7fc1e8da78 100644
--- a/libcorpus2/util/ioformat-options.h
+++ b/libcorpus2/util/ioformat-options.h
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBSORPUS2_UTIL_IOFORMAT_OPTIONS_H
 #define LIBCORPUS2_UTIL_IOFORMAT_OPTIONS_H
 
diff --git a/libcorpus2/util/settings.cpp b/libcorpus2/util/settings.cpp
index 9ee485b7fbd749a18966b14e24738f0b91019259..3ee9ba902c7a937f5e2ef645f075b4ab7b63bd6f 100644
--- a/libcorpus2/util/settings.cpp
+++ b/libcorpus2/util/settings.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/util/settings.h>
diff --git a/libcorpus2/util/settings.h b/libcorpus2/util/settings.h
index 1dd57722b0e53d07c9d81bacd59b3360a2d4780c..2328192219a2f030a3c6815be1ef981ad85d0f96 100644
--- a/libcorpus2/util/settings.h
+++ b/libcorpus2/util/settings.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_SETTINGS_H
diff --git a/libcorpus2/util/symboldictionary.cpp b/libcorpus2/util/symboldictionary.cpp
index 92716e44eb49d3bf867e0054c021756762081271..f3bd9c643560d3d85664bfba2e9eea0a0dcc85fb 100644
--- a/libcorpus2/util/symboldictionary.cpp
+++ b/libcorpus2/util/symboldictionary.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/util/symboldictionary.h>
diff --git a/libcorpus2/util/symboldictionary.h b/libcorpus2/util/symboldictionary.h
index c1eaf8a07c66e0729d91cb461a1a1d050c0eca69..5258a7342cb73b8c8ae4f0369d087fcc792e2628 100644
--- a/libcorpus2/util/symboldictionary.h
+++ b/libcorpus2/util/symboldictionary.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_SYMBOLDICTIONARY_H
diff --git a/libcorpus2/util/tokentimer.cpp b/libcorpus2/util/tokentimer.cpp
index cf38bf12ce3793f71be82a05c5168519e01b9888..cf1767f7e11d91ecfb62e541b038e7ca744fee78 100644
--- a/libcorpus2/util/tokentimer.cpp
+++ b/libcorpus2/util/tokentimer.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2/util/tokentimer.h>
diff --git a/libcorpus2/util/tokentimer.h b/libcorpus2/util/tokentimer.h
index 4a51831f7c43b0aa18a95bf26d48686ada844f50..de7030595af5e8b141cdacdb8fc44c8403bd7d6a 100644
--- a/libcorpus2/util/tokentimer.h
+++ b/libcorpus2/util/tokentimer.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_UTIL_TOKENTIMER_H
diff --git a/libcorpus2_whole/corpus.cpp b/libcorpus2_whole/corpus.cpp
index 00fb0ffe2e979a485945ed2ea23eb04d8da3f715..2b96cd81253528dbf81d2e80bd1e8b7e97a9beb9 100644
--- a/libcorpus2_whole/corpus.cpp
+++ b/libcorpus2_whole/corpus.cpp
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2_whole/corpus.h>
diff --git a/libcorpus2_whole/corpus.h b/libcorpus2_whole/corpus.h
index 225018ca1f3412388f61159a8650c61266c60a56..b0d2ae8a45b618c40a9d9f8f61d33ca95a425c5b 100644
--- a/libcorpus2_whole/corpus.h
+++ b/libcorpus2_whole/corpus.h
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_WHOLE_CORPUS_H
diff --git a/libcorpus2_whole/document.cpp b/libcorpus2_whole/document.cpp
index 9b391b84fd0101f544a79884efdcd13593e53c9f..bd01f1afd05ec90c0d0b452b5ce11ba2316d1e15 100644
--- a/libcorpus2_whole/document.cpp
+++ b/libcorpus2_whole/document.cpp
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libcorpus2_whole/document.h>
diff --git a/libcorpus2_whole/document.h b/libcorpus2_whole/document.h
index d02a043cd39c2e57fecc16064236cb440160662e..bfef70db4d5f300f841f5c0d00a0cfce9921a705 100644
--- a/libcorpus2_whole/document.h
+++ b/libcorpus2_whole/document.h
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_WHOLE_DOCUMENT_H
diff --git a/libcorpus2_whole/io/cclrelreader.cpp b/libcorpus2_whole/io/cclrelreader.cpp
index ae69a8b9adb05197ba1371a260fb85e31715e0ec..9072f2b1f3cbd2ab7c4593f633dc370762c99ab5 100644
--- a/libcorpus2_whole/io/cclrelreader.cpp
+++ b/libcorpus2_whole/io/cclrelreader.cpp
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <boost/make_shared.hpp>
diff --git a/libcorpus2_whole/io/cclrelreader.h b/libcorpus2_whole/io/cclrelreader.h
index cd19f681a95a4ca8bca01684a3a41b3f1f097a23..c810ae21acf4aa8b82d84c9e0a5be53e86f1056c 100644
--- a/libcorpus2_whole/io/cclrelreader.h
+++ b/libcorpus2_whole/io/cclrelreader.h
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_WHOLE_DOCREADER_H
diff --git a/libcorpus2_whole/io/corpusreader.cpp b/libcorpus2_whole/io/corpusreader.cpp
index bbe0154920f040469480b842bc99c09e891b266a..4d4da1bd4c3015997bb8bd7211f8717b91c16a78 100644
--- a/libcorpus2_whole/io/corpusreader.cpp
+++ b/libcorpus2_whole/io/corpusreader.cpp
@@ -1,3 +1,18 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
 #include <libcorpus2_whole/io/corpusreader.h>
 #include <libcorpus2_whole/io/documentcorpusreader.h>
 
diff --git a/libcorpus2_whole/io/corpusreader.h b/libcorpus2_whole/io/corpusreader.h
index 4308b3591f640d35d50ab08a9d24f303e908745e..b0af6ea57d8d0ecf72c15866027fed14dbb2438e 100644
--- a/libcorpus2_whole/io/corpusreader.h
+++ b/libcorpus2_whole/io/corpusreader.h
@@ -1,3 +1,19 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_WHOLE_CORPUSREADER_H
 #define LIBCORPUS2_WHOLE_CORPUSREADER_H
 
diff --git a/libcorpus2_whole/io/documentcorpusreader.cpp b/libcorpus2_whole/io/documentcorpusreader.cpp
index 4a7b0d8ab501e375974fef29e8d91f5d898aa548..64d0e483aba94e4125584963c5cae75463d92b2c 100644
--- a/libcorpus2_whole/io/documentcorpusreader.cpp
+++ b/libcorpus2_whole/io/documentcorpusreader.cpp
@@ -1,3 +1,18 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
 #include <fstream>
 #include <boost/algorithm/string.hpp>
 
diff --git a/libcorpus2_whole/io/documentcorpusreader.h b/libcorpus2_whole/io/documentcorpusreader.h
index 642639aeca71dcba211f34a0672429bb78fd2f9e..99c55421c36455f7ceeb58097cb199f7ecbed8ef 100644
--- a/libcorpus2_whole/io/documentcorpusreader.h
+++ b/libcorpus2_whole/io/documentcorpusreader.h
@@ -1,3 +1,19 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_WHOLE_DOCUMENTCORPUSREADER_H
 #define LIBCORPUS2_WHOLE_DOCUMENTCORPUSREADER_H
 
diff --git a/libcorpus2_whole/io/documentreader.cpp b/libcorpus2_whole/io/documentreader.cpp
index 73db0d354fbe16778100b03ab2d3d6db41288b81..dcdf4f0b629c18cd8aff5647029cfd0b10b0bde6 100644
--- a/libcorpus2_whole/io/documentreader.cpp
+++ b/libcorpus2_whole/io/documentreader.cpp
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 #include <boost/algorithm/string.hpp>
 #include <libcorpus2_whole/io/documentreader.h>
diff --git a/libcorpus2_whole/io/documentreader.h b/libcorpus2_whole/io/documentreader.h
index 760fd67c98330dcf5a7c0f8f0793cfff84e33e5a..9dda86768a7155c7c685f4ee764b020d41601ad6 100644
--- a/libcorpus2_whole/io/documentreader.h
+++ b/libcorpus2_whole/io/documentreader.h
@@ -1,3 +1,19 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_WHOLE_DOCUMENTREADER_H
 #define LIBCORPUS2_WHOLE_DOCUMENTREADER_H
 #include <fstream>
diff --git a/libcorpus2_whole/io/poliqarpcorpusreader.cpp b/libcorpus2_whole/io/poliqarpcorpusreader.cpp
index acc6e36288486fed014b25c1ef412c090d8eb776..49525e99639883e2ee4c3ec4d58e1827489fdab5 100644
--- a/libcorpus2_whole/io/poliqarpcorpusreader.cpp
+++ b/libcorpus2_whole/io/poliqarpcorpusreader.cpp
@@ -1,3 +1,18 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
 #include <libcorpus2_whole/io/poliqarpcorpusreader.h>
 
 namespace Corpus2 {
diff --git a/libcorpus2_whole/io/poliqarpcorpusreader.h b/libcorpus2_whole/io/poliqarpcorpusreader.h
index c5134b3fa839daae449e6bc0d09dda23b72e89da..997303a2065cc72332e32336b222a2267a602775 100644
--- a/libcorpus2_whole/io/poliqarpcorpusreader.h
+++ b/libcorpus2_whole/io/poliqarpcorpusreader.h
@@ -1,3 +1,19 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_WHOLE_POLIQARPCORPUSREADER_H
 #define LIBCORPUS2_WHOLE_POLIQARPCORPUSREADER_H
 
diff --git a/libcorpus2_whole/io/poliqarpdocumentreader.cpp b/libcorpus2_whole/io/poliqarpdocumentreader.cpp
index a2d0644e68fd03a13b38945cf90b44bcc442d5f1..4971d000d5ce32cd341b6578853bde5962627a48 100644
--- a/libcorpus2_whole/io/poliqarpdocumentreader.cpp
+++ b/libcorpus2_whole/io/poliqarpdocumentreader.cpp
@@ -1,3 +1,18 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
 #include <libcorpus2_whole/io/poliqarpdocumentreader.h>
 #include <boost/scoped_ptr.hpp>
 
diff --git a/libcorpus2_whole/io/poliqarpdocumentreader.h b/libcorpus2_whole/io/poliqarpdocumentreader.h
index 70cb046a2bea3efa89512edc3651755fd5495fc5..a25859ee9161a06c09fdfc6115691badab30c500 100644
--- a/libcorpus2_whole/io/poliqarpdocumentreader.h
+++ b/libcorpus2_whole/io/poliqarpdocumentreader.h
@@ -1,3 +1,19 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBCORPUS2_WHOLE_POLIQARPDOCUMENTREADER_H
 #define LIBCORPUS2_WHOLE_POLIQARPDOCUMENTREADER_H
 
diff --git a/libcorpus2_whole/io/reader_i.h b/libcorpus2_whole/io/reader_i.h
index e3ba688aa0d0f0aad7703cd54d8016f838a55377..35dd23c489eaf5982466091a058777a76e92126c 100644
--- a/libcorpus2_whole/io/reader_i.h
+++ b/libcorpus2_whole/io/reader_i.h
@@ -1,3 +1,19 @@
+/*
+	Copyright (C) 2010 Tomasz Śniatowski, Adam Radziszewski, Paweł Kędzia
+	Part of the libcorpus2 project
+
+	This program 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 3 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 LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef READERI_H
 #define READERI_H
 
diff --git a/libcorpus2_whole/io/relreader.cpp b/libcorpus2_whole/io/relreader.cpp
index c94ac6eea32d1bb7a5a07825ea7d6cb0cae706dc..53c46ececd1a20a720302134f3dbf85c1495717c 100644
--- a/libcorpus2_whole/io/relreader.cpp
+++ b/libcorpus2_whole/io/relreader.cpp
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libpwrutils/foreach.h>
diff --git a/libcorpus2_whole/io/relreader.h b/libcorpus2_whole/io/relreader.h
index bb01e19dab5c9fce7e4eeb68b1b1cfe78a29e1f7..4531d22e3cceeadd17d7a4740d44e2c44cee1327 100644
--- a/libcorpus2_whole/io/relreader.h
+++ b/libcorpus2_whole/io/relreader.h
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_WHOLE_RELREADER_H
diff --git a/libcorpus2_whole/relation.cpp b/libcorpus2_whole/relation.cpp
index d1df54f9f529ece1a6bd4446d23f64bec7785c47..dcb7fb0e5f18ceb97fb815d612614aa8877f299f 100644
--- a/libcorpus2_whole/relation.cpp
+++ b/libcorpus2_whole/relation.cpp
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <boost/make_shared.hpp>
diff --git a/libcorpus2_whole/relation.h b/libcorpus2_whole/relation.h
index 8e8ed1d0d49baaa3d1c97312cf8711e912587691..522dbacfd95e42f39c4442224b4d7aee546f1120 100644
--- a/libcorpus2_whole/relation.h
+++ b/libcorpus2_whole/relation.h
@@ -3,7 +3,7 @@
 	Part of the libcorpus2 project
 
 	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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-	See the LICENSE and COPYING files for more details.
+	See the LICENSE.CORPUS2, LICENSE.POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef LIBCORPUS2_RELATIONT_H
diff --git a/libpwrutils/bitset.h b/libpwrutils/bitset.h
index 358b71ee112f8237899eb058187b9bf9af632cb3..cec87c110e0f4cd1274dd145d21f92eb0f5fcd18 100644
--- a/libpwrutils/bitset.h
+++ b/libpwrutils/bitset.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_BITSET_H
diff --git a/libpwrutils/exception.cpp b/libpwrutils/exception.cpp
index 1efff594e1dba559464a4b725c8285739d956b4a..17c3e7284b76cef6416fc241a9f81e76edca6723 100644
--- a/libpwrutils/exception.cpp
+++ b/libpwrutils/exception.cpp
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libpwrutils/exception.h>
diff --git a/libpwrutils/exception.h b/libpwrutils/exception.h
index 8569a8a7c074f565f8ceaeae82ca80a0992d740b..74b1825b0bf56f1deee50a57199ee436355f16d6 100644
--- a/libpwrutils/exception.h
+++ b/libpwrutils/exception.h
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_EXCEPTION_H
diff --git a/libpwrutils/foreach.h b/libpwrutils/foreach.h
index ec329dbf35ddf2db7ef6cdc7eb8c8493d801e00e..71d0d191bd8d64bc14d675c6719702abe6ecacfc 100644
--- a/libpwrutils/foreach.h
+++ b/libpwrutils/foreach.h
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_FOREACH_H
diff --git a/libpwrutils/pathsearch.cpp b/libpwrutils/pathsearch.cpp
index 973e518c4d545d5fb0b9ad7d90eb6ca6b440ffcf..8bec6f8ae27bfee1d5f0c8bac66614ee9ea5f40c 100644
--- a/libpwrutils/pathsearch.cpp
+++ b/libpwrutils/pathsearch.cpp
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libpwrutils/pathsearch.h>
diff --git a/libpwrutils/pathsearch.h b/libpwrutils/pathsearch.h
index c33aaa7e677b5d84bd2f12bfeb71295b90a5b4a7..81c1999b968171d9100379f472e392801a4f5bb0 100644
--- a/libpwrutils/pathsearch.h
+++ b/libpwrutils/pathsearch.h
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_PATHSEARCH_H
diff --git a/libpwrutils/plugin.cpp b/libpwrutils/plugin.cpp
index 6fd73056227bc7fd1957d912202e5f926de66250..b0700ceea9c4d061266703034195639631c84780 100644
--- a/libpwrutils/plugin.cpp
+++ b/libpwrutils/plugin.cpp
@@ -1,3 +1,17 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+
+    This program 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 3 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 LICENCE, COPYING.LESSER and COPYING files for more details.
+*/
 #include <libpwrutils/plugin.h>
 #include <dlfcn.h>
 #include <iostream>
diff --git a/libpwrutils/plugin.h b/libpwrutils/plugin.h
index 42595308145acf8ea0d5000d3fd18f3298daed0d..f7f3d6545f2155fcb83fa145a7df8aeca008db4c 100644
--- a/libpwrutils/plugin.h
+++ b/libpwrutils/plugin.h
@@ -1,3 +1,18 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+
+    This program 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 3 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 LICENCE, COPYING.LESSER and COPYING files for more details.
+*/
+
 #ifndef LIBPWRNLP_PLUGIN_H
 #define LIBPWRNLP_PLUGIN_H
 
diff --git a/libpwrutils/plural.cpp b/libpwrutils/plural.cpp
index 092f5c721c2951f03ac12cc5a8a59c1a88223853..6e6800e90ab06625bb0fa0b71978ab89cf619cf6 100644
--- a/libpwrutils/plural.cpp
+++ b/libpwrutils/plural.cpp
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libpwrutils/plural.h>
diff --git a/libpwrutils/plural.h b/libpwrutils/plural.h
index 17a0ab6c46b4426712b8d0266ae2eaf8dc59602b..c4beb320297122abdf18d4b1b8645cce971b4e00 100644
--- a/libpwrutils/plural.h
+++ b/libpwrutils/plural.h
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_PLURAL_H
diff --git a/libpwrutils/sentence.h b/libpwrutils/sentence.h
index 0a39578d10b81eac054f884876115fd4072f564f..ce7daaf3c3c5ea2db66da9e3d50a9a323d7237ed 100644
--- a/libpwrutils/sentence.h
+++ b/libpwrutils/sentence.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_SENTENCE_H
diff --git a/libpwrutils/tokensource.h b/libpwrutils/tokensource.h
index 63342faf70c2fe1c0cee474a4b923aaca11448f9..0fcbaa1005649b385e810032444b6536aa711bf2 100644
--- a/libpwrutils/tokensource.h
+++ b/libpwrutils/tokensource.h
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_TOKENSOURCE_H
diff --git a/libpwrutils/typedefs_includes.in.h b/libpwrutils/typedefs_includes.in.h
index 6e1b3c3b4752d1690b8003aa0a629443bd33c13c..93bdaeacd460143a0842ed6512870bd1f1fa76b4 100644
--- a/libpwrutils/typedefs_includes.in.h
+++ b/libpwrutils/typedefs_includes.in.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 // no namespace or header guard, should not be used directly
diff --git a/libpwrutils/typedefs_typedefs.in.h b/libpwrutils/typedefs_typedefs.in.h
index c01d2cd72f44f723fb5ab2993a5f1c4a6481e86a..49baa166dcaa4b15650147353524c26c4e4d4ffe 100644
--- a/libpwrutils/typedefs_typedefs.in.h
+++ b/libpwrutils/typedefs_typedefs.in.h
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 // no namespace or header guard, should not be used directly
diff --git a/libpwrutils/util.cpp b/libpwrutils/util.cpp
index d3f1838bb3ca19ccfea6fce7644e521bbce9fe89..74f65a3c2bcaa56b47b3ce479627f1115a089511 100644
--- a/libpwrutils/util.cpp
+++ b/libpwrutils/util.cpp
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libpwrutils/util.h>
diff --git a/libpwrutils/util.h b/libpwrutils/util.h
index 52fdf1cac9bc480b52015f930bb82b0bc045cd1a..b309bd029d12d9fbc74c4e1edebe4acbdac68be2 100644
--- a/libpwrutils/util.h
+++ b/libpwrutils/util.h
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_UTIL_H
diff --git a/libpwrutils/whitespace.cpp b/libpwrutils/whitespace.cpp
index b736b0db0090c43ca946463badb66f7f6d423d36..65aa39d8028d482ff77d2ff6e29aab6da0c050c7 100644
--- a/libpwrutils/whitespace.cpp
+++ b/libpwrutils/whitespace.cpp
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <libpwrutils/whitespace.h>
diff --git a/libpwrutils/whitespace.h b/libpwrutils/whitespace.h
index 0ac086ebd9e317f553df93865e7c0ecb35cf26dc..d39b5544250ffb3b986584fc9f2503758859fa61 100644
--- a/libpwrutils/whitespace.h
+++ b/libpwrutils/whitespace.h
@@ -2,7 +2,7 @@
     Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
 
     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
+under the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -10,7 +10,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE. 
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENCE, COPYING.LESSER and COPYING files for more details.
 */
 
 #ifndef PWRNLP_WHITESPACE_H
diff --git a/poliqarp/c2pqtest.cpp b/poliqarp/c2pqtest.cpp
index 371567536a4c972877a2dfda1315f2cbc2fb33d2..523b1e9cb39ad6dcbc24d048d10202cb5169a214 100644
--- a/poliqarp/c2pqtest.cpp
+++ b/poliqarp/c2pqtest.cpp
@@ -1,3 +1,19 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    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 3 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 LICENSE.POLIQARP and COPYING files for more details.
+*/
+
 #include "pqclient.h"
 #include <libcorpus2/tagsetmanager.h>
 #include <iostream>
diff --git a/poliqarp/pqclient.cpp b/poliqarp/pqclient.cpp
index 90f1e91f4faea20503944a9c173f854031f63fe5..949882dc5cd9cf02e07df0211d6848fa3a860477 100644
--- a/poliqarp/pqclient.cpp
+++ b/poliqarp/pqclient.cpp
@@ -1,3 +1,18 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    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 3 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 LICENSE.POLIQARP and COPYING files for more details.
+*/
 #include "pqclient.h"
 #include <boost/make_shared.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/poliqarp/pqclient.h b/poliqarp/pqclient.h
index 266186e693f5fbd6133f7767552fa5acf72363a9..93cc5eeeefdc54c55bffb75680b7e57d412af67f 100644
--- a/poliqarp/pqclient.h
+++ b/poliqarp/pqclient.h
@@ -1,3 +1,18 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    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 3 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 LICENSE.POLIQARP and COPYING files for more details.
+*/
 #ifndef CORPUS2_POLIQARP_PQCLIENT_H
 #define CORPUS2_POLIQARP_PQCLIENT_H
 
diff --git a/poliqarp/pqreader.cpp b/poliqarp/pqreader.cpp
index 2fb4c83fbe34293ec40e1546e059563e57c33df6..8ab186d28d33a14b9bb80944f625fb3f4911ee3a 100644
--- a/poliqarp/pqreader.cpp
+++ b/poliqarp/pqreader.cpp
@@ -1,3 +1,18 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    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 3 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 LICENSE.POLIQARP and COPYING files for more details.
+*/
 #include "pqreader.h"
 #include "pqclient.h"
 
diff --git a/poliqarp/pqreader.h b/poliqarp/pqreader.h
index e7dc398623070a0b54194d6a91cdf5f393ebb44d..e8d6d92a1ba2f445ab5dc5ce24682165a7eab5e3 100644
--- a/poliqarp/pqreader.h
+++ b/poliqarp/pqreader.h
@@ -1,3 +1,18 @@
+/*
+    Copyright (C) 2010 Tomasz Åšniatowski, Adam Radziszewski
+    Part of the libcorpus2 project
+
+    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 3 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 LICENSE.POLIQARP and COPYING files for more details.
+*/
 #ifndef LIBSORPUS2_PQREADER_H
 #define LIBCORPUS2_PQREADER_H
 
diff --git a/tests/ann_basic.cpp b/tests/ann_basic.cpp
index 5a4204b7baf6fb38e0b4bf19992e61cea697fb25..bfef410af81e37ec0622538a7407b5c39f95d7c9 100644
--- a/tests/ann_basic.cpp
+++ b/tests/ann_basic.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU General Lesser Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/basic.cpp b/tests/basic.cpp
index 2c449ed4917eb825b6b0dc7ac8c74863e9528e2a..41c14e626d1e7916782dfb3457ded2bc4d40f6e1 100644
--- a/tests/basic.cpp
+++ b/tests/basic.cpp
@@ -3,15 +3,15 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU General Lesser Public License as published by the Free
 Software Foundation; either version 3 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. 
+or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/io.cpp b/tests/io.cpp
index f302a6f50e175b720189a8a8786aae5225dd8504..31258d038d3fe052a4b899f3bfd0888b221e9215 100644
--- a/tests/io.cpp
+++ b/tests/io.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU General Lesser Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/ioann.cpp b/tests/ioann.cpp
index 963bfe05aace469f6e439ae2dbc9c27f41e5e728..223f64c26ad08c8db482340574950b27a5767618 100644
--- a/tests/ioann.cpp
+++ b/tests/ioann.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU General Lesser Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,7 +11,7 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/main.cpp b/tests/main.cpp
index b44bf211b05be826cef51e32b457cd410fe6a25c..89e53f6351408e03b56305664045aad27d334738 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -3,15 +3,15 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU General Lesser Public License as published by the Free
 Software Foundation; either version 3 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. 
+or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #define BOOST_TEST_MODULE master
diff --git a/tests/tag_split.cpp b/tests/tag_split.cpp
index 78c50fa8a1408179a19ef13ad68aa1996a67ac21..51dfd6bd88a720d16ce26ed721390191963139cd 100644
--- a/tests/tag_split.cpp
+++ b/tests/tag_split.cpp
@@ -3,15 +3,15 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU General Lesser Public License as published by the Free
 Software Foundation; either version 3 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. 
+or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/tagset_parse.cpp b/tests/tagset_parse.cpp
index d7099d1f486a57369b3f3f50c3181425df0da5b0..0600cf40dd073b9946152f4b5fe63840252e95d5 100644
--- a/tests/tagset_parse.cpp
+++ b/tests/tagset_parse.cpp
@@ -3,15 +3,15 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU General Lesser Public License as published by the Free
 Software Foundation; either version 3 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. 
+or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/tokenmetadata.cpp b/tests/tokenmetadata.cpp
index 1601226a27918efb7be1ccff0604876d5ac213d6..a43627585794f5140d131c9d4d4c07363903dff2 100644
--- a/tests/tokenmetadata.cpp
+++ b/tests/tokenmetadata.cpp
@@ -3,7 +3,7 @@
     Part of the libcorpus2 project
 
     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
+under the terms of the GNU General Lesser Public License as published by the Free
 Software Foundation; either version 3 of the License, or (at your option)
 any later version.
 
@@ -11,9 +11,8 @@ any later version.
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 
-    See the LICENSE and COPYING files for more details.
+    See the LICENSE.CORPUS2, POLIQARP, COPYING.LESSER and COPYING files for more details.
 */
-
 #include <boost/test/unit_test.hpp>
 #include <libcorpus2/token.h>
 #include <libcorpus2/tokenmetadata.h>
diff --git a/utils/chunk_eval.py b/utils/chunk_eval.py
index bbac1b2e677967d0976ce441293cd5058d490b80..35e863fbdb713fcd5793d885ffe42ad2232f682f 100755
--- a/utils/chunk_eval.py
+++ b/utils/chunk_eval.py
@@ -1,6 +1,18 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+# Copyright (C) 2012 Adam Radziszewski.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 descr = """%prog [options] CHUNKED REF CHAN_NAME
 
 Reads the two chunk-annotated corpora: CHUNKED (chunker output) and REF
diff --git a/utils/corpspace.py b/utils/corpspace.py
index ac3b429a7159152aff331686f52141a012064342..04a44ffdfc5cc25ee588f106e592357e90c8f6fc 100755
--- a/utils/corpspace.py
+++ b/utils/corpspace.py
@@ -1,6 +1,18 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+# Copyright (C) 2012 Adam Radziszewski.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 from optparse import OptionParser
 import sys
 import corpus2
diff --git a/utils/corptext.py b/utils/corptext.py
index a2c8081d7ac402da3fe6909ac6709bf0a230a9bc..f5bfe31e786380629390ffc5bb28cc0b6d345eea 100755
--- a/utils/corptext.py
+++ b/utils/corptext.py
@@ -1,5 +1,18 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
+
+# Copyright (C) 2012 Adam Radziszewski.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 descr = """%prog [options] INPUT OUTPUT
 
 Reads input and saves as plain text. By default, paragraphs are separated with
diff --git a/utils/get_held_out.pl b/utils/get_held_out.pl
index 62b7baf44748c13a1f2977df653ca6f78267faea..e16272151deffebae4bf1be3d7f7ab10770d5ca0 100755
--- a/utils/get_held_out.pl
+++ b/utils/get_held_out.pl
@@ -1,5 +1,17 @@
 #!/usr/bin/perl
 
+# Copyright (C) 2012 Paweł Orłowicz.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 #Assume that SOURCE_DIR contains pairs of files ccl-NAME.xml.* + rel-NAME.xml
 #According to the measure: option -n NUMBER_OF_DOCUMENTS_TO_HOLD_OUT or RATIO percentage of all documents to be hold out
 #copy appropriate number of documents (1 document == 1 pair (ccl-NAME.xml.* + rel-NAME.xml) into HELD_OUT_PART_DIR
diff --git a/utils/parfolds.py b/utils/parfolds.py
index d10ed210957322185d0d487ec5ce961e082d3123..e49b8e0fd6eb43fa5cfe234fd9d087f8ceca25b2 100755
--- a/utils/parfolds.py
+++ b/utils/parfolds.py
@@ -1,5 +1,18 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
+
+# Copyright (C) 2012 Adam Radziszewski.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 descr = """%prog [options] INPUT OUTDIR
 
 Generates paragraph-wise folds."""
diff --git a/utils/relation_eval.py b/utils/relation_eval.py
index 7c5faba56cf941623b797a8c6b9c405c8367d0e2..4067051f9c989a1b69e8a6e3c0df0d81b06e9959 100755
--- a/utils/relation_eval.py
+++ b/utils/relation_eval.py
@@ -1,5 +1,17 @@
 #!/usr/bin/python
 
+# Copyright (C) 2012 Paweł Orłowicz.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 descr = """%prog [options] BATCH_REF BATCH_TARGET REL_NAME
 
 Reads the two files BATCH_REF and BATCH_TARGET which contain lists of pairs 
@@ -133,6 +145,11 @@ def compare(rel1, rel2) :
 	elif cmp(dp1_to.annotation_number(), dp2_to.annotation_number()) > 0 : 
 		return 1
 
+	if rel1.rel_name() < rel2.rel_name():
+		return -1
+	elif rel1.rel_name() > rel2.rel_name():
+		return 1
+
 	return 0
 
 def go():
diff --git a/utils/split.pl b/utils/split.pl
index 7b9dd8779a496d255b3a99a9dc849078b917f9c7..8c54499707e44b23480fa3a06c759a3f3ce645f0 100755
--- a/utils/split.pl
+++ b/utils/split.pl
@@ -1,5 +1,17 @@
 #!/usr/bin/perl
 
+# Copyright (C) 2012 Paweł Orłowicz.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 #Process all xml files in SOURCE_DIR assuming that it contains files which consist of ccl+rel part.
 #Separate each file into ccl-file and rel-file and place them into TARGET_DIR 
 #(don't empty the TARGET_DIR, just add new files; it's up to the user to empty the TARGET_DIR)
diff --git a/utils/swapchans.pl b/utils/swapchans.pl
index 04c3e4c92754997e4a294c801b98cd834cef0f13..1035816bbae8e58ab482e977fc9ee7854cef3e3d 100755
--- a/utils/swapchans.pl
+++ b/utils/swapchans.pl
@@ -1,5 +1,17 @@
 #!/usr/bin/perl
 
+# Copyright (C) 2012 Paweł Orłowicz.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 #Script takes two arguments: corpus directory (DIR) and relation name (REL) that is going to be swapped.  
 #In all files within DIR swap direction of all relations with name REL by swapping chan attributes of nodes: <from> and <to>  and it's text nodes
 #e.g. 
diff --git a/utils/tagger-eval.py b/utils/tagger-eval.py
index 5a32f016dbe199db7fd96502733770b0a137edc3..6a2c406c9621254d6675b5b5d37db88353759f6f 100755
--- a/utils/tagger-eval.py
+++ b/utils/tagger-eval.py
@@ -1,6 +1,18 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+# Copyright (C) 2011 Adam Radziszewski.
+# This program is free software; you can redistribute and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 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 LICENCE and COPYING files for more details
+
 from optparse import OptionParser
 import sys
 import corpus2