From 6addc90b0516c3cda5cb6c8f9b6918b356db4449 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 18 Sep 2009 13:05:19 +0000
Subject: Removed circular dependency.

---
 xorg-server/xkbdata.src/keymap/sun_vndr/all      | 1092 ----------------------
 xorg-server/xkbdata.src/keymap/sun_vndr/all.in   | 1092 ++++++++++++++++++++++
 xorg-server/xkbdata.src/keymap/sun_vndr/makefile |    2 +-
 3 files changed, 1093 insertions(+), 1093 deletions(-)
 delete mode 100644 xorg-server/xkbdata.src/keymap/sun_vndr/all
 create mode 100644 xorg-server/xkbdata.src/keymap/sun_vndr/all.in

(limited to 'xorg-server/xkbdata.src/keymap')

diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/all b/xorg-server/xkbdata.src/keymap/sun_vndr/all
deleted file mode 100644
index 047ae7bc4..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/all
+++ /dev/null
@@ -1,1092 +0,0 @@
-//  x86 KEYBOARDS
-// 
-//  Generally, x86 keyboards fall into either pc101 (101-key) or pc102
-//  (102-key European) categories.  Symbol tables are typically formed by
-//  augmenting sun/us(pc101) or sun/us(pc102) with the "extra" symbols
-//  from the type5 definition.  Geometries and keycodes for many of
-//  these fall under sun(x86) or sun(x86tuv).
-// 
-//  USB KEYBOARDS
-//  
-//  Only the keycodes (scancodes) change in the Universal Serial Bus
-//  keyboard definitions.  Symbols are kept the same as in the type5
-//  case.  The USB HID spec is confusing on this point, but the
-//  scancodes described in it relate to physical keys, not symbols, as
-//  it might lead one to believe.
-//
-//  HOBO KEYBOARDS
-//
-//  Hobo keyboards are derived from type5 keyboards, which in turn,
-//  are all derived from the type5 US keyboard.  Use the
-//  appropriate set of keycodes and geometry (either type5hobo or
-//  type5tuvhobo) and select the symbol set sun/us(type5hobo) to
-//  replace sun/us(type5).  For example, Sweden5_Hobo:
-// 
-// xkb_keymap "Sweden5_Hobo" {
-//     xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-//     xkb_types		{ include "default"		};
-//     xkb_compatibility	{ include "default"		};
-//     xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
-//     xkb_geometry	{ include "sun(type5tuvhobo)"	};
-// };
-// 
-//  Doing it this way allows all the symbol changes for a particular
-//  type5 keyboard to hold for a Hobo keyboard; both keyboards, in
-//  this case, would use sun/se(type5) to augment the symbols in the
-//  US keboard definition.
-
-xkb_keymap "Belgian6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+be"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Belgian6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+be"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Canada4" {
-    xkb_keycodes	{ include "sun(type4_ca)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/ca(type4)"	};
-    xkb_geometry	{ include "sun(type4_ca)"	};
-};
-
-xkb_keymap "Canada_Fr5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Canada_Fr5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/ca(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Canada_Fr5_TBITS5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5tbits5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Canada_Fr_x86" {
-    xkb_keycodes	{ include "sun(x86ca)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/ca(x86)"};
-    xkb_geometry	{ include "sun(x86ca)"		};
-};
-
-xkb_keymap "Switzer_Fr4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/sw(type4fr)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Switzer_Fr6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Switzer_Ge4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/sw(type4de)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Switzer_Ge6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Czech5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/cz(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Germany4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/de(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Germany5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Germany5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+de"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Germany6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Germany6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Germany_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+de"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Denmark4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/dk(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Denmark5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Denmark5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Denmark6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Denmark6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Denmark_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "SpainLatAm4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/es(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Spain5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Spain5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/es(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Spain6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Spain6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Spain_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-
-xkb_keymap "Finnish6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Finnish6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-
-xkb_keymap "FranceBelg4" {
-    xkb_keycodes	{ include "sun(type4tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/fr(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "France5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)" };
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "France5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/fr(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "France6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "France6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "France_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Greece5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/gr(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Hungary5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/hu(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Italy4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/it(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Italy5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Italy5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/it(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Italy6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Italy6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Italy_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Japan4" {
-    xkb_keycodes	{ include "sun(type4_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type4)"	};
-    xkb_geometry	{ include "sun(type4jp)"	};
-};
-
-xkb_keymap "Japan5" {
-    xkb_keycodes	{ include "sun(type5_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type5)"	};
-    xkb_geometry	{ include "sun(type5jp)"	};
-};
-
-xkb_keymap "Japan5_Hobo" {
-    xkb_keycodes	{ include "sun(type5_jphobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5jphobo)"	};
-};
-
-xkb_keymap "Japan6" {
-    xkb_keycodes	{ include "sun(type6_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default+japan(kana_lock)"	};
-    xkb_symbols		{ include "sun/jp(type6)"	};
-    xkb_geometry	{ include "sun(type6jp)"	};
-};
-
-xkb_keymap "Japan6_usb" {
-    xkb_keycodes	{ include "sun(type6_jp_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default+japan(kana_lock)"	};
-    xkb_symbols		{ include "sun/jp(type6)"	};
-    xkb_geometry	{ include "sun(type6jp)"	};
-};
-
-xkb_keymap "Japan_x86" {
-    xkb_keycodes	{ include "sun(x86jp)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(x86)"		};
-    xkb_geometry	{ include "sun(x86jp)"		};
-};
-
-xkb_keymap "J3100" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(J3100)"		};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Japan_Muhenkan_x86" {
-    xkb_keycodes	{ include "sun(x86jp)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(Muhenkan_x86)"		};
-    xkb_geometry	{ include "sun(x86jp)"		};
-};
-
-xkb_keymap "Korea4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/ko(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "Korea5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-
-xkb_keymap "Korea5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/ko(type5)"};
-    xkb_geometry	{ include "sun(type5hobo)"		};
-};
-
-xkb_keymap "Korea6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "Korea6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "Korea_x86" {
-    xkb_keycodes	{ include "sun(x86ko)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(x86ko)"		};
-};
-
-xkb_keymap "Lithuania5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/lt(type5)" };
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Latvia5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/lv(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "MS_US101A_x86" {
-    xkb_keycodes	{ include "sun(MS_x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc104)"		};
-    xkb_geometry	{ include "sun(MS_x86)"		};
-};
-
-xkb_keymap "Netherland4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/nl(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Netherland5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Netherland5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+nl"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Netherland6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Netherland6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Netherland_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+nl"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Norway4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/no(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Norway5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Norway5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/no(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Norway6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Norway6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Norway_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Poland5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/pl"		};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Portugal4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/pt(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Portugal5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Portugal5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/pt(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Portugal6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Portugal6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Portugal_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-// xkb_keymap "Russia4" {
-//     xkb_keycodes	{ include "sun(type4)"		};
-//     xkb_types		{ include "default"		};
-//     xkb_compatibility	{ include "default"		};
-//     xkb_symbols		{ include "sun/ru"		};
-//     xkb_geometry	{ include "sun(type4)"		};
-// };
-
-xkb_keymap "Russia5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Russia6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Russia6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "SwedenFin4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/se(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Sweden5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Sweden5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Sweden6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Sweden6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Sweden_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Turkey5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Turkey6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Turkey6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyQ6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyQ6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyF6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "TurkeyF6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan4" {
-    xkb_keycodes	{ include "sun(type4)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/tw(type4)"	};
-    xkb_geometry	{ include "sun(type4)"	};
-};
-
-xkb_keymap "Taiwan5" {
-    xkb_keycodes	{ include "sun(type5)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type5)"	};
-};
-
-xkb_keymap "Taiwan5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "Taiwan6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan_x86" {
-    xkb_keycodes	{ include "sun(x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)"	};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "UK4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/gb(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "UK5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "UK5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "UK6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "UK6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "UK_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+gb"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "US101A_PC" {
-    xkb_keycodes	{ include "sun(type5x86)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/us(pc101currency)"};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US101A_Sun" {
-    xkb_keycodes	{ include "sun(type5x86)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/us(US101A_Sun)"	};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US101A_x86" {
-    xkb_keycodes	{ include "sun(x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)"		};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "US5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-
-xkb_keymap "US5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "US_UNIX5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
-
-xkb_keymap "US_UNIX5_Hobo" {
-    // Same as US5_Hobo
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "US6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "US6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "US_UNIX6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6unix)"	};
-};
-
-xkb_keymap "US_UNIX6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6unix)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/all.in b/xorg-server/xkbdata.src/keymap/sun_vndr/all.in
new file mode 100644
index 000000000..047ae7bc4
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/all.in
@@ -0,0 +1,1092 @@
+//  x86 KEYBOARDS
+// 
+//  Generally, x86 keyboards fall into either pc101 (101-key) or pc102
+//  (102-key European) categories.  Symbol tables are typically formed by
+//  augmenting sun/us(pc101) or sun/us(pc102) with the "extra" symbols
+//  from the type5 definition.  Geometries and keycodes for many of
+//  these fall under sun(x86) or sun(x86tuv).
+// 
+//  USB KEYBOARDS
+//  
+//  Only the keycodes (scancodes) change in the Universal Serial Bus
+//  keyboard definitions.  Symbols are kept the same as in the type5
+//  case.  The USB HID spec is confusing on this point, but the
+//  scancodes described in it relate to physical keys, not symbols, as
+//  it might lead one to believe.
+//
+//  HOBO KEYBOARDS
+//
+//  Hobo keyboards are derived from type5 keyboards, which in turn,
+//  are all derived from the type5 US keyboard.  Use the
+//  appropriate set of keycodes and geometry (either type5hobo or
+//  type5tuvhobo) and select the symbol set sun/us(type5hobo) to
+//  replace sun/us(type5).  For example, Sweden5_Hobo:
+// 
+// xkb_keymap "Sweden5_Hobo" {
+//     xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+//     xkb_types		{ include "default"		};
+//     xkb_compatibility	{ include "default"		};
+//     xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
+//     xkb_geometry	{ include "sun(type5tuvhobo)"	};
+// };
+// 
+//  Doing it this way allows all the symbol changes for a particular
+//  type5 keyboard to hold for a Hobo keyboard; both keyboards, in
+//  this case, would use sun/se(type5) to augment the symbols in the
+//  US keboard definition.
+
+xkb_keymap "Belgian6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+be"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Belgian6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+be"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Canada4" {
+    xkb_keycodes	{ include "sun(type4_ca)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/ca(type4)"	};
+    xkb_geometry	{ include "sun(type4_ca)"	};
+};
+
+xkb_keymap "Canada_Fr5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Canada_Fr5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/ca(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Canada_Fr5_TBITS5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5tbits5)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Canada_Fr_x86" {
+    xkb_keycodes	{ include "sun(x86ca)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc101)+sun/ca(x86)"};
+    xkb_geometry	{ include "sun(x86ca)"		};
+};
+
+xkb_keymap "Switzer_Fr4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/sw(type4fr)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Switzer_Fr5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Switzer_Fr5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5fr)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Switzer_Fr6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Switzer_Fr6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Switzer_Fr_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5fr)"};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Switzer_Ge4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/sw(type4de)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Switzer_Ge5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Switzer_Ge5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Switzer_Ge6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Switzer_Ge6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Switzer_Ge_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Czech5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/cz(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+
+xkb_keymap "Germany4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/de(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Germany5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+de"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Germany5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+de"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Germany6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+de"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Germany6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+de"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Germany_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+de"};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Denmark4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/dk(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Denmark5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Denmark5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Denmark6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Denmark6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Denmark_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "SpainLatAm4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/es(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Spain5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Spain5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/es(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Spain6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Spain6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Spain_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/es(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+
+xkb_keymap "Finnish6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Finnish6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+
+xkb_keymap "FranceBelg4" {
+    xkb_keycodes	{ include "sun(type4tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/fr(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "France5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)" };
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "France5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/fr(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "France6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "France6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "France_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/fr(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Greece5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/gr(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+
+xkb_keymap "Hungary5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5basic)+sun/hu(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+
+xkb_keymap "Italy4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/it(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Italy5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Italy5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/it(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Italy6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Italy6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Italy_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/it(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Japan4" {
+    xkb_keycodes	{ include "sun(type4_jp)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(type4)"	};
+    xkb_geometry	{ include "sun(type4jp)"	};
+};
+
+xkb_keymap "Japan5" {
+    xkb_keycodes	{ include "sun(type5_jp)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(type5)"	};
+    xkb_geometry	{ include "sun(type5jp)"	};
+};
+
+xkb_keymap "Japan5_Hobo" {
+    xkb_keycodes	{ include "sun(type5_jphobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(type5hobo)"	};
+    xkb_geometry	{ include "sun(type5jphobo)"	};
+};
+
+xkb_keymap "Japan6" {
+    xkb_keycodes	{ include "sun(type6_jp)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default+japan(kana_lock)"	};
+    xkb_symbols		{ include "sun/jp(type6)"	};
+    xkb_geometry	{ include "sun(type6jp)"	};
+};
+
+xkb_keymap "Japan6_usb" {
+    xkb_keycodes	{ include "sun(type6_jp_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default+japan(kana_lock)"	};
+    xkb_symbols		{ include "sun/jp(type6)"	};
+    xkb_geometry	{ include "sun(type6jp)"	};
+};
+
+xkb_keymap "Japan_x86" {
+    xkb_keycodes	{ include "sun(x86jp)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(x86)"		};
+    xkb_geometry	{ include "sun(x86jp)"		};
+};
+
+xkb_keymap "J3100" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(J3100)"		};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Japan_Muhenkan_x86" {
+    xkb_keycodes	{ include "sun(x86jp)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(Muhenkan_x86)"		};
+    xkb_geometry	{ include "sun(x86jp)"		};
+};
+
+xkb_keymap "Korea4" {
+    xkb_keycodes	{ include "sun(type4)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/ko(type4)"	};
+    xkb_geometry	{ include "sun(type4)"		};
+};
+
+xkb_keymap "Korea5" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
+    xkb_geometry	{ include "sun(type5)"		};
+};
+
+xkb_keymap "Korea5_Hobo" {
+    xkb_keycodes	{ include "sun(type5hobo)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/ko(type5)"};
+    xkb_geometry	{ include "sun(type5hobo)"		};
+};
+
+xkb_keymap "Korea6" {
+    xkb_keycodes	{ include "sun(type6)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
+    xkb_geometry	{ include "sun(type6)"		};
+};
+
+xkb_keymap "Korea6_usb" {
+    xkb_keycodes	{ include "sun(type6_usb)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
+    xkb_geometry	{ include "sun(type6)"		};
+};
+
+xkb_keymap "Korea_x86" {
+    xkb_keycodes	{ include "sun(x86ko)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc101)+sun/ko(type5)"	};
+    xkb_geometry	{ include "sun(x86ko)"		};
+};
+
+xkb_keymap "Lithuania5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5basic)+sun/lt(type5)" };
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+
+xkb_keymap "Latvia5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5basic)+sun/lv(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "MS_US101A_x86" {
+    xkb_keycodes	{ include "sun(MS_x86)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc104)"		};
+    xkb_geometry	{ include "sun(MS_x86)"		};
+};
+
+xkb_keymap "Netherland4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/nl(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Netherland5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+nl"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Netherland5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+nl"	};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Netherland6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+nl"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Netherland6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+nl"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Netherland_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+nl"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Norway4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/no(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Norway5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Norway5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/no(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Norway6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Norway6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Norway_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/no(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Poland5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/pl"		};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Portugal4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/pt(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Portugal5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Portugal5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/pt(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Portugal6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Portugal6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Portugal_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/pt(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+// xkb_keymap "Russia4" {
+//     xkb_keycodes	{ include "sun(type4)"		};
+//     xkb_types		{ include "default"		};
+//     xkb_compatibility	{ include "default"		};
+//     xkb_symbols		{ include "sun/ru"		};
+//     xkb_geometry	{ include "sun(type4)"		};
+// };
+
+xkb_keymap "Russia5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Russia6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Russia6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "SwedenFin4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/se(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Sweden5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Sweden5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Sweden6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Sweden6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Sweden_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/se(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Turkey5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Turkey6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Turkey6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "TurkeyQ6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "TurkeyQ6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "TurkeyF6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
+    xkb_geometry	{ include "sun(type6)"	};
+};
+
+xkb_keymap "TurkeyF6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
+    xkb_geometry	{ include "sun(type6)"	};
+};
+
+xkb_keymap "Taiwan4" {
+    xkb_keycodes	{ include "sun(type4)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/tw(type4)"	};
+    xkb_geometry	{ include "sun(type4)"	};
+};
+
+xkb_keymap "Taiwan5" {
+    xkb_keycodes	{ include "sun(type5)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
+    xkb_geometry	{ include "sun(type5)"	};
+};
+
+xkb_keymap "Taiwan5_Hobo" {
+    xkb_keycodes	{ include "sun(type5hobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/tw(type5)"	};
+    xkb_geometry	{ include "sun(type5hobo)"	};
+};
+
+xkb_keymap "Taiwan6" {
+    xkb_keycodes	{ include "sun(type6)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
+    xkb_geometry	{ include "sun(type6)"	};
+};
+
+xkb_keymap "Taiwan6_usb" {
+    xkb_keycodes	{ include "sun(type6_usb)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
+    xkb_geometry	{ include "sun(type6)"	};
+};
+
+xkb_keymap "Taiwan_x86" {
+    xkb_keycodes	{ include "sun(x86)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc101)"	};
+    xkb_geometry	{ include "sun(x86)"		};
+};
+
+xkb_keymap "UK4" {
+    xkb_keycodes	{ include "sun(type4)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/gb(type4)"	};
+    xkb_geometry	{ include "sun(type4)"		};
+};
+
+xkb_keymap "UK5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/gb(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "UK5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/gb(type5)"	};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "UK6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "UK6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "UK_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+gb"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "US101A_PC" {
+    xkb_keycodes	{ include "sun(type5x86)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc101)+sun/us(pc101currency)"};
+    xkb_geometry	{ include "sun(x86)"		};
+};
+
+xkb_keymap "US101A_Sun" {
+    xkb_keycodes	{ include "sun(type5x86)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc101)+sun/us(US101A_Sun)"	};
+    xkb_geometry	{ include "sun(x86)"		};
+};
+
+xkb_keymap "US101A_x86" {
+    xkb_keycodes	{ include "sun(x86)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc101)"		};
+    xkb_geometry	{ include "sun(x86)"		};
+};
+
+xkb_keymap "US4" {
+    xkb_keycodes	{ include "sun(type4)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type4)"	};
+    xkb_geometry	{ include "sun(type4)"		};
+};
+
+xkb_keymap "US5" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type5)"	};
+    xkb_geometry	{ include "sun(type5)"		};
+};
+
+xkb_keymap "US5_Hobo" {
+    xkb_keycodes	{ include "sun(type5hobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type5hobo)"	};
+    xkb_geometry	{ include "sun(type5hobo)"	};
+};
+
+xkb_keymap "US_UNIX5" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type5)"	};
+    xkb_geometry	{ include "sun(type5unix)"	};
+};
+
+xkb_keymap "US_UNIX5_Hobo" {
+    // Same as US5_Hobo
+    xkb_keycodes	{ include "sun(type5hobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type5hobo)"	};
+    xkb_geometry	{ include "sun(type5hobo)"	};
+};
+
+xkb_keymap "US6" {
+    xkb_keycodes	{ include "sun(type6)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type6)"	};
+    xkb_geometry	{ include "sun(type6)"		};
+};
+
+xkb_keymap "US6_usb" {
+    xkb_keycodes	{ include "sun(type6_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type6)"	};
+    xkb_geometry	{ include "sun(type6)"		};
+};
+
+xkb_keymap "US_UNIX6" {
+    xkb_keycodes	{ include "sun(type6)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type6)"	};
+    xkb_geometry	{ include "sun(type6unix)"	};
+};
+
+xkb_keymap "US_UNIX6_usb" {
+    xkb_keycodes	{ include "sun(type6_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type6)"	};
+    xkb_geometry	{ include "sun(type6unix)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/makefile b/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
index 042baaf55..1dd8b4c45 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
@@ -13,7 +13,7 @@ us
 DATA_FILES=$(dist_keymap_DATA:%=$(DESTDIR)\%)
 
 # We need to make the rule for all explicit since searching it in the implicit rules doesn't work for all
-$(DESTDIR)\all: all
+$(DESTDIR)\all: all.in
 	copy $< $@
 
 
-- 
cgit v1.2.3