diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index df96f409cc..248f61774a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,72 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-14 05:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/codepage/cp_tpl.c
+  * src/codepage/cpbg866.c
+  * src/codepage/cpbgiso.c
+  * src/codepage/cpbgmik.c
+  * src/codepage/cpbgwin.c
+  * src/codepage/cpcs852.c
+  * src/codepage/cpcsiso.c
+  * src/codepage/cpcskam.c
+  * src/codepage/cpcswin.c
+  * src/codepage/cpdeiso.c
+  * src/codepage/cpdewin.c
+  * src/codepage/cpel737.c
+  * src/codepage/cpeliso.c
+  * src/codepage/cpelwin.c
+  * src/codepage/cpes850.c
+  * src/codepage/cpesiso.c
+  * src/codepage/cpeswin.c
+  * src/codepage/cpeswinm.c
+  * src/codepage/cpfriso.c
+  * src/codepage/cpfrwin.c
+  * src/codepage/cphr437.c
+  * src/codepage/cphr852.c
+  * src/codepage/cphrwin.c
+  * src/codepage/cphuiso.c
+  * src/codepage/cphuwin.c
+  * src/codepage/cpit437.c
+  * src/codepage/cpitisb.c
+  * src/codepage/cpitiso.c
+  * src/codepage/cpitwin.c
+  * src/codepage/cpltwin.c
+  * src/codepage/cppl852.c
+  * src/codepage/cppliso.c
+  * src/codepage/cpplmaz.c
+  * src/codepage/cpplwin.c
+  * src/codepage/cppt850.c
+  * src/codepage/cpptiso.c
+  * src/codepage/cpro852.c
+  * src/codepage/cproiso.c
+  * src/codepage/cprowin.c
+  * src/codepage/cpru866.c
+  * src/codepage/cpruiso.c
+  * src/codepage/cprukoi.c
+  * src/codepage/cpruwin.c
+  * src/codepage/cpsk852.c
+  * src/codepage/cpskiso.c
+  * src/codepage/cpskkam.c
+  * src/codepage/cpskwin.c
+  * src/codepage/cpsl437.c
+  * src/codepage/cpsl852.c
+  * src/codepage/cpsliso.c
+  * src/codepage/cpslwin.c
+  * src/codepage/cpsrwin.c
+  * src/codepage/cpsv437c.c
+  * src/codepage/cpsviso.c
+  * src/codepage/cpsvwin.c
+  * src/codepage/cptr857.c
+  * src/codepage/cptriso.c
+  * src/codepage/cptrwin.c
+  * src/codepage/cpua1125.c
+  * src/codepage/cpua866.c
+  * src/codepage/cpuakoi.c
+  * src/codepage/cpuawin.c
+  * src/codepage/Makefile
+    % Deleted now redundant comments.
+
 2009-11-14 04:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/codepage/cpde850.c
   * src/codepage/cpes850c.c
diff --git a/harbour/src/codepage/Makefile b/harbour/src/codepage/Makefile
index 291fd2acf8..9e969ecb50 100644
--- a/harbour/src/codepage/Makefile
+++ b/harbour/src/codepage/Makefile
@@ -87,6 +87,7 @@ C_SOURCES := \
    cpua866.c \
    cpuakoi.c \
    cpuawin.c \
+   \
    uc1125.c \
    uc1250.c \
    uc1251.c \
diff --git a/harbour/src/codepage/cp_tpl.c b/harbour/src/codepage/cp_tpl.c
index dbd8895456..11a2a9c80a 100644
--- a/harbour/src/codepage/cp_tpl.c
+++ b/harbour/src/codepage/cp_tpl.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: <Your language> */
-/* ISO language code (2 chars): (please look it up in /doc/lang_id.txt) */
-/* Codepage: <Your codepage> */
-
 /*
    If accented characters need special sorting ( HB_CDP_ACSORT_EQUAL or
    HB_CDP_ACSORT_INTERLEAVE ) then you need to mark the accented characters
diff --git a/harbour/src/codepage/cpbg866.c b/harbour/src/codepage/cpbg866.c
index b3e364236a..f09cac90f3 100644
--- a/harbour/src/codepage/cpbg866.c
+++ b/harbour/src/codepage/cpbg866.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Bulgarian */
-/* ISO language code (2 chars): BG */
-/* Codepage: CP-866 */
-
 #define HB_CP_ID        BG866
 #define HB_CP_INFO      "Bulgarian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
diff --git a/harbour/src/codepage/cpbgiso.c b/harbour/src/codepage/cpbgiso.c
index 784a4027d6..102ee3bce4 100644
--- a/harbour/src/codepage/cpbgiso.c
+++ b/harbour/src/codepage/cpbgiso.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Bulgarian */
-/* ISO language code (2 chars): BG */
-/* Codepage: ISO-8859-5 */
-
 #define HB_CP_ID        BGISO
 #define HB_CP_INFO      "Bulgarian ISO-8859-5"
 #define HB_CP_UNITB     HB_UNITB_8859_5
diff --git a/harbour/src/codepage/cpbgmik.c b/harbour/src/codepage/cpbgmik.c
index 1b10e2e9d4..03d4b00827 100644
--- a/harbour/src/codepage/cpbgmik.c
+++ b/harbour/src/codepage/cpbgmik.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Bulgarian */
-/* ISO language code (2 chars): BG */
-/* Codepage: MIK */
-
 #define HB_CP_ID        BGMIK
 #define HB_CP_INFO      "Bulgarian MIK"
 #define HB_CP_UNITB     HB_UNITB_MIK
diff --git a/harbour/src/codepage/cpbgwin.c b/harbour/src/codepage/cpbgwin.c
index 74ec677644..48af63adfa 100644
--- a/harbour/src/codepage/cpbgwin.c
+++ b/harbour/src/codepage/cpbgwin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Bulgarian */
-/* ISO language code (2 chars): BG */
-/* Codepage: Windows-1251 */
-
 #define HB_CP_ID        BGWIN
 #define HB_CP_INFO      "Bulgarian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
diff --git a/harbour/src/codepage/cpcs852.c b/harbour/src/codepage/cpcs852.c
index 4820f75ecc..c28057c2ed 100644
--- a/harbour/src/codepage/cpcs852.c
+++ b/harbour/src/codepage/cpcs852.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Czech */
-/* ISO language code (2 chars): CS */
-/* Codepage: 852 */
-
 #define HB_CP_ID        CS852
 #define HB_CP_INFO      "Czech CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
diff --git a/harbour/src/codepage/cpcsiso.c b/harbour/src/codepage/cpcsiso.c
index 808e95d0ce..4be9d33a44 100644
--- a/harbour/src/codepage/cpcsiso.c
+++ b/harbour/src/codepage/cpcsiso.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Czech */
-/* ISO language code (2 chars): CS */
-/* Codepage: ISO-8859-2 */
-
 #define HB_CP_ID        CSISO
 #define HB_CP_INFO      "Czech ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
diff --git a/harbour/src/codepage/cpcskam.c b/harbour/src/codepage/cpcskam.c
index 27ae874246..eb99d314cd 100644
--- a/harbour/src/codepage/cpcskam.c
+++ b/harbour/src/codepage/cpcskam.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Czech */
-/* ISO language code (2 chars): CS */
-/* Codepage: 895(KAM) */
-
 #define HB_CP_ID        CSKAM
 #define HB_CP_INFO      "Czech Kamenicky (895)"
 #define HB_CP_UNITB     HB_UNITB_KAM
diff --git a/harbour/src/codepage/cpcswin.c b/harbour/src/codepage/cpcswin.c
index 8e76563873..d7f57922ac 100644
--- a/harbour/src/codepage/cpcswin.c
+++ b/harbour/src/codepage/cpcswin.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Czech */
-/* ISO language code (2 chars): CS */
-/* Codepage: Windows-1250 */
-
 #define HB_CP_ID        CSWIN
 #define HB_CP_INFO      "Czech Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
diff --git a/harbour/src/codepage/cpdeiso.c b/harbour/src/codepage/cpdeiso.c
index 8d5d98c89c..dc0f89350b 100644
--- a/harbour/src/codepage/cpdeiso.c
+++ b/harbour/src/codepage/cpdeiso.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: German */
-/* ISO language code (2 chars): DE (please look it up in /doc/lang_id.txt) */
-/* Codepage: ISO-8859-1 */
-
 #define HB_CP_ID        DEISO
 #define HB_CP_INFO      "German ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
diff --git a/harbour/src/codepage/cpdewin.c b/harbour/src/codepage/cpdewin.c
index 8d246de2a8..3c7c4da95f 100644
--- a/harbour/src/codepage/cpdewin.c
+++ b/harbour/src/codepage/cpdewin.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: German */
-/* ISO language code (2 chars): DE (please look it up in /doc/lang_id.txt) */
-/* Codepage: Windows-1252 */
-
 #define HB_CP_ID        DEWIN
 #define HB_CP_INFO      "German Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
diff --git a/harbour/src/codepage/cpel737.c b/harbour/src/codepage/cpel737.c
index 1e0122e006..70ba0e100d 100644
--- a/harbour/src/codepage/cpel737.c
+++ b/harbour/src/codepage/cpel737.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: <Greek dos> */
-/* ISO language code (2 chars): EL */
-/* Codepage: 737 */
-
 #define HB_CP_ID        EL737
 #define HB_CP_INFO      "Greek DOS CP-737"
 #define HB_CP_UNITB     HB_UNITB_737
diff --git a/harbour/src/codepage/cpeliso.c b/harbour/src/codepage/cpeliso.c
index 23b3813a8b..15142fcddf 100644
--- a/harbour/src/codepage/cpeliso.c
+++ b/harbour/src/codepage/cpeliso.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Greek */
-/* ISO language code (2 chars): EL */
-/* Codepage: ISO-8859-7 */
-
 #define HB_CP_ID        ELISO
 #define HB_CP_INFO      "Greek ISO-8859-7"
 #define HB_CP_UNITB     HB_UNITB_8859_7
diff --git a/harbour/src/codepage/cpelwin.c b/harbour/src/codepage/cpelwin.c
index 791187dde1..a2d5285b7a 100644
--- a/harbour/src/codepage/cpelwin.c
+++ b/harbour/src/codepage/cpelwin.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Greek WIN*/
-/* ISO language code (2 chars): EL */
-/* Codepage: ANSI (1253) */
-
 #define HB_CP_ID        ELWIN
 #define HB_CP_INFO      "Greek ANSI CP-1253"
 #define HB_CP_UNITB     HB_UNITB_1253
diff --git a/harbour/src/codepage/cpes850.c b/harbour/src/codepage/cpes850.c
index aa8eeffcad..932e9fbcca 100644
--- a/harbour/src/codepage/cpes850.c
+++ b/harbour/src/codepage/cpes850.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Spanish (Modern)*/
-/* ISO language code (2 chars): ES */
-/* Codepage: 850 */
-
 #define HB_CP_ID        ES850
 #define HB_CP_INFO      "Spanish (Modern) CP-850"
 #define HB_CP_UNITB     HB_UNITB_850
diff --git a/harbour/src/codepage/cpesiso.c b/harbour/src/codepage/cpesiso.c
index 44c0797021..b51f725e7e 100644
--- a/harbour/src/codepage/cpesiso.c
+++ b/harbour/src/codepage/cpesiso.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Spanish (Modern)*/
-/* ISO language code (2 chars): ES */
-/* Codepage: ISO-8859-1 */
-
 #define HB_CP_ID        ESISO
 #define HB_CP_INFO      "Spanish (Modern) ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
diff --git a/harbour/src/codepage/cpeswin.c b/harbour/src/codepage/cpeswin.c
index f60ed9c4d0..f7b2bf86b0 100644
--- a/harbour/src/codepage/cpeswin.c
+++ b/harbour/src/codepage/cpeswin.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Spanish (Modern)*/
-/* ISO language code (2 chars): ES */
-/* Codepage: Windows-1252 */
-
 #define HB_CP_ID        ESWIN
 #define HB_CP_INFO      "Spanish (Modern) Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
diff --git a/harbour/src/codepage/cpeswinm.c b/harbour/src/codepage/cpeswinm.c
index 368786830e..198c675ec7 100644
--- a/harbour/src/codepage/cpeswinm.c
+++ b/harbour/src/codepage/cpeswinm.c
@@ -52,10 +52,6 @@
  *
  */
 
-/* Language name: Spanish (Modern)*/
-/* ISO language code (2 chars): ES */
-/* Codepage: ISO-8859-1 */
-
 #define HB_CP_ID        ESMWIN
 #define HB_CP_INFO      "Spanish (Modern) ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
diff --git a/harbour/src/codepage/cpfriso.c b/harbour/src/codepage/cpfriso.c
index beaf808bf2..216b18e46b 100644
--- a/harbour/src/codepage/cpfriso.c
+++ b/harbour/src/codepage/cpfriso.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: French */
-/* ISO language code (2 chars): FR */
-/* Codepage: ISO-8859-1 */
-
 #define HB_CP_ID        FRISO
 #define HB_CP_INFO      "French ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
diff --git a/harbour/src/codepage/cpfrwin.c b/harbour/src/codepage/cpfrwin.c
index 4b9d9f2a63..e1a1dc3837 100644
--- a/harbour/src/codepage/cpfrwin.c
+++ b/harbour/src/codepage/cpfrwin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: French */
-/* ISO language code (2 chars): FR */
-/* Codepage: Windows-1252 */
-
 #define HB_CP_ID        FRWIN
 #define HB_CP_INFO      "French Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
diff --git a/harbour/src/codepage/cphr437.c b/harbour/src/codepage/cphr437.c
index 78490a2644..999fb777c6 100644
--- a/harbour/src/codepage/cphr437.c
+++ b/harbour/src/codepage/cphr437.c
@@ -50,12 +50,8 @@
  *
  */
 
-/* Language name: Croatien */
-/* ISO language code (2 chars): HR */
-/* Codepage: 437 */
-
 #define HB_CP_ID        HR437
-#define HB_CP_INFO      "Croatien CP-437"
+#define HB_CP_INFO      "Croatian CP-437"
 #define HB_CP_UNITB     HB_UNITB_437
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_UPPER     "ABC^]D\\EFGHIJKLMNOPQRS[TUVWZ@XY"
diff --git a/harbour/src/codepage/cphr852.c b/harbour/src/codepage/cphr852.c
index 1c8514076f..5378ad7f4d 100644
--- a/harbour/src/codepage/cphr852.c
+++ b/harbour/src/codepage/cphr852.c
@@ -52,12 +52,8 @@
  *
  */
 
-/* Language name: Croatien */
-/* ISO language code (2 chars): HR */
-/* Codepage: 852 */
-
 #define HB_CP_ID        HR852
-#define HB_CP_INFO      "Croatien CP-852"
+#define HB_CP_INFO      "Croatian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_UPPER     "ABC¬�DÑEFGHIJKLMNOPQRSæTUVWZ¦XY"
diff --git a/harbour/src/codepage/cphrwin.c b/harbour/src/codepage/cphrwin.c
index 5d086552ac..5bbb235261 100644
--- a/harbour/src/codepage/cphrwin.c
+++ b/harbour/src/codepage/cphrwin.c
@@ -52,12 +52,8 @@
  *
  */
 
-/* Language name: Croatien */
-/* ISO language code (2 chars): HR */
-/* Codepage: Windows-1250 */
-
 #define HB_CP_ID        HRWIN
-#define HB_CP_INFO      "Croatien Windows-1250"
+#define HB_CP_INFO      "Croatian Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
 #define HB_CP_UPPER     "ABCÈÆDÐEFGHIJKLMNOPQRSŠTUVWZŽXY"
diff --git a/harbour/src/codepage/cphuiso.c b/harbour/src/codepage/cphuiso.c
index 564141781f..24dc5aef59 100644
--- a/harbour/src/codepage/cphuiso.c
+++ b/harbour/src/codepage/cphuiso.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Hungarian */
-/* ISO language code (2 chars): HU */
-/* Codepage: ISO-8859-2 */
-
 /* NOTE: Ä/ä has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */
 
 #define HB_CP_ID        HUISO
diff --git a/harbour/src/codepage/cphuwin.c b/harbour/src/codepage/cphuwin.c
index ca0589711d..556df1e4bf 100644
--- a/harbour/src/codepage/cphuwin.c
+++ b/harbour/src/codepage/cphuwin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Hungarian */
-/* ISO language code (2 chars): HU */
-/* Codepage: Windows-1250 */
-
 /* NOTE: Ä/ä has been added to work like sixhu852.obj for S*ccessWare SIx Driver. [vszakats] */
 
 #define HB_CP_ID        HUWIN
diff --git a/harbour/src/codepage/cpit437.c b/harbour/src/codepage/cpit437.c
index e64e56841a..03e22d7ec3 100644
--- a/harbour/src/codepage/cpit437.c
+++ b/harbour/src/codepage/cpit437.c
@@ -49,10 +49,6 @@
  *
  */
 
-/* Language name: Italian */
-/* ISO language code (2 chars): IT */
-/* Codepage: 437 */
-
 #define HB_CP_ID        IT437
 #define HB_CP_INFO      "Italian CP-437"
 #define HB_CP_UNITB     HB_UNITB_437
diff --git a/harbour/src/codepage/cpitisb.c b/harbour/src/codepage/cpitisb.c
index f268081cdb..5e5d7f39c4 100644
--- a/harbour/src/codepage/cpitisb.c
+++ b/harbour/src/codepage/cpitisb.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Italian */
-/* ISO language code (2 chars): IT */
-/* Codepage: ISO-8859-1b (with BOX characters) */
-
 #define HB_CP_ID        ITISB
 #define HB_CP_INFO      "Italian ISO-8859-1b (with BOX characters)"
 #define HB_CP_UNITB     HB_UNITB_8859_1B
diff --git a/harbour/src/codepage/cpitiso.c b/harbour/src/codepage/cpitiso.c
index 827b7c3838..83558cd3d9 100644
--- a/harbour/src/codepage/cpitiso.c
+++ b/harbour/src/codepage/cpitiso.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Italian */
-/* ISO language code (2 chars): IT */
-/* Codepage: ISO-8859-1 */
-
 #define HB_CP_ID        ITISO
 #define HB_CP_INFO      "Italian ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
diff --git a/harbour/src/codepage/cpitwin.c b/harbour/src/codepage/cpitwin.c
index 165c6c9d40..26f6b8a690 100644
--- a/harbour/src/codepage/cpitwin.c
+++ b/harbour/src/codepage/cpitwin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Italian */
-/* ISO language code (2 chars): IT */
-/* Codepage: Windows-1252 */
-
 #define HB_CP_ID        ITWIN
 #define HB_CP_INFO      "Italian Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
diff --git a/harbour/src/codepage/cpltwin.c b/harbour/src/codepage/cpltwin.c
index 677b50d905..4a57b40756 100644
--- a/harbour/src/codepage/cpltwin.c
+++ b/harbour/src/codepage/cpltwin.c
@@ -52,10 +52,6 @@
  *
  */
 
-/* Language name: Lithuanian */
-/* ISO language code (2 chars): LT */
-/* Codepage: Windows-1257 */
-
 #define HB_CP_ID        LTWIN
 #define HB_CP_INFO      "Lithuanian Windows-1257"
 #define HB_CP_UNITB     HB_UNITB_1257
diff --git a/harbour/src/codepage/cppl852.c b/harbour/src/codepage/cppl852.c
index eac83f7c03..928a487e6a 100644
--- a/harbour/src/codepage/cppl852.c
+++ b/harbour/src/codepage/cppl852.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Polish */
-/* ISO language code (2 chars): PL */
-/* Codepage: 852 */
-
 #define HB_CP_ID        PL852
 #define HB_CP_INFO      "Polish CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
diff --git a/harbour/src/codepage/cppliso.c b/harbour/src/codepage/cppliso.c
index b96934dc1f..ef89a67226 100644
--- a/harbour/src/codepage/cppliso.c
+++ b/harbour/src/codepage/cppliso.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Polish */
-/* ISO language code (2 chars): PL */
-/* Codepage: ISO-8859-2 */
-
 #define HB_CP_ID        PLISO
 #define HB_CP_INFO      "Polish ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
diff --git a/harbour/src/codepage/cpplmaz.c b/harbour/src/codepage/cpplmaz.c
index 92600b22dd..a95a4daea5 100644
--- a/harbour/src/codepage/cpplmaz.c
+++ b/harbour/src/codepage/cpplmaz.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Polish */
-/* ISO language code (2 chars): PL */
-/* Codepage: Mazovia */
-
 #define HB_CP_ID        PLMAZ
 #define HB_CP_INFO      "Polish Mazovia"
 #define HB_CP_UNITB     HB_UNITB_MAZ
diff --git a/harbour/src/codepage/cpplwin.c b/harbour/src/codepage/cpplwin.c
index eddd3e6579..86dce6aee5 100644
--- a/harbour/src/codepage/cpplwin.c
+++ b/harbour/src/codepage/cpplwin.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Polish */
-/* ISO language code (2 chars): PL */
-/* Codepage: Windows-1250 */
-
 #define HB_CP_ID        PLWIN
 #define HB_CP_INFO      "Polish Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
diff --git a/harbour/src/codepage/cppt850.c b/harbour/src/codepage/cppt850.c
index fd16cad205..db0f147205 100644
--- a/harbour/src/codepage/cppt850.c
+++ b/harbour/src/codepage/cppt850.c
@@ -52,10 +52,6 @@
  *
  */
 
-/* Language name: Portuguese       */
-/* ISO language code (2 chars): PT */
-/* Codepage: 850                   */
-
 #define HB_CP_ID        PT850
 #define HB_CP_INFO      "Portuguese CP-850"
 #define HB_CP_UNITB     HB_UNITB_850
diff --git a/harbour/src/codepage/cpptiso.c b/harbour/src/codepage/cpptiso.c
index d24298a14a..c464105420 100644
--- a/harbour/src/codepage/cpptiso.c
+++ b/harbour/src/codepage/cpptiso.c
@@ -52,10 +52,6 @@
  *
  */
 
-/* Language name: Portuguese       */
-/* ISO language code (2 chars): PT */
-/* Codepage: iso-8859-1            */
-
 #define HB_CP_ID        PTISO
 #define HB_CP_INFO      "Portuguese ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
diff --git a/harbour/src/codepage/cpro852.c b/harbour/src/codepage/cpro852.c
index 2a7361c8a4..a277d97394 100644
--- a/harbour/src/codepage/cpro852.c
+++ b/harbour/src/codepage/cpro852.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Romanian */
-/* ISO language code (2 chars): RO */
-/* Codepage: 852 */
-
 #define HB_CP_ID        RO852
 #define HB_CP_INFO      "Romanian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
diff --git a/harbour/src/codepage/cproiso.c b/harbour/src/codepage/cproiso.c
index 6fb583d40d..8b2ca67ce0 100644
--- a/harbour/src/codepage/cproiso.c
+++ b/harbour/src/codepage/cproiso.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Romanian */
-/* ISO language code (2 chars): RO */
-/* Codepage: ISO-8859-2 */
-
 #define HB_CP_ID        ROISO
 #define HB_CP_INFO      "Romanian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
diff --git a/harbour/src/codepage/cprowin.c b/harbour/src/codepage/cprowin.c
index aa78e0e801..349331b0d0 100644
--- a/harbour/src/codepage/cprowin.c
+++ b/harbour/src/codepage/cprowin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Romanian */
-/* ISO language code (2 chars): RO */
-/* Codepage: Windows-1250 */
-
 #define HB_CP_ID        ROWIN
 #define HB_CP_INFO      "Romanian Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
diff --git a/harbour/src/codepage/cpru866.c b/harbour/src/codepage/cpru866.c
index 6e428e973d..a7d1b39f18 100644
--- a/harbour/src/codepage/cpru866.c
+++ b/harbour/src/codepage/cpru866.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Russian */
-/* ISO language code (2 chars): RU */
-/* Codepage: 866 */
-
 #define HB_CP_ID        RU866
 #define HB_CP_INFO      "Russian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
diff --git a/harbour/src/codepage/cpruiso.c b/harbour/src/codepage/cpruiso.c
index 341d96bbec..11d38669c7 100644
--- a/harbour/src/codepage/cpruiso.c
+++ b/harbour/src/codepage/cpruiso.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Russian */
-/* ISO language code (2 chars): RU */
-/* Codepage: ISO-8859-5 */
-
 #define HB_CP_ID        RUISO
 #define HB_CP_INFO      "Russian ISO-8859-5"
 #define HB_CP_UNITB     HB_UNITB_8859_5
diff --git a/harbour/src/codepage/cprukoi.c b/harbour/src/codepage/cprukoi.c
index 5c22c0ef4c..ae66ae27e8 100644
--- a/harbour/src/codepage/cprukoi.c
+++ b/harbour/src/codepage/cprukoi.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Russian */
-/* ISO language code (2 chars): RU */
-/* Codepage: KOI-8 */
-
 #define HB_CP_ID        RUKOI8
 #define HB_CP_INFO      "Russian KOI-8"
 #define HB_CP_UNITB     HB_UNITB_KOI_8
diff --git a/harbour/src/codepage/cpruwin.c b/harbour/src/codepage/cpruwin.c
index be522745b2..ce9345964c 100644
--- a/harbour/src/codepage/cpruwin.c
+++ b/harbour/src/codepage/cpruwin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Russian */
-/* ISO language code (2 chars): RU */
-/* Codepage: Windows-1251 */
-
 #define HB_CP_ID        RU1251
 #define HB_CP_INFO      "Russian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
diff --git a/harbour/src/codepage/cpsk852.c b/harbour/src/codepage/cpsk852.c
index 916854211f..26ceacd5ca 100644
--- a/harbour/src/codepage/cpsk852.c
+++ b/harbour/src/codepage/cpsk852.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Slovak */
-/* ISO language code (2 chars): SK */
-/* Codepage: 852 */
-
 #define HB_CP_ID        SK852
 #define HB_CP_INFO      "Slovak CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
diff --git a/harbour/src/codepage/cpskiso.c b/harbour/src/codepage/cpskiso.c
index 9dd38b9474..0fecfa5107 100644
--- a/harbour/src/codepage/cpskiso.c
+++ b/harbour/src/codepage/cpskiso.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Slovak */
-/* ISO language code (2 chars): SK */
-/* Codepage: ISO-8859-2 */
-
 #define HB_CP_ID        SKISO
 #define HB_CP_INFO      "Slovak ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
diff --git a/harbour/src/codepage/cpskkam.c b/harbour/src/codepage/cpskkam.c
index 12349b9a8d..795300e0fc 100644
--- a/harbour/src/codepage/cpskkam.c
+++ b/harbour/src/codepage/cpskkam.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Slovak */
-/* ISO language code (2 chars): SK */
-/* Codepage: Kamenicky ("895") */
-
 #define HB_CP_ID        SKKAM
 #define HB_CP_INFO      "Slovak Kamenicky (895)"
 #define HB_CP_UNITB     HB_UNITB_KAM
diff --git a/harbour/src/codepage/cpskwin.c b/harbour/src/codepage/cpskwin.c
index 58e7cd5eef..9e1d045f8c 100644
--- a/harbour/src/codepage/cpskwin.c
+++ b/harbour/src/codepage/cpskwin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Slovak */
-/* ISO language code (2 chars): SK */
-/* Codepage: Windows-1250 */
-
 #define HB_CP_ID        SKWIN
 #define HB_CP_INFO      "Slovak Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
diff --git a/harbour/src/codepage/cpsl437.c b/harbour/src/codepage/cpsl437.c
index 26f01e29e8..22ba0d877e 100644
--- a/harbour/src/codepage/cpsl437.c
+++ b/harbour/src/codepage/cpsl437.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Slovenian */
-/* ISO language code (2 chars): SL */
-/* Codepage: 437 */
-
 #define HB_CP_ID        SL437
 #define HB_CP_INFO      "Slovenian CP-437"
 #define HB_CP_UNITB     HB_UNITB_437
diff --git a/harbour/src/codepage/cpsl852.c b/harbour/src/codepage/cpsl852.c
index 63a7adac7b..8cf4364f22 100644
--- a/harbour/src/codepage/cpsl852.c
+++ b/harbour/src/codepage/cpsl852.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Slovenian */
-/* ISO language code (2 chars): SL */
-/* Codepage: 852 */
-
 #define HB_CP_ID        SL852
 #define HB_CP_INFO      "Slovenian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
diff --git a/harbour/src/codepage/cpsliso.c b/harbour/src/codepage/cpsliso.c
index 47523ede0a..10d8c489c0 100644
--- a/harbour/src/codepage/cpsliso.c
+++ b/harbour/src/codepage/cpsliso.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Slovenian */
-/* ISO language code (2 chars): SL */
-/* Codepage: ISO-8859-2 */
-
 #define HB_CP_ID        SLISO
 #define HB_CP_INFO      "Slovenian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
diff --git a/harbour/src/codepage/cpslwin.c b/harbour/src/codepage/cpslwin.c
index dae17365da..7bd6dcfb83 100644
--- a/harbour/src/codepage/cpslwin.c
+++ b/harbour/src/codepage/cpslwin.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Slovenian */
-/* ISO language code (2 chars): SL */
-/* Codepage: 1250 */
-
 #define HB_CP_ID        SLWIN
 #define HB_CP_INFO      "Slovenian CP-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
diff --git a/harbour/src/codepage/cpsrwin.c b/harbour/src/codepage/cpsrwin.c
index 53aacafda5..63e6d73fbf 100644
--- a/harbour/src/codepage/cpsrwin.c
+++ b/harbour/src/codepage/cpsrwin.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Serbian */
-/* ISO language code (2 chars): SR */
-/* Codepage: Windows-1251 */
-
 #define HB_CP_ID        SRWIN
 #define HB_CP_INFO      "Serbian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
diff --git a/harbour/src/codepage/cpsv437c.c b/harbour/src/codepage/cpsv437c.c
index 93cc0d5214..5bf88193cd 100644
--- a/harbour/src/codepage/cpsv437c.c
+++ b/harbour/src/codepage/cpsv437c.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Swedish */
-/* ISO language code (2 chars): SV */
-/* Codepage: 437 */
-
 /* NOTE: The collation sequence below is almost compatible with Clipper's
    NTXSWE.OBJ which does NOT provide a correct Swedish collation. The most
    notable error in NTXSWE.OBJ is the uppercase E with an acute accent
diff --git a/harbour/src/codepage/cpsviso.c b/harbour/src/codepage/cpsviso.c
index 1b64c2a17a..a1bea717df 100644
--- a/harbour/src/codepage/cpsviso.c
+++ b/harbour/src/codepage/cpsviso.c
@@ -51,10 +51,6 @@
  *
  */
 
-/* Language name: Swedish */
-/* ISO language code (2 chars): SV */
-/* Codepage: ISO-8859-1 */
-
 #define HB_CP_ID        SVISO
 #define HB_CP_INFO      "Swedish ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
diff --git a/harbour/src/codepage/cpsvwin.c b/harbour/src/codepage/cpsvwin.c
index 3d5d66a72c..fcdc5eed08 100644
--- a/harbour/src/codepage/cpsvwin.c
+++ b/harbour/src/codepage/cpsvwin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Swedish */
-/* ISO language code (2 chars): SV */
-/* Codepage: Windows-1252 */
-
 #define HB_CP_ID        SVWIN
 #define HB_CP_INFO      "Swedish Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
diff --git a/harbour/src/codepage/cptr857.c b/harbour/src/codepage/cptr857.c
index 1e1b736650..175458afc2 100644
--- a/harbour/src/codepage/cptr857.c
+++ b/harbour/src/codepage/cptr857.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Turkish */
-/* ISO language code TR : ( please look it up in /doc/lang_id.txt ) */
-/* Codepage: 857 */
-
 #define HB_CP_ID        TR857
 #define HB_CP_INFO      "Turkish CP-857"
 #define HB_CP_UNITB     HB_UNITB_857
diff --git a/harbour/src/codepage/cptriso.c b/harbour/src/codepage/cptriso.c
index 51d8e6e651..109364f322 100644
--- a/harbour/src/codepage/cptriso.c
+++ b/harbour/src/codepage/cptriso.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Turkish */
-/* ISO language code TR : (please look it up in /doc/lang_id.txt) */
-/* Codepage: ISO-8859-9 */
-
 #define HB_CP_ID        TRISO
 #define HB_CP_INFO      "Turkish ISO-8859-9"
 #define HB_CP_UNITB     HB_UNITB_8859_9
diff --git a/harbour/src/codepage/cptrwin.c b/harbour/src/codepage/cptrwin.c
index 940e8b6d04..e08ea77124 100644
--- a/harbour/src/codepage/cptrwin.c
+++ b/harbour/src/codepage/cptrwin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Turkish */
-/* ISO language code TR : (please look it up in /doc/lang_id.txt) */
-/* Codepage: 1254 */
-
 #define HB_CP_ID        TRWIN
 #define HB_CP_INFO      "Turkish Windows-1254"
 #define HB_CP_UNITB     HB_UNITB_1254
diff --git a/harbour/src/codepage/cpua1125.c b/harbour/src/codepage/cpua1125.c
index 503a2e1f10..c13708b0df 100644
--- a/harbour/src/codepage/cpua1125.c
+++ b/harbour/src/codepage/cpua1125.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Ukrainian */
-/* ISO language code (2 chars): UA */
-/* Codepage: 1125 */
-
 #define HB_CP_ID        UA1125
 #define HB_CP_INFO      "Ukrainian CP-1125"
 #define HB_CP_UNITB     HB_UNITB_1125
diff --git a/harbour/src/codepage/cpua866.c b/harbour/src/codepage/cpua866.c
index 395b9938c1..6da9dc4385 100644
--- a/harbour/src/codepage/cpua866.c
+++ b/harbour/src/codepage/cpua866.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Ukrainian */
-/* ISO language code (2 chars): UA */
-/* Codepage: 866 */
-
 #define HB_CP_ID        UA866
 #define HB_CP_INFO      "Ukrainian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
diff --git a/harbour/src/codepage/cpuakoi.c b/harbour/src/codepage/cpuakoi.c
index 8ef6bc9f98..64fdde084f 100644
--- a/harbour/src/codepage/cpuakoi.c
+++ b/harbour/src/codepage/cpuakoi.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Ukrainian */
-/* ISO language code (2 chars): UA */
-/* Codepage: KOI8-U */
-
 #define HB_CP_ID        UAKOI8
 #define HB_CP_INFO      "Ukrainian KOI8-U"
 #define HB_CP_UNITB     HB_UNITB_KOI_8U
diff --git a/harbour/src/codepage/cpuawin.c b/harbour/src/codepage/cpuawin.c
index 81f733990f..bb5320262d 100644
--- a/harbour/src/codepage/cpuawin.c
+++ b/harbour/src/codepage/cpuawin.c
@@ -50,10 +50,6 @@
  *
  */
 
-/* Language name: Ukrainian */
-/* ISO language code (2 chars): UA */
-/* Codepage: Windows-1251 */
-
 #define HB_CP_ID        UA1251
 #define HB_CP_INFO      "Ukrainian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251