Renamed xkbdata.src also on trunk since the current merging of subversion will loose all the changes in xkbdata.src when the directory is renamed on the source branch.

51 files changed, 0 insertions, 3475 deletions

diff --git a/xorg-server/xkbdata.src/keymap/Makefile.am b/xorg-server/xkbdata.src/keymap/Makefile.am
deleted file mode 100644
index 98da8f2b0..000000000
--- a/xorg-server/xkbdata.src/keymap/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SUBDIRS = digital_vndr sgi_vndr sun_vndr
-
-keymapdir = $(xkb_base)/keymap
-
-dist_keymap_DATA = \
-amiga ataritt macintosh \
-sony xfree86 xfree98 \
-README
-
-dir_data = $(dist_keymap_DATA)
-
-include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/keymap/README b/xorg-server/xkbdata.src/keymap/README
deleted file mode 100644
index 318089e09..000000000
--- a/xorg-server/xkbdata.src/keymap/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The keymap component provides a way how to set up one pre-defined keyboard
-mapping from a given set. It has been obsoleted by 'rules' component which
-is simplier and more flexible. The directory is preserved for compatibility
-reasons. Avoid using it if it is possible.
-
-The keymap files are in .xkm format and useful when using xkbcomp.  
diff --git a/xorg-server/xkbdata.src/keymap/amiga b/xorg-server/xkbdata.src/keymap/amiga
deleted file mode 100644
index d697a986b..000000000
--- a/xorg-server/xkbdata.src/keymap/amiga
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Xorg: amiga,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-
-
-
-
-// $XFree86: xc/programs/xkbcomp/keymap/amiga,v 3.2 1997/10/26 13:25:36 dawes Exp $
-
-default xkb_keymap "usa1" {
-    xkb_keycodes	{ include "amiga(usa1)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "amiga(usa1)"		};
-    xkb_geometry	{ include "amiga(usa1)"		};
-};
-
-xkb_keymap "de" {
-    xkb_keycodes	{ include "amiga(de)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "amiga(de)"		};
-    xkb_geometry	{ include "amiga(de)"		};
-};
diff --git a/xorg-server/xkbdata.src/keymap/ataritt b/xorg-server/xkbdata.src/keymap/ataritt
deleted file mode 100644
index b801ac291..000000000
--- a/xorg-server/xkbdata.src/keymap/ataritt
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Xorg: ataritt,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-
-
-
-
-// $XFree86: xc/programs/xkbcomp/keymap/ataritt,v 3.1 1997/10/26 13:25:37 dawes Exp $
-
-default xkb_keymap "us" {
-    xkb_keycodes	{ include "ataritt(us)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "ataritt(us)"		};
-    xkb_geometry	{ include "ataritt(us)"		};
-};
-xkb_keymap "de" {
-    xkb_keycodes	{ include "ataritt(de)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "ataritt(de)"		};
-    xkb_geometry	{ include "ataritt(de)"		};
-};
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.am b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.am
deleted file mode 100644
index b1961e5b1..000000000
--- a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-keymapdir = $(xkb_base)/keymap/digital_vndr
-
-dist_keymap_DATA = \
-us
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/makefile b/xorg-server/xkbdata.src/keymap/digital_vndr/makefile
deleted file mode 100644
index 09dd6f797..000000000
--- a/xorg-server/xkbdata.src/keymap/digital_vndr/makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-ifeq ($(MAKESERVER),1)
-$(error Please do not specify MAKESERVER=1)
-endif
-
-DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\digital_vndr
-
-dist_keymap_DATA = \
-us
-
-DATA_FILES=$(dist_keymap_DATA:%=$(DESTDIR)\%)
-
-include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/us b/xorg-server/xkbdata.src/keymap/digital_vndr/us
deleted file mode 100644
index 7f5180e2c..000000000
--- a/xorg-server/xkbdata.src/keymap/digital_vndr/us
+++ /dev/null
@@ -1,188 +0,0 @@
-// $Xorg: us,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//Permission is hereby granted, free of charge, to any person obtaining
-//a copy of this software and associated documentation files (the
-//"Software"), to deal in the Software without restriction, including
-//without limitation the rights to use, copy, modify, merge, publish,
-//distribute, sublicense, and sell copies of the Software, and to
-//permit persons to whom the Software is furnished to do so, subject to
-//the following conditions:
-//
-//The above copyright notice and this permission notice shall be included
-//in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of the Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log: us,v 
-// Revision 1.3  1996/06/18  09:14:51  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.2  1995/10/25  21:00:53  William_Walker
-// 	Add pc104-key support
-// 	[1995/10/23  15:46:24  William_Walker]
-//
-// Revision 1.1.2.6  1995/06/27  12:18:05  William_Walker
-// 	Add LK201 and LK450 support as well as TW and DP variants.
-// 	[1995/06/26  20:26:19  William_Walker]
-// 
-// Revision 1.1.2.5  1995/06/05  19:23:12  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:14:04  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: us,v  Revision: 1.3  (DEC) Date: 1996/02/02 14:21:15
-// 
-
-// **************************************************************
-// *								*
-// * Keymaps for en_US.ISO8859-1 - English for U.S.		*
-// *								*
-// **************************************************************
-
-xkb_keymap "lk201" {
-    xkb_keycodes        { include "digital_vndr/lk(lk201)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(vt105)"		};
-    xkb_geometry	{ description = "Digital US LK201";
-			  include "digital_vndr/lk(lk201)"		};
-};
-
-xkb_keymap "lk401" {
-    xkb_keycodes        { include "digital_vndr/lk(lk401)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(vt108)"		};
-    xkb_geometry	{ description = "Digital US LK401";
-			  include "digital_vndr/lk(lk401)"		};
-};
-
-xkb_keymap "lk411" {
-    xkb_keycodes        { include "digital_vndr/pc(lk411)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(vt108)"		};
-    xkb_geometry	{ description = "Digital US LK411";
-			  include "digital_vndr/lk(lk401)"		};
-};
-
-xkb_keymap "lk421" {
-    xkb_keycodes        { include "digital_vndr/lk(lk421)"		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"	        	};
-    xkb_symbols         { include "digital_vndr/us(unix)"		};
-    xkb_geometry	{ description = "Digital US LK421";
-			  include "digital_vndr/unix(unix)"		};
-};
-
-xkb_keymap "lk441" {
-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
-    xkb_geometry	{ description = "Digital US LK441";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "lk443" {
-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
-    xkb_geometry	{ description = "Digital US LK443";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "lk44x" {
-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
-    xkb_geometry	{ description = "Digital US LK443";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "lk450" {
-    xkb_keycodes        { include "digital_vndr/pc(lk450)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(vt108)"		};
-    xkb_geometry	{ description = "Digital US LK450";
-			  include "digital_vndr/lk(lk450)"		};
-};
-
-xkb_keymap "pcxalaa" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxalaa)"		};
-    xkb_geometry	{ description = "Digital US PCXAL-AA";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "pcxalfa" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxalfa)"		};
-    xkb_geometry	{ description = "Digital US PCXAL-FA";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_on_keys)"	};
-};
-
-xkb_keymap "pcxalga" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxalga)"		};
-    xkb_geometry	{ description = "Digital US PCXAL-GA";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "pcxalka" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxalka)"		};
-    xkb_geometry	{ description = "Digital US PCXAL-KA";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "pcxal" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxal)"		};
-    xkb_geometry	{ description = "Digital US PCXAL";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "mnk" {
-    xkb_keycodes        { include "digital_vndr/pc(pc104)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pc104)"		};
-    xkb_geometry	{ include "microsoft"			};
-};
diff --git a/xorg-server/xkbdata.src/keymap/macintosh b/xorg-server/xkbdata.src/keymap/macintosh
deleted file mode 100644
index de115badc..000000000
--- a/xorg-server/xkbdata.src/keymap/macintosh
+++ /dev/null
@@ -1,17 +0,0 @@
-// $XConsortium: macintosh /main/11 1996/03/07 13:42:13 kaleb $
-// $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.1 1999/05/23 05:27:51 dawes Exp $
-default xkb_keymap "macintosh" {
-    xkb_keycodes	{ include "macintosh"				};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
-    xkb_geometry	{ include "macintosh"				};
-};
-
-xkb_keymap "macintosh_old" {
-    xkb_keycodes	{ include "macintosh(old)"				};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
-    xkb_geometry	{ include "macintosh"				};
-};
diff --git a/xorg-server/xkbdata.src/keymap/makefile b/xorg-server/xkbdata.src/keymap/makefile
deleted file mode 100644
index 1b549a08f..000000000
--- a/xorg-server/xkbdata.src/keymap/makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-ifeq ($(MAKESERVER),1)
-$(error Please do not specify MAKESERVER=1)
-endif
-
-THISDIR=keymap
-
-DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
-
-SUBDIRS = digital_vndr sgi_vndr sun_vndr
-
-dist_xkbdata_keymap_DATA = \
-amiga ataritt macintosh \
-sony xfree86 xfree98 \
-README
-
-DATA_FILES=$(dist_xkbdata_keymap_DATA:%=$(DESTDIR)\%)
-
-load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
-
-extrastuff: $(SUBDIRS:%=%\all)
-
-include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am
deleted file mode 100644
index 234a336db..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-keymapdir = $(xkb_base)/keymap/sgi_vndr
-
-dist_keymap_DATA = \
-be bg ca \
-ch cz de \
-dk dvorak \
-es fi \
-fr gb \
-hu it jp \
-no pl pt \
-ru se sk \
-th us
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/be b/xorg-server/xkbdata.src/keymap/sgi_vndr/be
deleted file mode 100644
index 9905f0ba6..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/be
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: be,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+be"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+be"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/bg b/xorg-server/xkbdata.src/keymap/sgi_vndr/bg
deleted file mode 100644
index a3cb08a22..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/bg
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Xorg: bg,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols  { 
-	include "us(pc_universal)+bg+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols { 
-	include "us(pc102)+bg+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ca b/xorg-server/xkbdata.src/keymap/sgi_vndr/ca
deleted file mode 100644
index 38f489657..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ca
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Xorg: ca,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ca"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ch b/xorg-server/xkbdata.src/keymap/sgi_vndr/ch
deleted file mode 100644
index 6970a3679..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ch
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "de_indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "de_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "de_indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "de_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
-default xkb_keymap "fr_indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "fr_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "fr_indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "fr_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/cz b/xorg-server/xkbdata.src/keymap/sgi_vndr/cz
deleted file mode 100644
index 6673b615b..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/cz
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+cz"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+cz"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
-default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/de b/xorg-server/xkbdata.src/keymap/sgi_vndr/de
deleted file mode 100644
index 1ad7fe7b0..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/de
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: de,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+de"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+de"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols {
-	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/dk b/xorg-server/xkbdata.src/keymap/sgi_vndr/dk
deleted file mode 100644
index 832f01da7..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/dk
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: dk,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+dk"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak b/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak
deleted file mode 100644
index bd594b0eb..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Xorg: dvorak,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101)+dvorak"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/en_US b/xorg-server/xkbdata.src/keymap/sgi_vndr/en_US
deleted file mode 100644
index 29f1666b7..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/en_US
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Xorg: en_US,v 1.3 2000/08/17 19:54:40 cpqbld Exp $

-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy101" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

-};

-xkb_keymap "indy101_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"			};

-};

-xkb_keymap "indy104" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "microsoft(natural)"	};

-};

-xkb_keymap "indy104_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "microsoft(natural)"			};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-

diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/es b/xorg-server/xkbdata.src/keymap/sgi_vndr/es
deleted file mode 100644
index f1aad9a7a..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/es
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: es,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+es"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+es"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/fi b/xorg-server/xkbdata.src/keymap/sgi_vndr/fi
deleted file mode 100644
index 67af07eb7..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/fi
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: fi,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+fi"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/fr b/xorg-server/xkbdata.src/keymap/sgi_vndr/fr
deleted file mode 100644
index b6aea29de..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/fr
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: fr,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols  { 
-	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+fr"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/gb b/xorg-server/xkbdata.src/keymap/sgi_vndr/gb
deleted file mode 100644
index 6fa6d6515..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/gb
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: gb,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+gb"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/hu b/xorg-server/xkbdata.src/keymap/sgi_vndr/hu
deleted file mode 100644
index 3c256846e..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/hu
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Xorg: hu,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/it b/xorg-server/xkbdata.src/keymap/sgi_vndr/it
deleted file mode 100644
index ed92227b7..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/it
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: it,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+it"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+it"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/jp b/xorg-server/xkbdata.src/keymap/sgi_vndr/jp
deleted file mode 100644
index 74ed4243c..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/jp
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Xorg: jp,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};
-    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile b/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
deleted file mode 100644
index d2cb6083e..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-ifeq ($(MAKESERVER),1)
-$(error Please do not specify MAKESERVER=1)
-endif
-
-DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\sgi_vndr
-
-dist_keymap_DATA = \
-be bg ca \
-ch cz de \
-dk dvorak \
-es fi \
-fr gb \
-hu it jp \
-no pl pt \
-ru se sk \
-th us
-
-DATA_FILES=$(dist_keymap_DATA:%=$(DESTDIR)\%)
-
-include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/no b/xorg-server/xkbdata.src/keymap/sgi_vndr/no
deleted file mode 100644
index fd32c72c0..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/no
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: no,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+no"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+no"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/pl b/xorg-server/xkbdata.src/keymap/sgi_vndr/pl
deleted file mode 100644
index 3641a31ad..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/pl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)+pl"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc102)+pl"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/pt b/xorg-server/xkbdata.src/keymap/sgi_vndr/pt
deleted file mode 100644
index 3ec03471a..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/pt
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: pt,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+pt"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ru b/xorg-server/xkbdata.src/keymap/sgi_vndr/ru
deleted file mode 100644
index fc514d87c..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ru
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Xorg: ru,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/se b/xorg-server/xkbdata.src/keymap/sgi_vndr/se
deleted file mode 100644
index 910a8cc89..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/se
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: se,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+se"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+se"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/sk b/xorg-server/xkbdata.src/keymap/sgi_vndr/sk
deleted file mode 100644
index 09b6a2956..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/sk
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+sk"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+sk"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
-default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/th b/xorg-server/xkbdata.src/keymap/sgi_vndr/th
deleted file mode 100644
index aa03c8c11..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/th
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Xorg: th,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal)+th+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/us b/xorg-server/xkbdata.src/keymap/sgi_vndr/us
deleted file mode 100644
index 5850145ca..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/us
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Xorg: us,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
-};
-xkb_keymap "indy101_euro" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indy_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
-xkb_keymap "indigo_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101compose)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
-xkb_keymap "indigo101_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101euro)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sony b/xorg-server/xkbdata.src/keymap/sony
deleted file mode 100644
index c4be3b1b8..000000000
--- a/xorg-server/xkbdata.src/keymap/sony
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Xorg: sony,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keymap "news5000-nwp5461" {
-    xkb_keycodes	{ include "sony(nwp5461)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sony_vndr/us(nwp5461)"	};
-    xkb_geometry	{ include "sony(nwp5461)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.am b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.am
deleted file mode 100644
index 551162d3e..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-keymapdir = $(xkb_base)/keymap/sun_vndr
-
-dist_keymap_DATA = \
-all de es fi \
-fr no pl \
-ru se uk \
-us
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/all.in b/xorg-server/xkbdata.src/keymap/sun_vndr/all.in
deleted file mode 100644
index 047ae7bc4..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/all.in
+++ /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/de b/xorg-server/xkbdata.src/keymap/sun_vndr/de
deleted file mode 100644
index 4c1ded3fc..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/de
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Xorg: de,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keymap "type4_de" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_de_nodeadkeys" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_de_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_de" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_de_nodeadkeys" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_de_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+de"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/es b/xorg-server/xkbdata.src/keymap/sun_vndr/es
deleted file mode 100644
index 2de81c011..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/es
+++ /dev/null
@@ -1,62 +0,0 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/es,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_es" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_es_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_es" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_es_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+es"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/fi b/xorg-server/xkbdata.src/keymap/sun_vndr/fi
deleted file mode 100644
index 296ef66c4..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/fi
+++ /dev/null
@@ -1,62 +0,0 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fi,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_fi" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_fi_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_fi" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_fi_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fi"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/fr b/xorg-server/xkbdata.src/keymap/sun_vndr/fr
deleted file mode 100644
index 9301ce031..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/fr
+++ /dev/null
@@ -1,62 +0,0 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_fr" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_fr_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_fr" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_fr_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fr"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/makefile b/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
deleted file mode 100644
index 1dd8b4c45..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-ifeq ($(MAKESERVER),1)
-$(error Please do not specify MAKESERVER=1)
-endif
-
-DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\sun_vndr
-
-dist_keymap_DATA = \
-all de es fi \
-fr no pl \
-ru se uk \
-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.in
-	copy $< $@
-
-
-include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/no b/xorg-server/xkbdata.src/keymap/sun_vndr/no
deleted file mode 100644
index 45669237e..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/no
+++ /dev/null
@@ -1,62 +0,0 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/no,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_no" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_no_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_no" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_no_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+no"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/pl b/xorg-server/xkbdata.src/keymap/sun_vndr/pl
deleted file mode 100644
index 904ffb2d7..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/pl
+++ /dev/null
@@ -1,62 +0,0 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/pl,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_pl" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_pl_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_pl" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_pl_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+pl"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/ru b/xorg-server/xkbdata.src/keymap/sun_vndr/ru
deleted file mode 100644
index fc7d75b1e..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/ru
+++ /dev/null
@@ -1,62 +0,0 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/ru,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_ru" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_ru_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_ru" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_ru_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+ru"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/se b/xorg-server/xkbdata.src/keymap/sun_vndr/se
deleted file mode 100644
index fad7009e4..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/se
+++ /dev/null
@@ -1,56 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/se,v 1.2 1998/12/20 09:34:42 dawes Exp $
-
-default xkb_keymap "type5c_se_fixdollar" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type5c_se)"	};
-};
-xkb_keymap "type5c_se" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)"
-    };
-    xkb_geometry	{ include "sun(type5c_se)"	};
-};
-xkb_keymap "type5_se" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)"
-    };
-    xkb_geometry	{ include "sun(type5_se)"	};
-};
-xkb_keymap "type4_se_fixdollar_swapctl" {
-    xkb_keycodes	{ include "sun(type4_se_swapctl)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
-xkb_keymap "type4_se_fixdollar" {
-    xkb_keycodes	{ include "sun(type4_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
-xkb_keymap "type4_se" {
-    xkb_keycodes	{ include "sun(type4_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/uk b/xorg-server/xkbdata.src/keymap/sun_vndr/uk
deleted file mode 100644
index e1fb4970b..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/uk
+++ /dev/null
@@ -1,62 +0,0 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/uk,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_uk" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_uk_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_uk" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_uk_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+uk"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/us b/xorg-server/xkbdata.src/keymap/sun_vndr/us
deleted file mode 100644
index 397482f84..000000000
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/us
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Xorg: us,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keymap "type4_us" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_us_openlook" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun4ol)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_us" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-xkb_keymap "type5_us_openlook" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-xkb_keymap "type5_unix" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
-xkb_keymap "type5_unix_openlook" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/xfree86 b/xorg-server/xkbdata.src/keymap/xfree86
deleted file mode 100644
index 8686f78d8..000000000
--- a/xorg-server/xkbdata.src/keymap/xfree86
+++ /dev/null
@@ -1,377 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/keymap/xfree86,v 3.30 2003/04/03 16:34:49 dawes Exp $
-
-
-default xkb_keymap "us" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)"		};
-    xkb_geometry	{ include "pc"			};
-};
-
-// "ar" addition by Arabeyes Team, <support@arabeyes.org>
-xkb_keymap "ar" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ara"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "be"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+be"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "bg"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+bg"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
-xkb_keymap "br"	{
-    xkb_keycodes	{ include "xfree86"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+br"	};
-    xkb_geometry 	{ include "pc(abnt2)"		};
-};
-// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
-// are designed to replace old czechoslovakian and czsk keyboards
-// and their prog variants. Those are now obsolete and should not be used anymore.
-xkb_keymap "cz" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+cz"	};
-    xkb_geometry	{ include "pc"			};
-};
-xkb_keymap "de"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+de"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "ch_de"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ch(de)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "ch_fr"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ch(fr)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "dk"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+dk"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "dvorak" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+us(dvorak)"};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "en_US" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "pc(pc105)"	};
-    xkb_geometry 	{ include "pc"			};
-};
-xkb_keymap "es"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+es"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "fr"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+fr"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "fr-latin9" {
-    xkb_keycodes        { include "xfree86"             };
-    xkb_types           { include "default"             };
-    xkb_compatibility   { include "default"             };
-    xkb_symbols         { include "pc(pc105)+fr-latin9" };
-    xkb_geometry        { include "pc"           	};
-};
-xkb_keymap "fr_CA"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ca"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "gb"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+gb"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "hr"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+hr"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "it"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+it"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "jp106" {
-    xkb_keycodes	{ include "xfree86"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "jp(jp106)"		};
-    xkb_geometry	{ include "pc(jp106)"		};
-};
-xkb_keymap "lt"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+lt"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "lt_std"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+lt(std)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "lv"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+lv"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "mk" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+mk"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "mt" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+mt"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "no"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+no"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "pl"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+pl"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "pt"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+pt"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-// ro: additions by Cristian Gafton, <gafton@redhat.com>
-xkb_keymap "ro" {
-    xkb_keycodes	{ include "xfree86"			};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols		{ include "pc(pc105)+ro(pc101)"	};
-    xkb_geometry	{ include "pc(pc101)"			};
-};
-xkb_keymap "ro_microsoft" {
-    xkb_keycodes	{ include "xfree86"			};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols		{ include "pc(pc105)+ro(pc105)"	};
-    xkb_geometry	{ include "pc(pc105)"			};
-};
-xkb_keymap "ru"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ru"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "se_FI"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+fi"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "se_SE"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+se"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "sl" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+si"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "sl_SI" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+si"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
-// are designed to replace old czechoslovakian and czsk keyboards
-// and their prog variants. Those are now obsolete and should not be used anymore.
-xkb_keymap "sk" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+sk"	};
-    xkb_geometry	{ include "pc"			};
-};
-// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
-xkb_keymap "syr" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default" 		};
-    xkb_symbols		{ include "pc(pc105)+syr"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};    
-xkb_keymap "th"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+th"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "th_tis"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+th(tis)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "th_pat"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+th(pat)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "tr" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+tr"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "uk" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+uk)"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "us_flexpro" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc105)"		};
-    xkb_geometry	{ include "keytronic(FlexPro)"	};
-};
-// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
-// us_intl means standard us keyboard plus dead_keys symbols
-// these keyboards are very popular in Brazil
-xkb_keymap "us_intl" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)+us(intl)"	};
-    xkb_geometry	{ include "pc"			};
-};
-xkb_keymap "us_microsoft" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc105)"		};
-    xkb_geometry	{ include "microsoft"		};
-};
-
-xkb_keymap "uz" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+uz"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-
-# svu: compatibility keymaps, based on variants
-xkb_keymap "cz_qwerty" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+cz(qwerty)"	};
-    xkb_geometry	{ include "pc"			};
-};
-xkb_keymap "de_CH"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ch(de)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "fr_CH"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ch(fr)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "mt_us" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+mt(us)"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "sk_qwerty" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+sk(qwerty)"	};
-    xkb_geometry	{ include "pc"			};
-};
diff --git a/xorg-server/xkbdata.src/keymap/xfree98 b/xorg-server/xkbdata.src/keymap/xfree98
deleted file mode 100644
index b344eedbc..000000000
--- a/xorg-server/xkbdata.src/keymap/xfree98
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Xorg: xfree98,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/xfree98,v 3.6 2001/01/17 23:45:53 dawes Exp $
-
-default xkb_keymap "jp" {
-    xkb_keycodes	{ include "xfree98"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "nec_vndr/jp(pc98)"	};
-    xkb_geometry	{ include "nec(pc98)"		};
-};