diff --git a/dll/keyboard/kbda1/kbda1.c b/dll/keyboard/kbda1/kbda1.c
index e85d0eaf3d3..bdb99f86767 100644
--- a/dll/keyboard/kbda1/kbda1.c
+++ b/dll/keyboard/kbda1/kbda1.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -366,7 +364,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbda2/kbda2.c b/dll/keyboard/kbda2/kbda2.c
index 3ad64ea40cf..946a8bb2d34 100644
--- a/dll/keyboard/kbda2/kbda2.c
+++ b/dll/keyboard/kbda2/kbda2.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -383,7 +381,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbda3/kbda3.c b/dll/keyboard/kbda3/kbda3.c
index 888330a2944..1677325420d 100644
--- a/dll/keyboard/kbda3/kbda3.c
+++ b/dll/keyboard/kbda3/kbda3.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -383,7 +381,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdal/kbdal.c b/dll/keyboard/kbdal/kbdal.c
index 6c8af804acb..b11b47cb291 100644
--- a/dll/keyboard/kbdal/kbdal.c
+++ b/dll/keyboard/kbdal/kbdal.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -380,7 +378,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdarme/kbdarme.c b/dll/keyboard/kbdarme/kbdarme.c
index e2b9bb8aded..cf24dc820ff 100644
--- a/dll/keyboard/kbdarme/kbdarme.c
+++ b/dll/keyboard/kbdarme/kbdarme.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -353,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdarmw/kbdarmw.c b/dll/keyboard/kbdarmw/kbdarmw.c
index 2be08a89688..82674455a81 100644
--- a/dll/keyboard/kbdarmw/kbdarmw.c
+++ b/dll/keyboard/kbdarmw/kbdarmw.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -341,7 +339,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdaze/kbdaze.c b/dll/keyboard/kbdaze/kbdaze.c
index 5124ba87dcd..1cde6284754 100644
--- a/dll/keyboard/kbdaze/kbdaze.c
+++ b/dll/keyboard/kbdaze/kbdaze.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdazel/kbdazel.c b/dll/keyboard/kbdazel/kbdazel.c
index f337d165a2c..143acc9daf0 100644
--- a/dll/keyboard/kbdazel/kbdazel.c
+++ b/dll/keyboard/kbdazel/kbdazel.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -353,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbe/kbdbe.c b/dll/keyboard/kbdbe/kbdbe.c
index 7e5d6657a60..f9a25ae1a17 100644
--- a/dll/keyboard/kbdbe/kbdbe.c
+++ b/dll/keyboard/kbdbe/kbdbe.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -460,7 +457,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbga/kbdbga.c b/dll/keyboard/kbdbga/kbdbga.c
index 667071e021b..db7cdfaccb9 100644
--- a/dll/keyboard/kbdbga/kbdbga.c
+++ b/dll/keyboard/kbdbga/kbdbga.c
@@ -3,7 +3,7 @@
  * Арда -Българска клавиатурна подредба 'чшертъ' за РеактОС
  * Copyright (C) 2007 ReactOS
  * License: LGPL, see: LGPL.txt
- * 
+ *
  * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php
  * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html
  */
@@ -33,7 +33,7 @@
 ROSDATA USHORT scancode_to_vk[] = {
   /* Numbers Row Цифров ред*/
   /* - 00 - */
-  /* 1 ...         2 ...         3 ...         4 ... */     
+  /* 1 ...         2 ...         3 ...         4 ... */
   VK_EMPTY,     VK_ESCAPE,    '1',          '2',
   '3',          '4',          '5',          '6',
   '7',          '8',          '9',          '0',
@@ -42,14 +42,14 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* First Letters Row Първи буквен ред*/
   VK_TAB,       'Q',          'W',          'E',
   'R',          'T',          'Y',          'U',
-  'I',          'O',          'P',          
+  'I',          'O',          'P',
   VK_OEM_4,     VK_OEM_6,     VK_RETURN,
   /* - 1d - */
   /* Second Letters Row Втори буквен ред*/
-  VK_LCONTROL,  
+  VK_LCONTROL,
   'A',          'S',          'D',          'F',
   'G',          'H',          'J',          'K',
-  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3, 
+  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3,
   VK_LSHIFT,    VK_OEM_5,
   /* - 2c - */
   /* Third letters row Трети буквен ред*/
@@ -59,15 +59,15 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 37 - */
   /* Bottom Row */
   0x26a,  VK_LMENU,     VK_SPACE,     VK_CAPITAL,
-  
+
   /* - 3b - */
   /* F-Keys */
-  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, 
+  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6,
   VK_F7, VK_F8, VK_F9, VK_F10,
   /* - 45 - */
   /* Locks */
-  VK_NUMLOCK | KMEXT,   
-  VK_SCROLL | KBDMULTIVK,    
+  VK_NUMLOCK | KMEXT,
+  VK_SCROLL | KBDMULTIVK,
   /* - 47 - */
   /* Number-Pad Цифрова подложка */
   VK_HOME | KNUMS,      VK_UP | KNUMS,         VK_PRIOR | KNUMS, VK_SUBTRACT,
@@ -83,11 +83,11 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 59 - */
   VK_CLEAR,     VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP,  VK_EREOF, /* EREOF */
   VK_OEM_BACKTAB,    VK_OEM_AUTO,  VK_EMPTY,    VK_ZOOM,            /* ZOOM */
-  VK_HELP,      
+  VK_HELP,
   /* - 64 - */
   /* Even more F-Keys (for example, NCR keyboards from the early 90's) */
   VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
-  VK_F21, VK_F22, VK_F23, 
+  VK_F21, VK_F22, VK_F23,
   /* - 6f - */
   /* Not sure who uses these codes */
   VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET,
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -239,7 +237,7 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
 /* { VK_OEM_5, 0, {0x5c, 0x2f, 0x1c} },  */
   { VK_OEM_5, CAPLOK, {0x44c, 0x42c} }, //ьЬ
   { VK_OEM_102, 0, {0x5c, 0x7c} },
-  { VK_BACK, 0, {0x8, 0x8, 0x7f} },	
+  { VK_BACK, 0, {0x8, 0x8, 0x7f} },
   { VK_ESCAPE, 0, {0x1b, 0x1b, 0x1b} },
   { VK_RETURN, 0, {'\r', '\r', '\n'} },
   { VK_SPACE, 0, {' ', ' ', ' '} },
@@ -367,10 +365,10 @@ ROSDATA VSC_LPWSTR extended_key_names[] = {
 ROSDATA KBDTABLES keyboard_layout_table = {
   /* modifier assignments */
   &modifier_bits,
-  
+
   /* character from vk tables */
   vk_to_wchar_master_table,
-  
+
   /* diacritical marks */
   NULL,
 
@@ -381,7 +379,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbgm/kbdbgm.c b/dll/keyboard/kbdbgm/kbdbgm.c
index 14ca5a24713..364ee56592a 100644
--- a/dll/keyboard/kbdbgm/kbdbgm.c
+++ b/dll/keyboard/kbdbgm/kbdbgm.c
@@ -3,7 +3,7 @@
  * Марица - Българска клавиатурна подредба по БДС 5237-78 за РеактОС
  * Copyright (C) 2007 ReactOS
  * License: LGPL, see: LGPL.txt
- * 
+ *
  * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php
  * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html
  */
@@ -33,7 +33,7 @@
 ROSDATA USHORT scancode_to_vk[] = {
   /* Numbers Row Цифров ред*/
   /* - 00 - */
-  /* 1 ...         2 ...         3 ...         4 ... */     
+  /* 1 ...         2 ...         3 ...         4 ... */
   VK_EMPTY,     VK_ESCAPE,    '1',          '2',
   '3',          '4',          '5',          '6',
   '7',          '8',          '9',          '0',
@@ -42,14 +42,14 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* First Letters Row Първи буквен ред*/
   VK_TAB,       'Q',          'W',          'E',
   'R',          'T',          'Y',          'U',
-  'I',          'O',          'P',          
+  'I',          'O',          'P',
   VK_OEM_4,     VK_OEM_6,     VK_RETURN,
   /* - 1d - */
   /* Second Letters Row Втори буквен ред*/
-  VK_LCONTROL,  
+  VK_LCONTROL,
   'A',          'S',          'D',          'F',
   'G',          'H',          'J',          'K',
-  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3, 
+  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3,
   VK_LSHIFT,    VK_OEM_5,
   /* - 2c - */
   /* Third letters row Трети буквен ред*/
@@ -59,15 +59,15 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 37 - */
   /* Bottom Row */
   0x26a,  VK_LMENU,     VK_SPACE,     VK_CAPITAL,
-  
+
   /* - 3b - */
   /* F-Keys */
-  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, 
+  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6,
   VK_F7, VK_F8, VK_F9, VK_F10,
   /* - 45 - */
   /* Locks */
-  VK_NUMLOCK | KMEXT,   
-  VK_SCROLL | KBDMULTIVK,    
+  VK_NUMLOCK | KMEXT,
+  VK_SCROLL | KBDMULTIVK,
   /* - 47 - */
   /* Number-Pad Цифрова подложка */
   VK_HOME | KNUMS,      VK_UP | KNUMS,         VK_PRIOR | KNUMS, VK_SUBTRACT,
@@ -83,11 +83,11 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 59 - */
   VK_CLEAR,     VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP,  VK_EREOF, /* EREOF */
   VK_OEM_BACKTAB,    VK_OEM_AUTO,  VK_EMPTY,    VK_ZOOM,            /* ZOOM */
-  VK_HELP,      
+  VK_HELP,
   /* - 64 - */
   /* Even more F-Keys (for example, NCR keyboards from the early 90's) */
   VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
-  VK_F21, VK_F22, VK_F23, 
+  VK_F21, VK_F22, VK_F23,
   /* - 6f - */
   /* Not sure who uses these codes */
   VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET,
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -240,7 +238,7 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
 /* { VK_OEM_5, 0, {0x5c, 0x2f, 0x1c} }, Старата стойност, надявам се тук да е бБ */
   { VK_OEM_5, CAPLOK, {0x431, 0x411} },
   { VK_OEM_102, 0, {0x5c, 0x2f, 0x1c} }, /* Тук освен да е допълнителното копче до лявата смяна */
-  { VK_BACK, 0, {0x8, 0x8, 0x7f} },	
+  { VK_BACK, 0, {0x8, 0x8, 0x7f} },
   { VK_ESCAPE, 0, {0x1b, 0x1b, 0x1b} },
   { VK_RETURN, 0, {'\r', '\r', '\n'} },
   { VK_SPACE, 0, {' ', ' ', ' '} },
@@ -368,10 +366,10 @@ ROSDATA VSC_LPWSTR extended_key_names[] = {
 ROSDATA KBDTABLES keyboard_layout_table = {
   /* modifier assignments */
   &modifier_bits,
-  
+
   /* character from vk tables */
   vk_to_wchar_master_table,
-  
+
   /* diacritical marks */
   NULL,
 
@@ -382,7 +380,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbgt/kbdbgt.c b/dll/keyboard/kbdbgt/kbdbgt.c
index c1e85be7c25..46b63f81746 100644
--- a/dll/keyboard/kbdbgt/kbdbgt.c
+++ b/dll/keyboard/kbdbgt/kbdbgt.c
@@ -3,7 +3,7 @@
  * Тунджа - Българска клавиатурна позвукова подредба 'явертъ' за РеактОС
  * Copyright (C) 2007 ReactOS
  * License: LGPL, see: LGPL.txt
- * 
+ *
  * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php
  * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html
  */
@@ -33,7 +33,7 @@
 ROSDATA USHORT scancode_to_vk[] = {
   /* Numbers Row Цифров ред*/
   /* - 00 - */
-  /* 1 ...         2 ...         3 ...         4 ... */     
+  /* 1 ...         2 ...         3 ...         4 ... */
   VK_EMPTY,     VK_ESCAPE,    '1',          '2',
   '3',          '4',          '5',          '6',
   '7',          '8',          '9',          '0',
@@ -42,14 +42,14 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* First Letters Row Първи буквен ред*/
   VK_TAB,       'Q',          'W',          'E',
   'R',          'T',          'Y',          'U',
-  'I',          'O',          'P',          
+  'I',          'O',          'P',
   VK_OEM_4,     VK_OEM_6,     VK_RETURN,
   /* - 1d - */
   /* Second Letters Row Втори буквен ред*/
-  VK_LCONTROL,  
+  VK_LCONTROL,
   'A',          'S',          'D',          'F',
   'G',          'H',          'J',          'K',
-  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3, 
+  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3,
   VK_LSHIFT,    VK_OEM_5,
   /* - 2c - */
   /* Third letters row Трети буквен ред*/
@@ -59,15 +59,15 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 37 - */
   /* Bottom Row */
   0x26a,  VK_LMENU,     VK_SPACE,     VK_CAPITAL,
-  
+
   /* - 3b - */
   /* F-Keys */
-  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, 
+  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6,
   VK_F7, VK_F8, VK_F9, VK_F10,
   /* - 45 - */
   /* Locks */
-  VK_NUMLOCK | KMEXT,   
-  VK_SCROLL | KBDMULTIVK,    
+  VK_NUMLOCK | KMEXT,
+  VK_SCROLL | KBDMULTIVK,
   /* - 47 - */
   /* Number-Pad Цифрова подложка */
   VK_HOME | KNUMS,      VK_UP | KNUMS,         VK_PRIOR | KNUMS, VK_SUBTRACT,
@@ -83,11 +83,11 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 59 - */
   VK_CLEAR,     VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP,  VK_EREOF, /* EREOF */
   VK_OEM_BACKTAB,    VK_OEM_AUTO,  VK_EMPTY,    VK_ZOOM,            /* ZOOM */
-  VK_HELP,      
+  VK_HELP,
   /* - 64 - */
   /* Even more F-Keys (for example, NCR keyboards from the early 90's) */
   VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
-  VK_F21, VK_F22, VK_F23, 
+  VK_F21, VK_F22, VK_F23,
   /* - 6f - */
   /* Not sure who uses these codes */
   VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET,
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -238,7 +236,7 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
   /* Legacy (telnet-style) ascii escapes */
   { VK_OEM_5, CAPLOK, {0x44e, 0x42e} }, //юЮ
   { VK_OEM_102, 0, {0x5c, 0x7c} }, // \| Този клавиш липсва на много клавиатури
-  { VK_BACK, 0, {0x8, 0x8, 0x7f} },	
+  { VK_BACK, 0, {0x8, 0x8, 0x7f} },
   { VK_ESCAPE, 0, {0x1b, 0x1b, 0x1b} },
   { VK_RETURN, 0, {'\r', '\r', '\n'} },
   { VK_SPACE, 0, {' ', ' ', ' '} },
@@ -263,7 +261,7 @@ ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = {
   { 'I',   CAPLOK,   {0x438, 0x418, WCH_NONE, 0x44b, 0x42b} }, //иИыЫ
   { 'O',   CAPLOK,   {0x43e, 0x41e, WCH_NONE, 0x451, 0x401} }, //oOёЁ
   { 'J',   CAPLOK,   {0x439, 0x419, WCH_NONE, 0x45d, 0x40d} }, //йЙ малко и главно „и” с ударение
-//Следващите редове могат да са и в ROSDATA VK_TO_WCHARS4, 
+//Следващите редове могат да са и в ROSDATA VK_TO_WCHARS4,
 //като последното им попълнение трябва да се махне
   { '3',   0, {'3', '#', WCH_NONE, 0x2116, 0x2116} }, //3#№№
   { '6',   0, {'6', '^', WCH_NONE, 0x20AC,0x20AC } }, //6^€€
@@ -383,10 +381,10 @@ ROSDATA VSC_LPWSTR extended_key_names[] = {
 ROSDATA KBDTABLES keyboard_layout_table = {
   /* modifier assignments */
   &modifier_bits,
-  
+
   /* character from vk tables */
   vk_to_wchar_master_table,
-  
+
   /* diacritical marks */
   NULL,
 
@@ -398,7 +396,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdblr/kbdblr.c b/dll/keyboard/kbdblr/kbdblr.c
index 0c049085f6f..6257b3d5926 100644
--- a/dll/keyboard/kbdblr/kbdblr.c
+++ b/dll/keyboard/kbdblr/kbdblr.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbr/kbdbr.c b/dll/keyboard/kbdbr/kbdbr.c
index 7719c044721..cc546ff580d 100644
--- a/dll/keyboard/kbdbr/kbdbr.c
+++ b/dll/keyboard/kbdbr/kbdbr.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -441,7 +439,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbur/kbdbur.c b/dll/keyboard/kbdbur/kbdbur.c
index 078ffe7dfe2..201ad1afe25 100644
--- a/dll/keyboard/kbdbur/kbdbur.c
+++ b/dll/keyboard/kbdbur/kbdbur.c
@@ -95,10 +95,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -360,7 +358,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdcan/kbdcan.c b/dll/keyboard/kbdcan/kbdcan.c
index c2099e5f121..dcc6040f68e 100644
--- a/dll/keyboard/kbdcan/kbdcan.c
+++ b/dll/keyboard/kbdcan/kbdcan.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -574,7 +572,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdcr/kbdcr.c b/dll/keyboard/kbdcr/kbdcr.c
index 87345c22187..3a5d112ccb1 100644
--- a/dll/keyboard/kbdcr/kbdcr.c
+++ b/dll/keyboard/kbdcr/kbdcr.c
@@ -41,7 +41,7 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 0f - */
   /* First Letters Row */
   VK_TAB,       'Q',          'W',          'E',
-  'R',          'T',          'Y',          'U',
+  'R',          'T',          'Z',          'U',
   'I',          'O',          'P',
   VK_OEM_4,     VK_OEM_6,     VK_RETURN,
   /* - 1d - */
@@ -53,7 +53,7 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_LSHIFT,    VK_OEM_5,
   /* - 2c - */
   /* Third letters row */
-  'Z',          'X',          'C',          'V',
+  'Y',          'X',          'C',          'V',
   'B',          'N',          'M',          VK_OEM_COMMA,
   VK_OEM_PERIOD,VK_OEM_2,     VK_RSHIFT | KBDEXT,
   /* - 37 - */
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -488,7 +486,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdcz/kbdcz.c b/dll/keyboard/kbdcz/kbdcz.c
index 41dfd088be1..157f24cc8a4 100644
--- a/dll/keyboard/kbdcz/kbdcz.c
+++ b/dll/keyboard/kbdcz/kbdcz.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -458,7 +455,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdcz1/kbdcz1.c b/dll/keyboard/kbdcz1/kbdcz1.c
index e71f2f9fcad..be5b932e154 100644
--- a/dll/keyboard/kbdcz1/kbdcz1.c
+++ b/dll/keyboard/kbdcz1/kbdcz1.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -451,7 +448,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdda/kbdda.c b/dll/keyboard/kbdda/kbdda.c
index 1d68d3c2d00..971917b033e 100644
--- a/dll/keyboard/kbdda/kbdda.c
+++ b/dll/keyboard/kbdda/kbdda.c
@@ -93,9 +93,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -460,7 +457,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbddv/kbddv.c b/dll/keyboard/kbddv/kbddv.c
index b3100b7116b..9243ad2cbc0 100644
--- a/dll/keyboard/kbddv/kbddv.c
+++ b/dll/keyboard/kbddv/kbddv.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -371,7 +368,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdeo/kbdeo.c b/dll/keyboard/kbdeo/kbdeo.c
index 7346f5808d2..19a4e538133 100644
--- a/dll/keyboard/kbdeo/kbdeo.c
+++ b/dll/keyboard/kbdeo/kbdeo.c
@@ -100,9 +100,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -393,7 +390,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdes/kbdes.c b/dll/keyboard/kbdes/kbdes.c
index bfee723463a..ee515860bd9 100644
--- a/dll/keyboard/kbdes/kbdes.c
+++ b/dll/keyboard/kbdes/kbdes.c
@@ -165,9 +165,6 @@ ROSDATA USHORT scancode_to_vk[] =
   /* 7c */  VK_EMPTY,
   /* 7d */  VK_EMPTY,
   /* 7e */  VK_EMPTY,
-  /* 7f */  VK_EMPTY,
-  /* 80 */  VK_EMPTY,
-  /* 00 */  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] =
@@ -534,7 +531,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdest/kbdest.c b/dll/keyboard/kbdest/kbdest.c
index 43b344ee3a0..c83498edc9e 100644
--- a/dll/keyboard/kbdest/kbdest.c
+++ b/dll/keyboard/kbdest/kbdest.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -372,7 +369,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdfc/kbdfc.c b/dll/keyboard/kbdfc/kbdfc.c
index 016869cd110..cfa1f101ab7 100644
--- a/dll/keyboard/kbdfc/kbdfc.c
+++ b/dll/keyboard/kbdfc/kbdfc.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -452,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdfi/kbdfi.c b/dll/keyboard/kbdfi/kbdfi.c
index a321dda808b..1ab690dba94 100644
--- a/dll/keyboard/kbdfi/kbdfi.c
+++ b/dll/keyboard/kbdfi/kbdfi.c
@@ -96,9 +96,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -451,7 +448,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdfr/kbdfr.c b/dll/keyboard/kbdfr/kbdfr.c
index e2d315e160b..661a2ee1171 100644
--- a/dll/keyboard/kbdfr/kbdfr.c
+++ b/dll/keyboard/kbdfr/kbdfr.c
@@ -103,9 +103,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -451,7 +448,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgeo/kbdgeo.c b/dll/keyboard/kbdgeo/kbdgeo.c
index 44eee7e5bdb..e566b9ce41a 100644
--- a/dll/keyboard/kbdgeo/kbdgeo.c
+++ b/dll/keyboard/kbdgeo/kbdgeo.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgerg/kbdgerg.c b/dll/keyboard/kbdgerg/kbdgerg.c
index 249d579a940..8386aa4e42c 100644
--- a/dll/keyboard/kbdgerg/kbdgerg.c
+++ b/dll/keyboard/kbdgerg/kbdgerg.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -430,7 +427,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgneo/kbdgneo.c b/dll/keyboard/kbdgneo/kbdgneo.c
index 34300170c60..44cbcce942e 100644
--- a/dll/keyboard/kbdgneo/kbdgneo.c
+++ b/dll/keyboard/kbdgneo/kbdgneo.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -430,7 +427,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgr/kbdgr.c b/dll/keyboard/kbdgr/kbdgr.c
index ff83647b878..b0c09714e11 100644
--- a/dll/keyboard/kbdgr/kbdgr.c
+++ b/dll/keyboard/kbdgr/kbdgr.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -430,7 +427,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgrist/kbdgrist.c b/dll/keyboard/kbdgrist/kbdgrist.c
index a9dbbff43db..da42ac88bdb 100644
--- a/dll/keyboard/kbdgrist/kbdgrist.c
+++ b/dll/keyboard/kbdgrist/kbdgrist.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -430,7 +427,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdhe/kbdhe.c b/dll/keyboard/kbdhe/kbdhe.c
index e01af950fc7..70d3f2bb6a2 100644
--- a/dll/keyboard/kbdhe/kbdhe.c
+++ b/dll/keyboard/kbdhe/kbdhe.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -402,7 +399,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdheb/kbdheb.c b/dll/keyboard/kbdheb/kbdheb.c
index 00c5b209326..c0e530cccff 100644
--- a/dll/keyboard/kbdheb/kbdheb.c
+++ b/dll/keyboard/kbdheb/kbdheb.c
@@ -94,7 +94,7 @@ enum
 	RESH,
 	SHIN,
 	TAV,
-    
+
     // symbols
     SHEQEL = 0x20AA
 };
@@ -214,9 +214,6 @@ ROSDATA USHORT scancode_to_vk[] =
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -494,7 +491,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdhu/kbdhu.c b/dll/keyboard/kbdhu/kbdhu.c
index 209797dacb9..ff7376f3989 100644
--- a/dll/keyboard/kbdhu/kbdhu.c
+++ b/dll/keyboard/kbdhu/kbdhu.c
@@ -35,12 +35,12 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* 1 ...         2 ...         3 ...         4 ... */
   VK_EMPTY,     VK_ESCAPE,    '1',          '2',
   '3',          '4',          '5',          '6',
-  '7',          '8',          '9',          '0',
-  VK_OEM_MINUS, VK_OEM_PLUS,  VK_BACK,
+  '7',          '8',          '9',          VK_OEM_3,
+  VK_OEM_2,     VK_OEM_PLUS,  VK_BACK,
   /* - 0f - */
   /* First Letters Row */
   VK_TAB,       'Q',          'W',          'E',
-  'R',          'T',          'Y',          'U',
+  'R',          'T',          'Z',          'U',
   'I',          'O',          'P',
   VK_OEM_4,     VK_OEM_6,     VK_RETURN,
   /* - 1d - */
@@ -48,13 +48,13 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_LCONTROL,
   'A',          'S',          'D',          'F',
   'G',          'H',          'J',          'K',
-  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3,
+  'L',          VK_OEM_1,     VK_OEM_7,     '0',
   VK_LSHIFT,    VK_OEM_5,
   /* - 2c - */
   /* Third letters row */
-  'Z',          'X',          'C',          'V',
+  'Y',          'X',          'C',          'V',
   'B',          'N',          'M',          VK_OEM_COMMA,
-  VK_OEM_PERIOD,VK_OEM_2,     VK_RSHIFT,
+  VK_OEM_PERIOD,VK_OEM_MINUS, VK_RSHIFT,
   /* - 37 - */
   /* Bottom Row */
   VK_MULTIPLY,  VK_LMENU,     VK_SPACE,     VK_CAPITAL,
@@ -78,7 +78,7 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_SNAPSHOT,
   /* - 55 - */
   /* Oddities, and the remaining standard F-Keys */
-  VK_EMPTY,     VK_EMPTY,     VK_F11,       VK_F12,
+  VK_EMPTY,     VK_OEM_102,   VK_F11,       VK_F12,
   /* - 59 - */
   VK_CLEAR,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY, /* EREOF */
   VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY, /* ZOOM */
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -159,63 +156,23 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
-  3,
-  { 0, 1, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT */
+  6,
+  { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
 };
 
 ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
   /* Normal vs Shifted */
   /* The numbers */
-  { '1',         0, {'1', '\''} },
-  /* Ctrl-2 generates NUL */
-  { '3',         0, {'3', '+'} },
-  { '4',         0, {'4', '!'} },
-  { '5',         0, {'5', '%'} },
-  /* Ctrl-6 generates RS */
-  { '7',         0, {'7', '='} },
-  { '8',         0, {'8', '('} },
-  { '9',         0, {'9', ')'} },
-  { '0',         0, {0xf6, 0xd6} },
+  { '0',         0,        {'0', 0xa7} },
   /* First letter row */
-  { 'Q',         CAPLOK,   {'q', 'Q'} },
-  { 'W',         CAPLOK,   {'w', 'W'} },
-  { 'E',         CAPLOK,   {'e', 'E'} },
   { 'R',         CAPLOK,   {'r', 'R'} },
   { 'T',         CAPLOK,   {'t', 'T'} },
-  { 'Y',         CAPLOK,   {'y', 'Y'} },
-  { 'U',         CAPLOK,   {'u', 'U'} },
-  { 'I',         CAPLOK,   {'i', 'I'} },
+  { 'Z',         CAPLOK,   {'z', 'Z'} },
   { 'O',         CAPLOK,   {'o', 'O'} },
   { 'P',         CAPLOK,   {'p', 'P'} },
   /* Second letter row */
-  { 'A',         CAPLOK,   {'a', 'A'} },
-  { 'S',         CAPLOK,   {'s', 'S'} },
-  { 'D',         CAPLOK,   {'d', 'D'} },
-  { 'F',         CAPLOK,   {'f', 'F'} },
-  { 'G',         CAPLOK,   {'g', 'G'} },
   { 'H',         CAPLOK,   {'h', 'H'} },
-  { 'J',         CAPLOK,   {'j', 'J'} },
-  { 'K',         CAPLOK,   {'k', 'K'} },
-  { 'L',         CAPLOK,   {'l', 'L'} },
-  /* Third letter row */
-  { 'Z',         CAPLOK,   {'z', 'Z'} },
-  { 'X',         CAPLOK,   {'x', 'X'} },
-  { 'C',         CAPLOK,   {'c', 'C'} },
-  { 'V',         CAPLOK,   {'v', 'V'} },
-  { 'B',         CAPLOK,   {'b', 'B'} },
-  { 'N',         CAPLOK,   {'n', 'N'} },
-  { 'M',         CAPLOK,   {'m', 'M'} },
-
   /* Specials */
-  /* Ctrl-_ generates US */
-  { VK_OEM_PLUS    ,0, {0xf3, 0xd3} },
-  { VK_OEM_1       ,0, {0xe9, 0xc9} },
-  { VK_OEM_7       ,0, {0xfb, 0xdb} },
-  { VK_OEM_3       ,0, {'0', 0xa7} },
-  { VK_OEM_COMMA   ,0, {',', '?'} },
-  { VK_OEM_PERIOD  ,0, {'.', ':'} },
-  { VK_OEM_2       ,0, {'-', '_'} },
-  /* Keys that do not have shift states */
   { VK_TAB     ,0, {'\t','\t'} },
   { VK_ADD     ,0, {'+', '+'} },
   { VK_SUBTRACT,0, {'-', '-'} },
@@ -227,12 +184,57 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
 };
 
 ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
-  /* Normal, Shifted, Ctrl */
+  /* Normal, Shifted, AltGr */
   /* Legacy (telnet-style) ascii escapes */
-  { VK_OEM_4, 0, {0xf5, 0xd5, 0x1b /* ESC */} },
-  { VK_OEM_6, 0, {0xfa, 0xda, 0x1d /* GS */} },
-  { VK_OEM_5, 0, {0xfb, 0xdb, 0x1c /* FS */} },
-  { VK_RETURN,0, {'\r', '\r', '\n'} },
+  /* The numbers */
+  { '1',           0,      {'1', '\'', '~'} },
+  { '2',           0,      {'2', '\"', 0x2c7} },
+  { '3',           0,      {'3', '+', '^'} },
+  { '4',           0,      {'4', '!', 0x2d8} },
+  { '5',           0,      {'5', '%', 0xb0} },
+  { '6',           0,      {'6', '/', 0x2db} },
+  { '7',           0,      {'7', '=', '`'} },
+  { '8',           0,      {'8', '(', 0x2d9} },
+  { '9',           0,      {'9', ')', 0xb4} },
+
+  { VK_OEM_3,      CAPLOK, {0xf6, 0xd6, 0X2DD} },
+  { VK_OEM_2,      CAPLOK, {0xfc, 0xdc, 0xa8} },
+  { VK_OEM_PLUS,   CAPLOK, {0xf3, 0xd3, 0xb8} },
+
+  /* First letter row */
+  { 'Q',           CAPLOK, {'q', 'Q', '\\'} },
+  { 'W',           CAPLOK, {'w', 'W', '|'} },
+  { 'E',           CAPLOK, {'e', 'E', 0xc4} },
+  { 'U',           CAPLOK, {'u', 'U', 0x20ac} },
+  { 'I',           CAPLOK, {'i', 'I', 0xcd} },
+  { VK_OEM_4,      CAPLOK, {0x151, 0x150, 0xf7} },
+  { VK_OEM_6,      CAPLOK, {0xfa, 0xda, 0xd7} },
+  /* Second letter row */
+  { 'A',           CAPLOK, {'a', 'A', 0xe4} },
+  { 'S',           CAPLOK, {'s', 'S', 0x111} },
+  { 'D',           CAPLOK, {'d', 'D', 0x110} },
+  { 'F',           CAPLOK, {'f', 'F', '['} },
+  { 'G',           CAPLOK, {'g', 'G', ']'} },
+  { 'J',           CAPLOK, {'j', 'J', 0xed} },
+  { 'K',           CAPLOK, {'k', 'K', 0x142} },
+  { 'L',           CAPLOK, {'l', 'L', 0x141} },
+  { VK_OEM_1,      CAPLOK, {0xe9, 0xc9, '$'} },
+  { VK_OEM_7,      CAPLOK, {0xe1, 0xc1, 0xdf} },
+  { VK_OEM_5,      CAPLOK, {0x171, 0x170, 0xa4} },
+  /* Third letter row */
+  { VK_OEM_102,    CAPLOK, {0xed, 0xcd, '<'} },
+  { 'Y',           CAPLOK, {'y', 'Y', '>'} },
+  { 'X',           CAPLOK, {'x', 'X', '#'} },
+  { 'C',           CAPLOK, {'c', 'C', '&'} },
+  { 'V',           CAPLOK, {'v', 'V', '@'} },
+  { 'B',           CAPLOK, {'b', 'B', '{'} },
+  { 'N',           CAPLOK, {'n', 'N', '}'} },
+  { 'M',           CAPLOK, {'m', 'M', '<'} },
+  { VK_OEM_COMMA,  0,      {',', '?', ';'} },
+  { VK_OEM_PERIOD, 0,      {'.', ':', '>'} },
+  { VK_OEM_MINUS,  0,      {'-', '_', '*'} },
+  /* Special */
+  { VK_RETURN,     0,      {'\r', '\r', '\n'} },
   { 0,0 }
 };
 
@@ -371,11 +373,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0, 1), /* Version 1.0 */
+  MAKELONG(KLLF_ALTGR, 1), /* Version 1.0 */
 
   /* Ligatures -- Hungarian doesn't have any */
   0,
diff --git a/dll/keyboard/kbdic/kbdic.c b/dll/keyboard/kbdic/kbdic.c
index ec14a97250d..12000d95cc2 100644
--- a/dll/keyboard/kbdic/kbdic.c
+++ b/dll/keyboard/kbdic/kbdic.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -442,7 +440,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdinasa/kbdinasa.c b/dll/keyboard/kbdinasa/kbdinasa.c
index 32e39764f69..2aab04bdca4 100644
--- a/dll/keyboard/kbdinasa/kbdinasa.c
+++ b/dll/keyboard/kbdinasa/kbdinasa.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -379,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdinben/kbdinben.c b/dll/keyboard/kbdinben/kbdinben.c
index ad7c1db9b57..65cc9f0c43b 100644
--- a/dll/keyboard/kbdinben/kbdinben.c
+++ b/dll/keyboard/kbdinben/kbdinben.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -374,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdindev/kbdindev.c b/dll/keyboard/kbdindev/kbdindev.c
index 966c0be19fb..efa9f55b7fd 100644
--- a/dll/keyboard/kbdindev/kbdindev.c
+++ b/dll/keyboard/kbdindev/kbdindev.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -379,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdinguj/kbdinguj.c b/dll/keyboard/kbdinguj/kbdinguj.c
index 90a1dcf93ac..10ae88c08c3 100644
--- a/dll/keyboard/kbdinguj/kbdinguj.c
+++ b/dll/keyboard/kbdinguj/kbdinguj.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -379,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdinmal/kbdinmal.c b/dll/keyboard/kbdinmal/kbdinmal.c
index 904c4f22679..87069ccbe85 100644
--- a/dll/keyboard/kbdinmal/kbdinmal.c
+++ b/dll/keyboard/kbdinmal/kbdinmal.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -375,7 +373,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdir/kbdir.c b/dll/keyboard/kbdir/kbdir.c
index 8f8377271e8..2cd21d6eb39 100644
--- a/dll/keyboard/kbdir/kbdir.c
+++ b/dll/keyboard/kbdir/kbdir.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -407,7 +405,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdit/kbdit.c b/dll/keyboard/kbdit/kbdit.c
index 9c841421df5..e1793f5feb1 100644
--- a/dll/keyboard/kbdit/kbdit.c
+++ b/dll/keyboard/kbdit/kbdit.c
@@ -155,9 +155,6 @@ ROSDATA USHORT scancode_to_vk[] = {
 /* 7c */  VK_EMPTY,
 /* 7d */  VK_EMPTY,
 /* 7e */  VK_EMPTY,
-/* 7f */  VK_EMPTY,
-/* 80 */  VK_EMPTY,
-/* 00 */  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -432,7 +429,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdja/kbdja.c
index b250b9a1118..975a5e1d530 100644
--- a/dll/keyboard/kbdja/kbdja.c
+++ b/dll/keyboard/kbdja/kbdja.c
@@ -104,9 +104,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -385,7 +382,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdkaz/kbdkaz.c b/dll/keyboard/kbdkaz/kbdkaz.c
index 60121f69a6a..4b336343586 100644
--- a/dll/keyboard/kbdkaz/kbdkaz.c
+++ b/dll/keyboard/kbdkaz/kbdkaz.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdko/kbdko.c b/dll/keyboard/kbdko/kbdko.c
index d6b10143f87..9d4591b9fa0 100644
--- a/dll/keyboard/kbdko/kbdko.c
+++ b/dll/keyboard/kbdko/kbdko.c
@@ -7,9 +7,9 @@
  * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html
  */
 
-/* 
+/*
  * Important Note / TODO:
- * This file is a copy of kbdus.c and needs to adapt to Korean 
+ * This file is a copy of kbdus.c and needs to adapt to Korean
  * keyboard layout!
  */
 
@@ -104,9 +104,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -377,7 +374,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdla/kbdla.c b/dll/keyboard/kbdla/kbdla.c
index 488cfeaf204..11bdddb4834 100644
--- a/dll/keyboard/kbdla/kbdla.c
+++ b/dll/keyboard/kbdla/kbdla.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -428,7 +426,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdlt1/kbdlt1.c b/dll/keyboard/kbdlt1/kbdlt1.c
index b5781ca5304..2b0fbae235f 100644
--- a/dll/keyboard/kbdlt1/kbdlt1.c
+++ b/dll/keyboard/kbdlt1/kbdlt1.c
@@ -100,9 +100,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -369,7 +366,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdlv/kbdlv.c b/dll/keyboard/kbdlv/kbdlv.c
index 2d75ebf4b5e..a81170fdcc6 100644
--- a/dll/keyboard/kbdlv/kbdlv.c
+++ b/dll/keyboard/kbdlv/kbdlv.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -373,7 +370,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdmac/kbdmac.c b/dll/keyboard/kbdmac/kbdmac.c
index 8a77a449aea..8bca30bf2ba 100644
--- a/dll/keyboard/kbdmac/kbdmac.c
+++ b/dll/keyboard/kbdmac/kbdmac.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -364,7 +362,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdne/kbdne.c b/dll/keyboard/kbdne/kbdne.c
index f58e7ae36d2..090ef00602b 100644
--- a/dll/keyboard/kbdne/kbdne.c
+++ b/dll/keyboard/kbdne/kbdne.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -446,7 +444,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdno/kbdno.c b/dll/keyboard/kbdno/kbdno.c
index c9b19bc3729..021e5317429 100644
--- a/dll/keyboard/kbdno/kbdno.c
+++ b/dll/keyboard/kbdno/kbdno.c
@@ -93,9 +93,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -460,7 +457,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdpl/kbdpl.c b/dll/keyboard/kbdpl/kbdpl.c
index d7b0e353644..919186abaf3 100644
--- a/dll/keyboard/kbdpl/kbdpl.c
+++ b/dll/keyboard/kbdpl/kbdpl.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -187,7 +184,7 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
 
   /* Specials */
   { VK_OEM_PLUS, 0,      {'+', '?'} },
-  
+
   { VK_OEM_3,    0,      {WCH_DEAD,WCH_DEAD} },
   { 0xff,        0,      {0x02db,0xb7} },
   { VK_OEM_2,      0, {'\'','*'} },
@@ -397,7 +394,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdpl1/kbdpl1.c b/dll/keyboard/kbdpl1/kbdpl1.c
index bd20e8c8ab5..c0c6ff8d15e 100644
--- a/dll/keyboard/kbdpl1/kbdpl1.c
+++ b/dll/keyboard/kbdpl1/kbdpl1.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -413,7 +410,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdpo/kbdpo.c b/dll/keyboard/kbdpo/kbdpo.c
index a6fb89072a4..7bf501c08e3 100644
--- a/dll/keyboard/kbdpo/kbdpo.c
+++ b/dll/keyboard/kbdpo/kbdpo.c
@@ -165,9 +165,6 @@ ROSDATA USHORT scancode_to_vk[] = {
 /* 7c */  VK_EMPTY,
 /* 7d */  VK_EMPTY,
 /* 7e */  VK_EMPTY,
-/* 7f */  VK_EMPTY,
-/* 80 */  VK_EMPTY,
-/* 00 */  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -553,7 +550,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdro/kbdro.c b/dll/keyboard/kbdro/kbdro.c
index 8363139d366..ce0df72cec7 100644
--- a/dll/keyboard/kbdro/kbdro.c
+++ b/dll/keyboard/kbdro/kbdro.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -363,7 +361,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdrost/kbdrost.c b/dll/keyboard/kbdrost/kbdrost.c
index 99a12188c20..190bc38334e 100644
--- a/dll/keyboard/kbdrost/kbdrost.c
+++ b/dll/keyboard/kbdrost/kbdrost.c
@@ -131,10 +131,6 @@ ROSDATA USHORT scancode_to_vk[] =
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] =
@@ -458,7 +454,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdru/kbdru.c b/dll/keyboard/kbdru/kbdru.c
index 092ed570957..09c71f256e8 100644
--- a/dll/keyboard/kbdru/kbdru.c
+++ b/dll/keyboard/kbdru/kbdru.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -371,7 +369,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdru1/kbdru1.c b/dll/keyboard/kbdru1/kbdru1.c
index b3419c76a8a..f9a46eb0908 100644
--- a/dll/keyboard/kbdru1/kbdru1.c
+++ b/dll/keyboard/kbdru1/kbdru1.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -371,7 +369,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsg/kbdsg.c b/dll/keyboard/kbdsg/kbdsg.c
index b7985437731..89f1768ad1f 100644
--- a/dll/keyboard/kbdsg/kbdsg.c
+++ b/dll/keyboard/kbdsg/kbdsg.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -458,7 +455,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsk/kbdsk.c b/dll/keyboard/kbdsk/kbdsk.c
index 4f636ab1e7e..edd62aad63b 100644
--- a/dll/keyboard/kbdsk/kbdsk.c
+++ b/dll/keyboard/kbdsk/kbdsk.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -222,7 +219,7 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
   { VK_OEM_7,	0, {0x0148, ')', WCH_NONE, 0x00a4} },  // n with caron
   { VK_OEM_COMMA,	0, {',', '?', WCH_NONE, '<'} },
   { VK_OEM_PERIOD,	0, {'.', ':', WCH_NONE, '>'} },
-  
+
   /* The alphabet */
   { 'A',	CAPLOK,   {'a', 'A', 0x01, WCH_NONE} },
   { 'B',	CAPLOK,   {'b', 'B', 0x02, '{'} },
@@ -445,7 +442,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsk1/kbdsk1.c b/dll/keyboard/kbdsk1/kbdsk1.c
index ec02c8aa221..ef7f42eceb7 100644
--- a/dll/keyboard/kbdsk1/kbdsk1.c
+++ b/dll/keyboard/kbdsk1/kbdsk1.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -222,7 +219,7 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
   { VK_OEM_7,	0, {0x0148, ')', WCH_NONE, 0x00a4} },  // n with caron
   { VK_OEM_COMMA,	0, {',', '?', WCH_NONE, '<'} },
   { VK_OEM_PERIOD,	0, {'.', ':', WCH_NONE, '>'} },
-  
+
   /* The alphabet */
   { 'A',	CAPLOK,   {'a', 'A', 0x01, WCH_NONE} },
   { 'B',	CAPLOK,   {'b', 'B', 0x02, '{'} },
@@ -445,7 +442,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsw/kbdsw.c b/dll/keyboard/kbdsw/kbdsw.c
index 66d8fa32791..da6415d20dd 100644
--- a/dll/keyboard/kbdsw/kbdsw.c
+++ b/dll/keyboard/kbdsw/kbdsw.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -456,7 +453,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdtat/kbdtat.c b/dll/keyboard/kbdtat/kbdtat.c
index 4f04ba193a7..2755b853679 100644
--- a/dll/keyboard/kbdtat/kbdtat.c
+++ b/dll/keyboard/kbdtat/kbdtat.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -368,7 +366,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdth0/kbdth0.c b/dll/keyboard/kbdth0/kbdth0.c
index 7085975b853..85b62a356fe 100644
--- a/dll/keyboard/kbdth0/kbdth0.c
+++ b/dll/keyboard/kbdth0/kbdth0.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdth1/kbdth1.c b/dll/keyboard/kbdth1/kbdth1.c
index d30fd373f5a..927825a3530 100644
--- a/dll/keyboard/kbdth1/kbdth1.c
+++ b/dll/keyboard/kbdth1/kbdth1.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdth2/kbdth2.c b/dll/keyboard/kbdth2/kbdth2.c
index 3779699ab5a..9196403ce5b 100644
--- a/dll/keyboard/kbdth2/kbdth2.c
+++ b/dll/keyboard/kbdth2/kbdth2.c
@@ -95,10 +95,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -359,7 +357,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdth3/kbdth3.c b/dll/keyboard/kbdth3/kbdth3.c
index c98c7c0ab98..03f1a3f2ccf 100644
--- a/dll/keyboard/kbdth3/kbdth3.c
+++ b/dll/keyboard/kbdth3/kbdth3.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdtuf/kbdtuf.c b/dll/keyboard/kbdtuf/kbdtuf.c
index 03cdb1d2b31..980739a8f23 100644
--- a/dll/keyboard/kbdtuf/kbdtuf.c
+++ b/dll/keyboard/kbdtuf/kbdtuf.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -453,7 +451,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdtuq/kbdtuq.c b/dll/keyboard/kbdtuq/kbdtuq.c
index f2393d034a5..42a5cbe5efc 100644
--- a/dll/keyboard/kbdtuq/kbdtuq.c
+++ b/dll/keyboard/kbdtuq/kbdtuq.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -453,7 +451,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbduk/kbduk.c b/dll/keyboard/kbduk/kbduk.c
index 23feb4a492d..54d7c81ca98 100644
--- a/dll/keyboard/kbduk/kbduk.c
+++ b/dll/keyboard/kbduk/kbduk.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -383,7 +380,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdur/kbdur.c b/dll/keyboard/kbdur/kbdur.c
index b101be5c6ed..d8446214e2d 100644
--- a/dll/keyboard/kbdur/kbdur.c
+++ b/dll/keyboard/kbdur/kbdur.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -372,7 +370,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdurs/kbdurs.c b/dll/keyboard/kbdurs/kbdurs.c
index 320f1dae9f8..ae2165e77d8 100644
--- a/dll/keyboard/kbdurs/kbdurs.c
+++ b/dll/keyboard/kbdurs/kbdurs.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -364,7 +362,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdus/kbdus.c b/dll/keyboard/kbdus/kbdus.c
index ef103cdc1b2..d3fad47efae 100644
--- a/dll/keyboard/kbdus/kbdus.c
+++ b/dll/keyboard/kbdus/kbdus.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -378,7 +375,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdusa/kbdusa.c b/dll/keyboard/kbdusa/kbdusa.c
index 7f39d4d1c80..c83fe1b756f 100644
--- a/dll/keyboard/kbdusa/kbdusa.c
+++ b/dll/keyboard/kbdusa/kbdusa.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -363,7 +361,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdusl/kbdusl.c b/dll/keyboard/kbdusl/kbdusl.c
index 4ee85186dff..1f104db5a65 100644
--- a/dll/keyboard/kbdusl/kbdusl.c
+++ b/dll/keyboard/kbdusl/kbdusl.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdusr/kbdusr.c b/dll/keyboard/kbdusr/kbdusr.c
index 8733483d0e1..68319893177 100644
--- a/dll/keyboard/kbdusr/kbdusr.c
+++ b/dll/keyboard/kbdusr/kbdusr.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdusx/kbdusx.c b/dll/keyboard/kbdusx/kbdusx.c
index 0f0ae653d86..5b52adb3f69 100644
--- a/dll/keyboard/kbdusx/kbdusx.c
+++ b/dll/keyboard/kbdusx/kbdusx.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -447,7 +445,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbduzb/kbduzb.c b/dll/keyboard/kbduzb/kbduzb.c
index f48c4b28933..93aa9c12e70 100644
--- a/dll/keyboard/kbduzb/kbduzb.c
+++ b/dll/keyboard/kbduzb/kbduzb.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdvntc/kbdvntc.c b/dll/keyboard/kbdvntc/kbdvntc.c
index 2c453c794a7..df56da7868b 100644
--- a/dll/keyboard/kbdvntc/kbdvntc.c
+++ b/dll/keyboard/kbdvntc/kbdvntc.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -363,7 +361,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdycc/kbdycc.c b/dll/keyboard/kbdycc/kbdycc.c
index 9570f49ae53..50b6f11865c 100644
--- a/dll/keyboard/kbdycc/kbdycc.c
+++ b/dll/keyboard/kbdycc/kbdycc.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -379,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdycl/kbdycl.c b/dll/keyboard/kbdycl/kbdycl.c
index 3991436e0ae..12976a38f67 100644
--- a/dll/keyboard/kbdycl/kbdycl.c
+++ b/dll/keyboard/kbdycl/kbdycl.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -499,7 +497,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,