diff --git a/common/argparse.c b/common/argparse.c
index fbe8a37ff..2540894f0 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -4,8 +4,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/argparse.h b/common/argparse.h
index 81e881dfc..d75b49fbd 100644
--- a/common/argparse.h
+++ b/common/argparse.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/dotlock.c b/common/dotlock.c
index 5fe652ec0..cbbd0f3f9 100644
--- a/common/dotlock.c
+++ b/common/dotlock.c
@@ -4,8 +4,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/dotlock.h b/common/dotlock.h
index 78a7e73aa..03131bb0c 100644
--- a/common/dotlock.h
+++ b/common/dotlock.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/dynload.h b/common/dynload.h
index 61930d26b..54a47b219 100644
--- a/common/dynload.h
+++ b/common/dynload.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/logging.c b/common/logging.c
index 97f081310..18c40b362 100644
--- a/common/logging.c
+++ b/common/logging.c
@@ -4,8 +4,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/logging.h b/common/logging.h
index 515d85038..e1bf56b17 100644
--- a/common/logging.h
+++ b/common/logging.h
@@ -4,8 +4,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/mischelp.c b/common/mischelp.c
index fd8f67502..75ba60714 100644
--- a/common/mischelp.c
+++ b/common/mischelp.c
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/mischelp.h b/common/mischelp.h
index 1ad146eb3..18ec96edf 100644
--- a/common/mischelp.h
+++ b/common/mischelp.h
@@ -4,8 +4,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/stringhelp.c b/common/stringhelp.c
index dea2212c4..341dd525b 100644
--- a/common/stringhelp.c
+++ b/common/stringhelp.c
@@ -6,8 +6,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/stringhelp.h b/common/stringhelp.h
index d0156d55e..3852d0fe3 100644
--- a/common/stringhelp.h
+++ b/common/stringhelp.h
@@ -5,8 +5,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/strlist.c b/common/strlist.c
index 02881cd2a..6feb3a45a 100644
--- a/common/strlist.c
+++ b/common/strlist.c
@@ -4,8 +4,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/strlist.h b/common/strlist.h
index d74bc4dbb..641ea06cb 100644
--- a/common/strlist.h
+++ b/common/strlist.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-stringhelp.c b/common/t-stringhelp.c
index d86d896f6..a105ad1bc 100644
--- a/common/t-stringhelp.c
+++ b/common/t-stringhelp.c
@@ -4,8 +4,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-strlist.c b/common/t-strlist.c
index bd835ca87..fdbeb9b99 100644
--- a/common/t-strlist.c
+++ b/common/t-strlist.c
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-support.c b/common/t-support.c
index 8ed0a6279..fc4bd4b4f 100644
--- a/common/t-support.c
+++ b/common/t-support.c
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-support.h b/common/t-support.h
index 5449a5646..7aa46c00c 100644
--- a/common/t-support.h
+++ b/common/t-support.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-timestuff.c b/common/t-timestuff.c
index 1e524f538..6a75925a5 100644
--- a/common/t-timestuff.c
+++ b/common/t-timestuff.c
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-w32-reg.c b/common/t-w32-reg.c
index 48ea0d4dd..01816db54 100644
--- a/common/t-w32-reg.c
+++ b/common/t-w32-reg.c
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/types.h b/common/types.h
index 7d85a3594..8e551df46 100644
--- a/common/types.h
+++ b/common/types.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/utf8conv.c b/common/utf8conv.c
index d26eff005..d2c282002 100644
--- a/common/utf8conv.c
+++ b/common/utf8conv.c
@@ -4,8 +4,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/utf8conv.h b/common/utf8conv.h
index 1c6c5840e..8b76e1136 100644
--- a/common/utf8conv.h
+++ b/common/utf8conv.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/util.h b/common/util.h
index f7a53e160..4e871d289 100644
--- a/common/util.h
+++ b/common/util.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/w32-reg.c b/common/w32-reg.c
index 2d64215fe..d8d94b90e 100644
--- a/common/w32-reg.c
+++ b/common/w32-reg.c
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
diff --git a/common/w32help.h b/common/w32help.h
index e495e341a..177efbc9f 100644
--- a/common/w32help.h
+++ b/common/w32help.h
@@ -3,8 +3,8 @@
  *
  * This file is part of GnuPG.
  *
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at