adding Swiss layouts and removing references to pc/ from files

83 files changed, 373 insertions, 216 deletions

diff --git a/po/af.po b/po/af.po
index c56b3511..0fe6d462 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2004-03-18 00:17+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
diff --git a/po/az.po b/po/az.po
index aa906c9a..5e253ceb 100755
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml-4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2004-03-21 20:00+0200\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
diff --git a/po/bg.po b/po/bg.po
index 0b09bd4b..f86c7b0c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2002-12-10 19:52+0200\n"
 "Last-Translator: Alexander Shopov <al_shopov@web.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
diff --git a/po/cs.po b/po/cs.po
index 23494913..0341c196 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2003-11-27 21:34GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index e9bf5938..8455d2b0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml-4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2003-12-17 23:03+0100\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
diff --git a/po/fr.po b/po/fr.po
index d7e740fb..17ebc16b 100644
--- a/po/fr.po
+++ b/po/fr.po
diff --git a/po/hu.po b/po/hu.po
index 2354b848..88b4fe6d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2004-01-24 10:46+0100\n"
 "Last-Translator: Andras Timar <timar@fsf.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
diff --git a/po/nl.po b/po/nl.po
index f6e257dd..d27c05bb 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2004-01-03 15:04+0100\n"
 "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 9943ab93..214e0b29 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2004-01-09 16:17+0000\n"
 "Last-Translator: Sergey V. Oudaltsov <svu@gnome.org>\n"
 "Language-Team: Russian <ru@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 2ff01ff2..d03db9cd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2003-12-10 21:36+0100\n"
 "Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
diff --git a/po/sq.po b/po/sq.po
index 087a21c8..b1a9647c 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2004-03-03 08:55-0500\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -963,7 +963,7 @@ msgid "Northern Saami (Sweden)"
 msgstr "Northern Saami (Suedeze)"
 
 #: rules/base.xml.in.h:236
-msgid "Northgate OmniKey 101"
+msgid "Northgate OmniKey
 msgstr "Northgate OmniKey 101"
 
 #: rules/base.xml.in.h:237
diff --git a/po/sr.po b/po/sr.po
index 576b275b..875059c1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2003-11-28 20:27+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 7b69adb8..ec3c8f87 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2004-03-18 23:25+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 300ada5f..654e3181 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2003-12-03 11:09+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
diff --git a/po/uk.po b/po/uk.po
index a5b15c63..bbd454de 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2002-05-29 21:11+100\n"
 "Last-Translator: Sergey V. Oudaltsov <svu@users.sourceforge.net>\n"
 "Language-Team: Russian\n"
@@ -1079,7 +1079,7 @@ msgstr "Вибір 3-го рівня натисненням правої кла�
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням довільної клавіші Win"
 
-#: rules/base.xml.in.h:263
+
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням довільної клавіші Win"
 
diff --git a/po/xkbdesc.pot b/po/xkbdesc.pot
index 225b74b3..0397c1b0 100644
--- a/po/xkbdesc.pot
+++ b/po/xkbdesc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a74599b3..98841208 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-15 00:07+0100\n"
+"POT-Creation-Date: 2004-04-19 23:58+0100\n"
 "PO-Revision-Date: 2003-11-28 22:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 9642a109..7369a7e4 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -8,8 +8,12 @@ install-data-hook:
 	ln -s base.lst $(DESTDIR)$(rulesdir)/$(extra_lst_file)
 	ln -s base.xml $(DESTDIR)$(rulesdir)/$(extra_dir_file)
 
+else
+install-data-hook:
+
 endif
 
+
 rules_files = \
 base base-it.lst base.lst \
 sgi sgi.lst \
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index b0746c38..3c4e67b0 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = digital.vndr fujitsu.vndr hp.vndr macintosh.vndr nec.vndr sgi.vndr son
 symbols_DATA = \
 al am ar \
 be ben bg \
-br bs by cz \
+br bs by ch cz \
 cz_qwerty de dev \
 dk dvorak dz \
 ee el en_US \
diff --git a/symbols/al b/symbols/al
index 4e025c98..8268205d 100644
--- a/symbols/al
+++ b/symbols/al
@@ -3,12 +3,12 @@
 // albanian keyboard layout
 // done by Pablo Saratxaga <pablo@mandrakesoft.com>
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/al,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/al,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type3)"
+    include "latin(type3)"
 
     name[Group1]="Albanian";
 
diff --git a/symbols/am b/symbols/am
index f7ea4e92..48f8b420 100644
--- a/symbols/am
+++ b/symbols/am
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/am' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/am,v 1.4 2003/05/29 12:41:58 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/am,v 1.4 2003/05/29 12:41:58 pascal Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
@@ -66,7 +66,7 @@ xkb_symbols "basic" {
 };
 
 xkb_symbols "old" {
-    include "pc/am(basic)"
+    include "am(basic)"
 	
     key <BKSL> {	[ 0x1002026,  0x1000587 ]	};
 
@@ -122,7 +122,7 @@ xkb_symbols "old" {
 };
 
 xkb_symbols "phonetic" {
-    include "pc/am(old)"
+    include "am(old)"
 	
     key <BKSL> {	[ 0x1000577,  0x1000547 ]	};
 	
diff --git a/symbols/ar b/symbols/ar
index 373fb6b4..d5d97dd5 100644
--- a/symbols/ar
+++ b/symbols/ar
@@ -71,12 +71,12 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "qwerty" {
-    include "pc/ar(basic)"
+    include "ar(basic)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "azerty" {
-    include "pc/ar(basic)"
+    include "ar(basic)"
 
 	// the north african arabic keyboard differs from the middle east one
 	// by the numeric row; it follows French keyboard style
@@ -103,7 +103,7 @@ xkb_symbols "azerty" {
 
 partial alphanumeric_keys
 xkb_symbols "digits" {
-    include "pc/ar(basic)"
+    include "ar(basic)"
 
 	// use arabic script digits
 
@@ -121,12 +121,12 @@ xkb_symbols "digits" {
 
 partial alphanumeric_keys
 xkb_symbols "qwerty_digits" {
-    include "pc/ar(digits)"
+    include "ar(digits)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "azerty_digits" {
-    include "pc/ar(azerty)"
+    include "ar(azerty)"
 	
     key <AE01> {  [       ampersand,       0x1000661      ]       };
     key <AE02> {  [          eacute,       0x1000662      ]       };
diff --git a/symbols/be b/symbols/be
index 323a0636..325d75b6 100644
--- a/symbols/be
+++ b/symbols/be
@@ -1,12 +1,12 @@
 
 // based on a keyboard map from an 'xkb/symbols/be' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/be,v 1.3 2003/04/12 10:53:48 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/be,v 1.3 2003/04/12 10:53:48 pascal Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Belgian";
 
@@ -47,7 +47,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "iso-alternate" {
-    include "pc/be(basic)"
+    include "be(basic)"
 
     key <AD01>	{ [         a,          A,           ae,           AE ]	};
     key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
@@ -62,7 +62,7 @@ xkb_symbols "Sundeadkeys" {
 
     // Use the Sun dead keys
 
-    include "pc/be(basic)"
+    include "be(basic)"
 
     key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis, bracketleft, bracketleft] };
     key <AC11>	{ [    ugrave,    percent,  SunFA_Acute,  SunFA_Acute ]	};
@@ -76,7 +76,7 @@ xkb_symbols "sundeadkeys" {
 
     // Use the Sun dead keys
 
-    include "pc/be(Sundeadkeys)"
+    include "be(Sundeadkeys)"
 
 };
 
@@ -85,7 +85,7 @@ xkb_symbols "nodeadkeys" {
 
     // Eliminates dead keys from the basic Belgian layout
 
-    include "pc/be(basic)"
+    include "be(basic)"
 
     key <AE12>	{ [     minus, underscore,      cedilla,       ogonek ]	};
     key <AD11>	{ [asciicircum,  diaeresis,  bracketleft,  bracketleft]	};
diff --git a/symbols/ben b/symbols/ben
index 9dd48e50..7aa8f4f4 100644
--- a/symbols/ben
+++ b/symbols/ben
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/ben' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/ben,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ben,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
diff --git a/symbols/br b/symbols/br
index 6c4536c3..61ba8b95 100644
--- a/symbols/br
+++ b/symbols/br
@@ -5,12 +5,12 @@
 // Adds suport for dead-keys in I18N applications
 // by Conectiva  (http://www.conectiva.com.br)"
 //
-// $XdotOrg: xc/programs/xkbcomp/symbols/pc/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $
-// $XFree86: xc/programs/xkbcomp/symbols/pc/br,v 1.3 2003/04/19 12:22:11 pascal Exp $
+// $XdotOrg: xc/programs/xkbcomp/symbols/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/br,v 1.3 2003/04/19 12:22:11 pascal Exp $
 
 xkb_symbols "abnt2" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Brazilian";
 
@@ -50,7 +50,7 @@ xkb_symbols "abnt2" {
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "pc/br(abnt2)" // for consistent naming
+    include "br(abnt2)" // for consistent naming
 
     key <AE06>	{ [         6,  diaeresis,      notsign,      notsign ]	};
     key <AD11>	{ [apostrophe,      grave ]	};
diff --git a/symbols/by b/symbols/by
index d8c6a4b4..f6366314 100644
--- a/symbols/by
+++ b/symbols/by
@@ -63,7 +63,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "winkeys" {
-    include "pc/by(basic)"
+    include "by(basic)"
     key	<AE04> {	[		4,       semicolon	]	};
     key	<AE03> {	[		3,      numbersign	]	};
     key	<AE05> {	[		5,	   percent	]	};
diff --git a/symbols/ch b/symbols/ch
new file mode 100644
index 00000000..d5158420
--- /dev/null
+++ b/symbols/ch
@@ -0,0 +1,153 @@
+// $Xorg: ch,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+
+
+
+
+// $XFree86: xc/programs/xkbcomp/symbols/ch,v 3.6 2002/11/25 14:05:06 eich Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss keyboard
+
+    // Alphanumeric section
+    name[Group1]= "Swiss German";
+    key <TLDE> {	[   section,	degree		]	};
+    key <AE01> {	[	  1,	plus 		],
+			[       bar,	exclamdown	]	};
+    key <AE02> {	[	  2,	quotedbl	],
+			[        at,	oneeighth	]	};
+    key <AE03> {	[	  3,	asterisk	],
+			[ numbersign			]	};
+    key <AE04> {	[	  4,	ccedilla	]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	ampersand	],
+			[   notsign			]	};
+    key <AE07> {	[	  7,	slash		],
+			[ brokenbar			]	};
+    key <AE08> {	[	  8,	parenleft	],
+			[      cent			]	};
+    key <AE09> {	[	  9,	parenright	]	};
+    key <AE10> {	[	  0,	equal		]	};
+    key <AE11> {	[ apostrophe,	question	],
+			[ dead_acute			]	};
+    key <AE12> {	[ dead_circumflex, dead_grave	],
+			[ dead_tilde			]	};
+
+    key <AD03> {	[	  e,	E		],
+			[  EuroSign			]	};
+    key <AD06> {	[	  z,	Z		]	};
+    key <AD11> {	[ udiaeresis,	egrave		],
+			[ bracketleft			]	};
+    key <AD12> {	[ dead_diaeresis, exclam	],
+			[ bracketright			]	};
+
+    key <AC10> {	[ odiaeresis,	eacute		]	};
+    key <AC11> {	[ adiaeresis,	agrave		],
+			[  braceleft			]	};
+    key <BKSL> {	[     dollar,	sterling	],
+			[ braceright			]	};
+
+    key <LSGT> {	[      less,	greater		],
+			[ backslash,	brokenbar	]	};
+    key <AB01> {	[	  y,	Y 		]	};
+    key <AB08> {	[     comma,	semicolon	]	};
+    key <AB09> {	[    period,	colon		]	};
+    key <AB10> {	[     minus,	underscore	]	};
+
+    // End alphanumeric section, begin "Keypad"
+    key <KPDL> {	[  KP_Delete,	KP_Decimal	]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de" {
+    include "ch(basic)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de-Sundeadkeys" {
+    // modify the default Swiss German layout to use Sun dead keys
+    include "ch(basic)"
+    key <AE11> {	[ apostrophe,	question	],
+			[ SunFA_Acute			]	};
+    key <AE12> {	[ SunFA_Circum,	SunFA_Grave	],
+			[ SunFA_Tilde			]	};
+    key <AD12> {	[ SunFA_Diaeresis, exclam	],
+			[ bracketright			]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de-sundeadkeys" {
+    include "ch(Sundeadkeys)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de-nodeadkeys" {
+    // modify the default Swiss German layout not to have any dead keys
+    include "ch(basic)"
+    key <AE11> {	[ apostrophe,	question	],
+			[ acute				]	};
+    key <AE12> {	[ asciicircum,	grave		],
+			[ asciitilde			]	};
+    key <AD12> {	[ diaeresis,	exclam		],
+			[ bracketright			]	};
+};
+
+partial default alphanumeric_keys 
+xkb_symbols "fr" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss/French keybaord
+
+    include "ch(basic)"
+    name[Group1]= "Swiss French";
+
+    override key <AD11> {
+	[ egrave,	udiaeresis	],
+	[ bracketleft			]
+    };
+    override key <AC10> {
+	[ eacute,	odiaeresis	]
+    };
+    override key <AC11> {
+	[ agrave,	adiaeresis	],
+	[  braceleft			]
+    };
+};
+
+partial alphanumeric_keys
+xkb_symbols "fr-Sundeadkeys" {
+    // modify the default Swiss French layout to use Sun dead keys
+    include "ch(fr)"
+    key <AE11> {	[ apostrophe,	question	],
+			[ SunFA_Acute			]	};
+    key <AE12> {	[ SunFA_Circum,	SunFA_Grave	],
+			[ SunFA_Tilde			]	};
+    key <AD12> {	[ SunFA_Diaeresis, exclam	],
+			[ bracketright			]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "fr-sundeadkeys" {
+    include "ch(fr-Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "fr-nodeadkeys" {
+    // modify the default Swiss French layout not to have any dead keys
+    include "ch(fr)"
+    key <AE11> {	[ apostrophe,	question	],
+			[ acute				]	};
+    key <AE12> {	[ asciicircum,	grave		],
+			[ asciitilde			]	};
+    key <AD12> {	[ diaeresis,	exclam		],
+			[ bracketright			]	};
+};
diff --git a/symbols/cz b/symbols/cz
index dbacdb11..a6890346 100644
--- a/symbols/cz
+++ b/symbols/cz
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/pc/cz,v 1.2 2002/11/22 04:02:22 dawes 
+// $XFree86: xc/programs/xkbcomp/symbols/cz,v 1.2 2002/11/22 04:02:22 dawes 
 // Exp $
 
 partial alphanumeric_keys 
@@ -8,7 +8,7 @@ xkb_symbols "basic" {
      // to satisfy most unix, windows and mac users.
      // 2001 by Kamil Toman <ktoman@email.cz>
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]= "Czech";
 
@@ -77,7 +77,7 @@ xkb_symbols "basic" {
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
 xkb_symbols "bksl" {
-    include "pc/cz(basic)"
+    include "cz(basic)"
 
     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
 };
diff --git a/symbols/cz_qwerty b/symbols/cz_qwerty
index 1d1c47a0..86d8dfdb 100644
--- a/symbols/cz_qwerty
+++ b/symbols/cz_qwerty
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
     // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
     // 2001 by Kamil Toman <ktoman@email.cz>
     
-    include "pc/cz(basic)"
+    include "cz(basic)"
 
     key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
     key <AD06>	{ [         y,          Y,     NoSymbol,     NoSymbol ]	};
@@ -15,7 +15,7 @@ xkb_symbols "basic" {
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
 xkb_symbols "bksl" {
-    include "pc/cz_qwerty(basic)"
+    include "cz_qwerty(basic)"
 
     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
 };
diff --git a/symbols/de b/symbols/de
index 86be7a34..94d1f5fa 100644
--- a/symbols/de
+++ b/symbols/de
@@ -1,11 +1,11 @@
 
 // based on a keyboard map from an 'xkb/symbols/de' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
 
 xkb_symbols "basic" {
 
-    include "pc/latin(type4)"
+    include "latin(type4)"
 
     name[Group1]="German";
 
@@ -37,7 +37,7 @@ xkb_symbols "nodeadkeys" {
 
     // modify the default German layout to not have any dead keys
 
-    include "pc/de(basic)"
+    include "de(basic)"
 
     key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
     key <AE12>	{ [     acute,      grave,      cedilla,      cedilla ]	};
@@ -55,7 +55,7 @@ xkb_symbols "deadgraveacute" {
     // as dead keys (tilde and circumflex are needed as spacing characters
     // in many programming languages)
 
-    include "pc/de(basic)"
+    include "de(basic)"
 
     key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
     key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};
@@ -68,7 +68,7 @@ xkb_symbols "deadacute" {
     // dead keys (ASCII grave, tilde and circumflex are needed as
     // spacing characters in many programming languages and text formatters)
 
-    include "pc/de(deadgraveacute)"
+    include "de(deadgraveacute)"
 
     key <AE12>	{ [dead_acute,      grave, dead_cedilla,  dead_ogonek ]	};
     key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_grave ]	};
@@ -82,7 +82,7 @@ xkb_symbols "de_ro" {
     // To view romanian-specific symbols, add "export LC_CTYPE=ro_RO"
     // or "export LC_CTYPE=de_DE.utf8" to your .profile.
 
-    include "pc/de(basic)"
+    include "de(basic)"
 
     name[Group1]="Romanian for German keyboard";
 
@@ -98,7 +98,7 @@ xkb_symbols "de_ro_nodeadkeys" {
     // add romanian-specific letters to the German nodeadkeys layout.
     // Read the comment for de_ro !
 
-    include "pc/de(nodeadkeys)"
+    include "de(nodeadkeys)"
 
     key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
     key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
diff --git a/symbols/dk b/symbols/dk
index a5013492..4d6273e8 100644
--- a/symbols/dk
+++ b/symbols/dk
@@ -1,12 +1,12 @@
 
 // based on a keyboard map from an 'xkb/symbols/dk' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/dk,v 1.3 2002/12/19 01:07:56 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/dk,v 1.3 2002/12/19 01:07:56 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type2)"
+    include "latin(type2)"
 
     name[Group1]="Danish";
 
@@ -30,7 +30,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "pc/dk(basic)"
+    include "dk(basic)"
 
     key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};
     key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};
diff --git a/symbols/dvorak b/symbols/dvorak
index 2cc95e6c..70658fc4 100644
--- a/symbols/dvorak
+++ b/symbols/dvorak
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/dk' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/dvorak,v 1.5 2004/01/03 16:35:07 herrb Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/dvorak,v 1.5 2004/01/03 16:35:07 herrb Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -67,7 +67,7 @@ xkb_symbols "basic" {
 // Norwegian Dvorak
 partial alphanumeric_keys 
 xkb_symbols "no" {
-    include "pc/dvorak(basic)"
+    include "dvorak(basic)"
 
     key <TLDE> { [	  bar,	section, brokenbar, paragraph	] };
 
@@ -115,7 +115,7 @@ xkb_symbols "no" {
 // Swedish Dvorak
 partial alphanumeric_keys 
 xkb_symbols "se" {
-    include "pc/dvorak(no)"
+    include "dvorak(no)"
 
     key <TLDE> { [     section,	onehalf		]	};
 
@@ -140,7 +140,7 @@ xkb_symbols "se" {
 // Swedish Dvorak alias
 partial alphanumeric_keys 
 xkb_symbols "sv" {
-    include "pc/dvorak(se)"
+    include "dvorak(se)"
 };
 
 // Dvorak (UK) keymap (by odaen) allowing the usage of
@@ -148,7 +148,7 @@ xkb_symbols "sv" {
 
 partial alphanumeric_keys
 xkb_symbols "gb" {
-    include "pc/dvorak(basic)"
+    include "dvorak(basic)"
 
     key <BKSL> { [ numbersign,	asciitilde	] };
     key <AE02> { [	    2,	quotedbl,  twosuperior,   NoSymbol	] };
@@ -237,7 +237,7 @@ xkb_symbols "fr" {
 // Basic Polish keymap (without Polish quotes)
 partial alphanumeric_keys 
 xkb_symbols "pl_basic" {
-    include "pc/dvorak(basic)"
+    include "dvorak(basic)"
     
     name[Group1] = "Polish Dvorak";
 
@@ -261,7 +261,7 @@ xkb_symbols "pl_basic" {
 // Default Polish keymap with Polish quotes on quotemark key
 partial alphanumeric_keys
 xkb_symbols "pl" {
-    include "pc/dvorak(pl_basic)"
+    include "dvorak(pl_basic)"
     
     key <AD01> { [  apostrophe,	quotedbl, doublelowquotemark, rightdoublequotemark	] };
 
@@ -272,7 +272,7 @@ xkb_symbols "pl" {
 // Polish keymap with Polish quotes on key "1/!"
 partial alphanumeric_keys
 xkb_symbols "pl_altquotes" {
-    include "pc/dvorak(pl_basic)"
+    include "dvorak(pl_basic)"
 
     key <AE01> { [	    1,	exclam, doublelowquotemark, rightdoublequotemark	]	};
 };
diff --git a/symbols/ee b/symbols/ee
index 43daf5c9..482679d0 100644
--- a/symbols/ee
+++ b/symbols/ee
@@ -2,7 +2,7 @@
 // based on
 // Estonian XKB-keymap by Ville Hallik <ville@linux.ee>
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/ee,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ee,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -11,7 +11,7 @@ xkb_symbols "basic" {
     // keyboard and a very simple Estonian keyboard
     // This layout conforms to both EVS8:1993 and EVS8:2000 standards
 
-    include "pc/latin(type4)"
+    include "latin(type4)"
 
     name[Group1]="Estonian";
 
@@ -42,7 +42,7 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic Estonian layout to eliminate all dead keys
 
-    include "pc/ee(basic)"
+    include "ee(basic)"
 
     key <TLDE>	{ [asciicircum,asciitilde ]	};
     key <AE12>	{ [apostrophe,      grave ]	};
diff --git a/symbols/el b/symbols/el
index 920019d0..2b30781c 100644
--- a/symbols/el
+++ b/symbols/el
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/pc/el,v 1.2 2002/11/15 02:26:41 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/el,v 1.2 2002/11/15 02:26:41 dawes Exp $
 //
 // Hellenic keyboard map for XFree86
 // Original version:
@@ -11,7 +11,7 @@
 default partial alphanumeric_keys alternate_group
 xkb_symbols "basic" {
 
-    include "pc/el(bare)"
+    include "el(bare)"
 
     key <TLDE> {	[     grave,	asciitilde	]	};
     key <AE01> {	[	  1,	exclam 		]	};
@@ -81,7 +81,7 @@ xkb_symbols "bare" {
 partial alphanumeric_keys alternate_group
 xkb_symbols "extended" {
 
-    include "pc/el(basic)"
+    include "el(basic)"
 
     key.type = "THREE_LEVEL";
 
@@ -99,7 +99,7 @@ xkb_symbols "extended" {
 partial alphanumeric_keys alternate_group
 xkb_symbols "polytonic" {
 
-    include "pc/el(extended)"
+    include "el(extended)"
 
     key.type = "THREE_LEVEL";
 
@@ -114,7 +114,7 @@ xkb_symbols "polytonic" {
 partial alphanumeric_keys alternate_group
 xkb_symbols "nodeadkeys" {
 
-    include "pc/el(basic)"
+    include "el(basic)"
 
     key <AC10> { [	semicolon,		colon		] };
 
diff --git a/symbols/en_US b/symbols/en_US
index d8a34e08..b24bf224 100644
--- a/symbols/en_US
+++ b/symbols/en_US
@@ -1,12 +1,12 @@
 
 // based on a keyboard map from an 'xkb/symbols/iso3335-3' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/en_US,v 1.3 2003/01/26 02:01:48 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/en_US,v 1.3 2003/01/26 02:01:48 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
     name[Group1]="en_US";
 
     include "level3(ralt_switch_multikey)"
@@ -16,7 +16,7 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic iso9995-3 layout to eliminate all dead keys
 
-    include "pc/en_US(basic)"
-    include "pc/latin(nodeadkeys)"
+    include "en_US(basic)"
+    include "latin(nodeadkeys)"
 
 };
diff --git a/symbols/es b/symbols/es
index 38c10175..39f7e43d 100644
--- a/symbols/es
+++ b/symbols/es
@@ -2,12 +2,12 @@
 // based on a keyboard
 // Modified for a real Spanish Keyboard by Jon Tombs
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/es,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/es,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type4)"
+    include "latin(type4)"
 
     name[Group1]="Spanish";
 
@@ -33,7 +33,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "Sundeadkeys" {
 
-    include "pc/es(basic)"
+    include "es(basic)"
 
     key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
     key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
@@ -42,13 +42,13 @@ xkb_symbols "Sundeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
 
-    include "pc/es(Sundeadkeys)"
+    include "es(Sundeadkeys)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "pc/es(basic)"
+    include "es(basic)"
 
     key <AD11>	{ [     grave, asciicircum,  bracketleft,      degree ]	};
     key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};
diff --git a/symbols/fi b/symbols/fi
index 11e096d4..9c95b26c 100644
--- a/symbols/fi
+++ b/symbols/fi
@@ -1,12 +1,12 @@
 // based on a keyboard map from an 'xkb/symbols/fi' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
 
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
-    include "pc/latin(type2)"
-    include "pc/fi(fi)"
+    include "latin(type2)"
+    include "fi(fi)"
 };
 
 partial alphanumeric_keys
@@ -63,9 +63,9 @@ xkb_symbols "fi" {
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
-    include "pc/latin(type2)"
-    include "pc/latin(type2_nodeadkeys)"
-    include "pc/fi(fi)"
+    include "latin(type2)"
+    include "latin(type2_nodeadkeys)"
+    include "fi(fi)"
 
     key <AE12> { [ acute, grave ] };
     key <AD12> { [ diaeresis, asciicircum, asciitilde, caron ] };
diff --git a/symbols/fo b/symbols/fo
index d21887ce..212064fd 100644
--- a/symbols/fo
+++ b/symbols/fo
@@ -3,7 +3,7 @@
 partial alphanumeric_keys 
 xkb_symbols "basic" {
 
-    include "pc/latin(type2)"
+    include "latin(type2)"
 
     name[Group1]= "Faroese";
 
@@ -35,7 +35,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
 
-    include "pc/fo(basic)"
+    include "fo(basic)"
 
     key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};
     key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};
diff --git a/symbols/fr b/symbols/fr
index d731f900..14078dbd 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -1,12 +1,12 @@
 
 // based on a keyboard map from an 'xkb/symbols/fr' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/fr,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/fr,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="French";
 
@@ -49,7 +49,7 @@ xkb_symbols "Sundeadkeys" {
 
     // Modifies the basic French layout to use the Sun dead keys
 
-    include "pc/fr(basic)"
+    include "fr(basic)"
 
     key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis ]	};
     key <AB07>	{ [comma,   question,  SunFA_Acute, dead_doubleacute ]	};
@@ -57,7 +57,7 @@ xkb_symbols "Sundeadkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
-    include "pc/fr(Sundeadkeys)"
+    include "fr(Sundeadkeys)"
 
 };
 
@@ -66,7 +66,7 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic French layout to eliminate all dead keys
 
-    include "pc/fr(basic)"
+    include "fr(basic)"
 
     key <AE12>	{ [     equal,       plus,   braceright,       ogonek ]	};
     key <AD11>	{ [asciicircum,  diaeresis ]	};
diff --git a/symbols/fr-latin9 b/symbols/fr-latin9
index f4676322..5e434799 100644
--- a/symbols/fr-latin9
+++ b/symbols/fr-latin9
@@ -4,7 +4,7 @@
 //                          Nicolas Mailhot <Nicolas.Mailhot @ laposte.net>
 //                              (XFree86 submission)
 //
-//  $XFree86: xc/programs/xkbcomp/symbols/pc/fr-latin9,v 1.1 2002/12/20 02:07:11 dawes Exp $
+//  $XFree86: xc/programs/xkbcomp/symbols/fr-latin9,v 1.1 2002/12/20 02:07:11 dawes Exp $
 //
 // This layout has long been distributed and refined outside official channels.
 // To this day it remains more feature-rich and popular than the 'fr' layout.
@@ -68,7 +68,7 @@ partial default alphanumeric_keys
 
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="fr-latin9";
 
@@ -138,7 +138,7 @@ xkb_symbols "Sundeadkeys" {
 
     // Modifies the basic fr-latin9 layout to use the Sun dead keys
 
-    include "pc/fr-latin9(basic)"
+    include "fr-latin9(basic)"
 
     key <AE01>	{ [       ampersand,               1,         SunFA_Acute,       periodcentered ] };
     key <AE07>	{ [          egrave,               7,         SunFA_Grave,               Egrave ] };
@@ -149,7 +149,7 @@ xkb_symbols "Sundeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
 
-    include "pc/fr-latin9(Sundeadkeys)"
+    include "fr-latin9(Sundeadkeys)"
 
 };
 
@@ -158,7 +158,7 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic fr-latin9 layout to eliminate all dead keys
 
-    include "pc/fr-latin9(basic)"
+    include "fr-latin9(basic)"
 
     key <AE01>	{ [       ampersand,               1,          apostrophe,       periodcentered ] };
     key <AE07>	{ [          egrave,               7,               grave,               Egrave ] };
diff --git a/symbols/gb b/symbols/gb
index d2ec15bc..d3ea9bbd 100644
--- a/symbols/gb
+++ b/symbols/gb
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/gb' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/gb,v 1.6 2003/10/04 10:25:14 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/gb,v 1.6 2003/10/04 10:25:14 pascal Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -11,7 +11,7 @@ xkb_symbols "basic" {
     // the SVR4 European Language Supplement and sometimes also
     // known as the IBM 166 layout.
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Great Britain";
 
@@ -42,7 +42,7 @@ xkb_symbols "intl" {
     // dead_tilde 
     // dead_diaeresis 
 
-    include "pc/latin" 
+    include "latin" 
 
     name[Group1]="Great Britain"; 
 
diff --git a/symbols/ge_la b/symbols/ge_la
index 62a782d3..528b8f16 100644
--- a/symbols/ge_la
+++ b/symbols/ge_la
@@ -3,8 +3,8 @@
 //  Georgian keyboard map, in the so called "latin" layout.
 //  1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>
 //
-// $XdotOrg: xc/programs/xkbcomp/symbols/pc/ge_la,v 1.1.4.2 2004/03/05 13:41:33 eich Exp $
-// $XFree86: xc/programs/xkbcomp/symbols/pc/ge_la,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XdotOrg: xc/programs/xkbcomp/symbols/ge_la,v 1.1.4.2 2004/03/05 13:41:33 eich Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ge_la,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
diff --git a/symbols/hr b/symbols/hr
index 388cb94e..1690d936 100644
--- a/symbols/hr
+++ b/symbols/hr
@@ -11,12 +11,12 @@
 // 2003-04-03 Added <KPDL> (Delete/Separator)
 // 2000-02-06 Initial version
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/hr,v 1.3 2003/04/13 18:22:21 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/hr,v 1.3 2003/04/13 18:22:21 dawes Exp $
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type3)"
+    include "latin(type3)"
 
     name[Group1]="Croatian";
 
diff --git a/symbols/ie b/symbols/ie
index 09c2c135..41f2b28d 100644
--- a/symbols/ie
+++ b/symbols/ie
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/pc/ie,v 1.3 2002/12/31 02:07:04 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ie,v 1.3 2002/12/31 02:07:04 dawes Exp $
 
 // Irish keyboard map
 
diff --git a/symbols/il b/symbols/il
index 0a3386b5..4be36a81 100644
--- a/symbols/il
+++ b/symbols/il
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/il' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/il,v 1.3 2003/01/07 02:03:44 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/il,v 1.3 2003/01/07 02:03:44 dawes Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
@@ -120,7 +120,7 @@ partial alphanumeric_keys
 xkb_symbols "si1452" {
     name[Group1]= "Israelian";
 
-    include "pc/il(basic)"
+    include "il(basic)"
     
     key.type = "THREE_LEVEL";
     
diff --git a/symbols/is b/symbols/is
index a04ad183..a9438860 100644
--- a/symbols/is
+++ b/symbols/is
@@ -3,12 +3,12 @@
 // XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is
 //     fixes by Olafur Osvaldsson - oli@isnic.is
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/is,v 1.3 2002/11/26 01:57:25 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/is,v 1.3 2002/11/26 01:57:25 dawes Exp $
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type4)"
+    include "latin(type4)"
 
     name[Group1]="Icelandic";
 
@@ -35,7 +35,7 @@ xkb_symbols "Sundeadkeys" {
 
     // modify the default Icelandic layout to use Sun dead keys
 
-    include "pc/is(basic)"
+    include "is(basic)"
 
     key <TLDE>	{ [SunFA_Circum,     degree,      notsign,    notsign ]	};
     key <AE12>	{ [SunFA_Acute, SunFA_Grave, SunFA_Cedilla, SunFA_Cedilla ] };
@@ -51,7 +51,7 @@ xkb_symbols "nodeadkeys" {
 
     // modify the default Icelandic layout to not have any dead keys
 
-    include "pc/is(basic)"
+    include "is(basic)"
 
     key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
     key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};
diff --git a/symbols/it b/symbols/it
index e09ecca2..e280f140 100644
--- a/symbols/it
+++ b/symbols/it
@@ -2,12 +2,12 @@
 // based on a keyboard map from an 'xkb/symbols/it' file
 // 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it)
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/it,v 1.4 2003/04/19 12:22:12 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/it,v 1.4 2003/04/19 12:22:12 pascal Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type4)"
+    include "latin(type4)"
 
     name[Group1]="Italian";
 
@@ -44,7 +44,7 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic italian layout to eliminate all dead keys
 
-    include "pc/it(basic)"
+    include "it(basic)"
 
     key <AE02>	{ [         2,   quotedbl,  twosuperior,  doubleacute ] };
     key <AE03>	{ [         3,   sterling,threesuperior,   asciitilde ]	};
diff --git a/symbols/la b/symbols/la
index 81dc2e6b..8318df00 100644
--- a/symbols/la
+++ b/symbols/la
@@ -2,12 +2,12 @@
 // based on a keyboard
 // Modified for a real Latin American Keyboard by Fabian Mandelbaum
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/la,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/la,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type4)"
+    include "latin(type4)"
 
     name[Group1]="Latin American";
 
@@ -32,7 +32,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "Sundeadkeys" {
-    include "pc/la(basic)"
+    include "la(basic)"
 
     key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
     key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
@@ -40,14 +40,14 @@ xkb_symbols "Sundeadkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
-    include "pc/la(Sundeadkeys)"
+    include "la(Sundeadkeys)"
 
 };
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "pc/la(basic)"
+    include "la(basic)"
 
     key <AE12>	{ [questiondown, exclamdown,    cedilla,       ogonek ]	};
     key <AD11>	{ [     grave, asciicircum, bracketleft,       degree ]	};
diff --git a/symbols/latin b/symbols/latin
index 0f979002..983ce3cc 100644
--- a/symbols/latin
+++ b/symbols/latin
@@ -1,7 +1,7 @@
 
 // Common Latin alphabet layout
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/latin,v 1.3 2002/12/20 20:18:34 paulo Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/latin,v 1.3 2002/12/20 20:18:34 paulo Exp $
 
 default partial
 xkb_symbols "basic" {
@@ -64,7 +64,7 @@ xkb_symbols "basic" {
 partial
 xkb_symbols "type2" {
 
-    include "pc/latin"
+    include "latin"
 
     key <AE01>	{ [         1,     exclam,   exclamdown,  onesuperior ]	};
     key <AE02>	{ [         2,   quotedbl,           at,  twosuperior ]	};
@@ -98,7 +98,7 @@ xkb_symbols "type2" {
 partial
 xkb_symbols "type3" {
 
-    include "pc/latin"
+    include "latin"
 
     key <AD01>	{ [         q,          Q,    backslash,  Greek_OMEGA ]	};
     key <AD02>	{ [         w,          W,          bar,      Lstroke ]	};
@@ -123,7 +123,7 @@ xkb_symbols "type3" {
 partial
 xkb_symbols "type4" {
 
-    include "pc/latin"
+    include "latin"
 
     key <AE02>	{ [         2,   quotedbl,           at,    oneeighth ]	};
     key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
@@ -154,7 +154,7 @@ xkb_symbols "nodeadkeys" {
 partial
 xkb_symbols "type2_nodeadkeys" {
  
-    include "pc/latin(nodeadkeys)"
+    include "latin(nodeadkeys)"
 
     key <AD11>	{ [     aring,      Aring,   diaeresis,        degree ]	};
     key <AD12>	{ [ diaeresis, asciicircum, asciitilde,         caron ]	};
@@ -166,13 +166,13 @@ xkb_symbols "type2_nodeadkeys" {
 partial
 xkb_symbols "type3_nodeadkeys" {
  
-    include "pc/latin(nodeadkeys)"
+    include "latin(nodeadkeys)"
 };
 
 partial
 xkb_symbols "type4_nodeadkeys" {
  
-    include "pc/latin(nodeadkeys)"
+    include "latin(nodeadkeys)"
 
     key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};
 };
diff --git a/symbols/lt b/symbols/lt
index 6c2f1b23..9daac796 100644
--- a/symbols/lt
+++ b/symbols/lt
@@ -3,7 +3,7 @@
 // Lithuanian keyboard map by Ri�ardas �epas <rch@richard.eu.org>
 // merged into one file by Nerijus Bali�nas
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/lt,v 1.3 2002/12/14 22:26:11 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/lt,v 1.3 2002/12/14 22:26:11 dawes Exp $
 
 // If you want to have 2 layouts, use
 // Option "XkbLayout" "lt,lt(lt_us)"
@@ -12,7 +12,7 @@
 partial default alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Lithuanian";
 
@@ -38,7 +38,7 @@ xkb_symbols "basic" {
 partial default alphanumeric_keys modifier_keys
 xkb_symbols "lt_us" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Lithuanian";
 
@@ -70,7 +70,7 @@ xkb_symbols "lt_us" {
 partial default alphanumeric_keys modifier_keys
 xkb_symbols "lt_std" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]= "Lithuanian";
 
diff --git a/symbols/lv b/symbols/lv
index 850d8397..af3874e3 100644
--- a/symbols/lv
+++ b/symbols/lv
@@ -2,12 +2,12 @@
 // based on
 // Latvian keyboard map by Ilya Ketris <Ilya.Ketris@ipro.lv>
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/lv,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/lv,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Latvian";
 
diff --git a/symbols/mk b/symbols/mk
index c3c5c02d..d6c5d209 100644
--- a/symbols/mk
+++ b/symbols/mk
@@ -61,7 +61,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "pc104" {
-    include "pc/mk(basic)"
-    include "pc/mk(win)"	
+    include "mk(basic)"
+    include "mk(win)"	
 };
 
diff --git a/symbols/ml b/symbols/ml
index ef476724..51c2b3f2 100644
--- a/symbols/ml
+++ b/symbols/ml
@@ -76,7 +76,7 @@ xkb_symbols "mlplusnum" {
 
    // Modifies the basic layout to include malayalam numbers
 
-   include "pc/ml(basic)"
+   include "ml(basic)"
 
       key <AE01> { [ 0x01000d67 ,      exclam ] };
       key <AE02> { [ 0x01000d68 ,          at ] };
diff --git a/symbols/mt b/symbols/mt
index a295be3e..24098ce6 100644
--- a/symbols/mt
+++ b/symbols/mt
@@ -1,12 +1,12 @@
 // Maltese keyboard map (based on MSA Standard DMS100)
 // by Ramon Casha (ramon.casha@linux.org.mt)
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/mt,v 1.3 2002/12/13 04:18:04 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/mt,v 1.3 2002/12/13 04:18:04 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Maltese";
 
diff --git a/symbols/mt_us b/symbols/mt_us
index dfc4a4bc..75d34b8b 100644
--- a/symbols/mt_us
+++ b/symbols/mt_us
@@ -6,7 +6,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/mt"
+    include "mt"
 
     // Describes the differences between the mt
     // keyboard and a US-based physical keyboard
diff --git a/symbols/nl b/symbols/nl
index 66f2ce2f..45e8d91f 100644
--- a/symbols/nl
+++ b/symbols/nl
@@ -6,12 +6,12 @@
 // converted from the nl-latin.map of the Linux kbd package by
 // Pablo Saratxaga <srtxg@f2219.n293.z2.fidonet.org>
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/nl,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/nl,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Nederland";
 
diff --git a/symbols/no b/symbols/no
index 76bda26f..19558afb 100644
--- a/symbols/no
+++ b/symbols/no
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/no' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/no,v 1.3 2002/12/19 01:07:56 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/no,v 1.3 2002/12/19 01:07:56 dawes Exp $
 
 partial alphanumeric_keys
 xkb_symbols "basic" {
@@ -10,7 +10,7 @@ xkb_symbols "basic" {
     // keyboard and a Norwegian keyboard with dead key support
     // and all of ISO-8859-1 characters available.
 
-    include "pc/latin(type2)"
+    include "latin(type2)"
 
     name[Group1]="Norwegian";
 
@@ -35,7 +35,7 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic Norwegian layout to eliminate dead keys
 
-    include "pc/no(basic)"
+    include "no(basic)"
 
     key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
     key <AD12>	{ [ diaeresis, asciicircum,   asciitilde,      macron ]	};
diff --git a/symbols/ogham b/symbols/ogham
index fb050980..4eeec2c0 100644
--- a/symbols/ogham
+++ b/symbols/ogham
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/pc/ogham,v 1.2 2002/12/19 00:49:41 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ogham,v 1.2 2002/12/19 00:49:41 dawes Exp $
 //
 // Ogham keyboard map for XFree86
 //
diff --git a/symbols/pc b/symbols/pc
index cf2039e9..042fee80 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -1,6 +1,6 @@
 
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/pc,v 1.9 2003/06/09 19:59:46 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pc,v 1.9 2003/06/09 19:59:46 dawes Exp $
 
 partial hidden alphanumeric_keys modifier_keys 
 xkb_symbols "basic" {
@@ -197,7 +197,7 @@ xkb_symbols "basic" {
 
 // definition for the PC-AT type 101 key keyboard
 xkb_symbols "pc101" {
-    include "pc/pc(basic)"
+    include "pc(basic)"
     key <LALT> {	[ 	Alt_L,	Meta_L 		]	};
     key <RALT> {	[	Alt_R,	Meta_R		]	};
 
@@ -205,14 +205,14 @@ xkb_symbols "pc101" {
 
 // definition for the extra key on 102-key keyboards
 xkb_symbols "pc102" {
-    include "pc/pc(pc101)"
+    include "pc(pc101)"
     key <LSGT> { [      less,    greater,          bar,    brokenbar ]	};
 };
 
 // definition for the extra keys on 104-key "Windows95" keyboards
 default
 xkb_symbols "pc104" {
-    include "pc/pc(basic)"
+    include "pc(basic)"
     key <LALT> {	[ 	Alt_L,	Meta_L		]	};
     key <RALT> {	[	Alt_R,	Meta_R		]	};
     key <LWIN> {	[	Super_L			]	};
@@ -224,7 +224,7 @@ xkb_symbols "pc104" {
 // defintion which includes both the Windows95 keyboards _and_
 // the extra key on most European keyboards.
 xkb_symbols "pc105" {
-    include "pc/pc(pc104)"
+    include "pc(pc104)"
     key <LSGT> { [      less,    greater,          bar,    brokenbar ]	};
 };
 
diff --git a/symbols/pl b/symbols/pl
index 76774752..13fa2bcd 100644
--- a/symbols/pl
+++ b/symbols/pl
@@ -1,12 +1,12 @@
 
 // based on a keyboard map from an 'xkb/symbols/pl' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/pl,v 1.3 2003/04/19 12:22:12 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pl,v 1.3 2003/04/19 12:22:12 pascal Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Polish";
 
diff --git a/symbols/pl2 b/symbols/pl2
index bb00cfaa..e9d92299 100644
--- a/symbols/pl2
+++ b/symbols/pl2
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/pl2' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/pl2,v 1.4 2003/04/19 12:22:12 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pl2,v 1.4 2003/04/19 12:22:12 pascal Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -9,7 +9,7 @@ xkb_symbols "basic" {
     // Describes the differences between a very simple en_US
     // keyboard and a very simple QWERTZ Polish keybaord
 
-    include "pc/latin(type3)"
+    include "latin(type3)"
 
     name[Group1]="Polish";
 
diff --git a/symbols/pt b/symbols/pt
index 266a9e82..995b2f35 100644
--- a/symbols/pt
+++ b/symbols/pt
@@ -1,12 +1,12 @@
 
 // based on a keyboard map from an 'xkb/symbols/pt' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/pt,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pt,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type4)"
+    include "latin(type4)"
 
     name[Group1]="Portuguese";
 
@@ -30,7 +30,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "Sundeadkeys" {
 
-    include "pc/pt(basic)" // for consistent naming
+    include "pt(basic)" // for consistent naming
 
     key <AD11>	{ [plus,   asterisk, SunFA_Diaeresis, SunFA_Diaeresis ]	};
     key <BKSL>	{ [SunFA_Tilde, SunFA_Circum ]	};
@@ -39,14 +39,14 @@ xkb_symbols "Sundeadkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
-    include "pc/pt(Sundeadkeys)" // for consistent naming
+    include "pt(Sundeadkeys)" // for consistent naming
 
 };
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "pc/pt(basic)" // for consistent naming
+    include "pt(basic)" // for consistent naming
 
     key <AE12>	{ [guillemotleft, guillemotright, cedilla,     ogonek ]	};
     key <AD11>	{ [      plus,   asterisk,     quotedbl,     quotedbl ]	};
diff --git a/symbols/ro b/symbols/ro
index c66e38bc..61d6171b 100644
--- a/symbols/ro
+++ b/symbols/ro
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/pc/ro,v 1.6 2003/09/08 13:12:51 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ro,v 1.6 2003/09/08 13:12:51 pascal Exp $
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
     // keyboard and a very simple Romanian keybaord
     // Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Romanian";
 
@@ -67,7 +67,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "us_ro" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Romanian for us-keyboard";
 
@@ -88,7 +88,7 @@ xkb_symbols "us_ro" {
 partial alphanumeric_keys
 xkb_symbols "ro_de" {
 
-    include "pc/ro(basic)"
+    include "ro(basic)"
 
     name[Group1]="German for Romanian keyboard";
 
diff --git a/symbols/ru b/symbols/ru
index c81857f9..4575fc45 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -4,7 +4,7 @@
 // AEN <aen@logic.ru>
 // Last Changes 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/ru,v 1.3 2003/02/15 22:27:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ru,v 1.3 2003/02/15 22:27:05 dawes Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
@@ -70,7 +70,7 @@ key.type[group1]="TWO_LEVEL";
 
 partial alphanumeric_keys
 xkb_symbols "winkeys" {
-    include "pc/ru(basic)"
+    include "ru(basic)"
     key <AE03> {        [               3,      numerosign      ]       };
     key <AE04> {        [               4,       semicolon      ]       };
     key <AE05> {        [               5,         percent      ]       };
@@ -83,7 +83,7 @@ xkb_symbols "winkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "typewriter" {
-    include "pc/ru(basic)"
+    include "ru(basic)"
     key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
     key	<AE01> {	[	   exclam,		 1 	]	};
     key	<AE02> {	[      numerosign,		 2	]	};
diff --git a/symbols/sapmi b/symbols/sapmi
index e9f3cd43..ec83f061 100644
--- a/symbols/sapmi
+++ b/symbols/sapmi
@@ -8,11 +8,11 @@
 // http://www.hum.uit.no/a/trond/se-lat9-no-keys.html
 // Written by B�rre Gaup <boerre.gaup@pc.nu>
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 partial alphanumeric_keys
 xkb_symbols "basic" {
-    include "pc/latin"
+    include "latin"
 
     name[Group1]= "S�megiella";
 
@@ -77,7 +77,7 @@ xkb_symbols "basic" {
     // keyboard according to the specs at:
     // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html
 
-    include "pc/sapmi(basic)"
+    include "sapmi(basic)"
 
     key <AC10>	{ [odiaeresis, Odiaeresis,       oslash,     Ooblique ]	};
     key <AC11>	{ [adiaeresis, Adiaeresis,           ae,           AE ]	};
@@ -88,7 +88,7 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic Norwegian layout to eliminate dead keys
 
-    include "pc/sapmi(basic)"
+    include "sapmi(basic)"
 
     key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
 };
diff --git a/symbols/se b/symbols/se
index ddcfa9d1..b203c9ff 100644
--- a/symbols/se
+++ b/symbols/se
@@ -1,12 +1,12 @@
 
 // based on a keyboard map from an 'xkb/symbols/se' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/se,v 1.5 2003/01/26 02:01:48 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/se,v 1.5 2003/01/26 02:01:48 dawes Exp $
 
 partial alphanumeric_keys
 xkb_symbols "basic" {
-    include "pc/latin(type2)"
-    include "pc/se(se)"
+    include "latin(type2)"
+    include "se(se)"
 };
 
 partial alphanumeric_keys
@@ -37,9 +37,9 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic Swedish layout to eliminate all dead keys
 
-    include "pc/latin(type2)"
-    include "pc/latin(type2_nodeadkeys)"
-    include "pc/se(se)"
+    include "latin(type2)"
+    include "latin(type2_nodeadkeys)"
+    include "se(se)"
 
     key <AE12>	{ [     acute,      grave,    plusminus,      notsign ]	};
 
diff --git a/symbols/se_FI b/symbols/se_FI
index 72479189..76cb655f 100644
--- a/symbols/se_FI
+++ b/symbols/se_FI
@@ -6,5 +6,5 @@
 
 partial alphanumeric_keys 
  xkb_symbols "basic" {
-	include "pc/sapmi(sefi)"
+	include "sapmi(sefi)"
 };
diff --git a/symbols/se_NO b/symbols/se_NO
index 48942f54..b7697a21 100644
--- a/symbols/se_NO
+++ b/symbols/se_NO
@@ -6,5 +6,5 @@
 
 partial alphanumeric_keys 
  xkb_symbols "basic" {
-	include "pc/sapmi(basic)"
+	include "sapmi(basic)"
 };
diff --git a/symbols/se_SE b/symbols/se_SE
index 06af1372..86bca436 100644
--- a/symbols/se_SE
+++ b/symbols/se_SE
@@ -6,5 +6,5 @@
 
 partial alphanumeric_keys 
  xkb_symbols "basic" {
-	include "pc/sapmi(sefi)"
+	include "sapmi(sefi)"
 };
diff --git a/symbols/si b/symbols/si
index 9d81ca55..bfcbd6e2 100644
--- a/symbols/si
+++ b/symbols/si
@@ -4,12 +4,12 @@
 // by Marko Samastur (markos@elite.org) and
 // Primoz Peterlin (primoz.peterlin@biofiz.mf.uni-lj.si)
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/si,v 1.3 2003/02/05 01:38:36 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/si,v 1.3 2003/02/05 01:38:36 dawes Exp $
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "pc/latin(type3)"
+    include "latin(type3)"
 
     name[Group1]="Slovene";
 
diff --git a/symbols/sk b/symbols/sk
index 28808636..0d3c91c9 100644
--- a/symbols/sk
+++ b/symbols/sk
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/pc/sk,v 1.2 2002/11/22 04:02:22 dawes 
+// $XFree86: xc/programs/xkbcomp/symbols/sk,v 1.2 2002/11/22 04:02:22 dawes 
 // Exp $
 
 partial alphanumeric_keys 
@@ -8,7 +8,7 @@ xkb_symbols "basic" {
      // to satisfy most unix, windows and mac users.
      // 2001 by Kamil Toman <ktoman@email.cz>
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1] = "Slovak";
 
@@ -77,7 +77,7 @@ xkb_symbols "basic" {
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
 xkb_symbols "bksl" {
-    include "pc/sk(basic)"
+    include "sk(basic)"
 
     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
 };
diff --git a/symbols/sk_qwerty b/symbols/sk_qwerty
index d434e226..be05dd74 100644
--- a/symbols/sk_qwerty
+++ b/symbols/sk_qwerty
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
     // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
     // 2001 by Kamil Toman <ktoman@email.cz>
     
-    include "pc/sk(basic)"
+    include "sk(basic)"
 
     key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
     key <AD06>	{ [         y,          Y,     NoSymbol,     NoSymbol ]	};
@@ -15,7 +15,7 @@ xkb_symbols "basic" {
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
 xkb_symbols "bksl" {
-    include "pc/sk_qwerty(basic)"
+    include "sk_qwerty(basic)"
 
     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
 };
diff --git a/symbols/sr b/symbols/sr
index ee1b1f9c..45eee54a 100644
--- a/symbols/sr
+++ b/symbols/sr
@@ -16,9 +16,9 @@ xkb_symbols "default" {
 
   name[Group1]= "Serbian Cyrillic";
 
-  include "pc/sr(level3)"
-  include "pc/sr(common)"
-  include "pc/sr(cyralpha)"
+  include "sr(level3)"
+  include "sr(common)"
+  include "sr(cyralpha)"
   include "level3(ralt_switch_multikey)"
 };
 
@@ -28,7 +28,7 @@ xkb_symbols "yz" {
 
   name[Group1]= "Serbian Cyrillic (swap Zhe, Ze)";
 
-  include "pc/sr(default)"
+  include "sr(default)"
 
   key <AD06> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // y
   key <AB01> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // z
diff --git a/symbols/syr b/symbols/syr
index 4be65aa5..54ef4d4d 100644
--- a/symbols/syr
+++ b/symbols/syr
@@ -1,5 +1,5 @@
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/syr,v 1.1 2002/11/22 03:06:50 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/syr,v 1.1 2002/11/22 03:06:50 dawes Exp $
 //
 
 partial default alphanumeric_keys
diff --git a/symbols/syr_phonetic b/symbols/syr_phonetic
index ac20ad01..e0df79bc 100644
--- a/symbols/syr_phonetic
+++ b/symbols/syr_phonetic
@@ -1,5 +1,5 @@
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $
 //
 
 partial default alphanumeric_keys
diff --git a/symbols/th b/symbols/th
index 7b8297fb..825fbbe3 100644
--- a/symbols/th
+++ b/symbols/th
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/th' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/th,v 1.3 2003/04/03 16:34:51 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/th,v 1.3 2003/04/03 16:34:51 dawes Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
diff --git a/symbols/tml b/symbols/tml
index 973b0817..ac02d4b7 100644
--- a/symbols/tml
+++ b/symbols/tml
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/tml' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/tml,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/tml,v 1.2 2002/11/22 04:03:28 dawes Exp $
 
 default partial alphanumeric_keys 
 xkb_symbols "TSCII" {
diff --git a/symbols/tr b/symbols/tr
index b74a1748..53bd555b 100644
--- a/symbols/tr
+++ b/symbols/tr
@@ -4,13 +4,13 @@
 // This file distributed without any expressed or implied warranty
 // Nilgün Belma Bugüner <nilgun@superonline.com>, 2002
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/tr,v 1.5 2003/04/19 12:22:12 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/tr,v 1.5 2003/04/19 12:22:12 pascal Exp $
 
 //Default Layout (Turkish Q)
 default partial
 xkb_symbols "basic" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Turkish";
 
@@ -63,7 +63,7 @@ xkb_symbols "basic" {
 partial
 xkb_symbols "tr_f" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Turkish";
 
@@ -126,7 +126,7 @@ xkb_symbols "tr_f" {
 partial
 xkb_symbols "tr_alt" {
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Turkish";
 
diff --git a/symbols/ua b/symbols/ua
index 1f398c69..7eab8381 100644
--- a/symbols/ua
+++ b/symbols/ua
@@ -4,7 +4,7 @@
 // AEN <aen@logic.ru> & Leon Kanter <leon@geon.donetsk.ua>
 // Last Changes 2003/09/03 by Andriy Rysin <arysin@yahoo.com>
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
@@ -68,7 +68,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "winkeys" {
-    include "pc/ua(basic)"
+    include "ua(basic)"
  
     key <AE03> {        [               3,      numerosign      ]       };
     key <AE04> {        [               4,       semicolon      ]       };
@@ -81,7 +81,7 @@ xkb_symbols "winkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "typewriter" {
-    include "pc/ua(basic)"
+    include "ua(basic)"
 
     key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
     key	<AE01> {	[	   exclam,		 1 	]	};
@@ -108,7 +108,7 @@ xkb_symbols "typewriter" {
 
 partial alphanumeric_keys
 xkb_symbols "phonetic" {
-  include "pc/ua(basic)"
+  include "ua(basic)"
   
   key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
   key <LatW> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
diff --git a/symbols/us b/symbols/us
index 6d1b13ae..9c546320 100644
--- a/symbols/us
+++ b/symbols/us
@@ -1,6 +1,6 @@
 //
-// $XdotOrg: xc/programs/xkbcomp/symbols/pc/us,v 1.1.4.3 2004/03/05 13:41:33 eich Exp $
-// $XFree86: xc/programs/xkbcomp/symbols/pc/us,v 1.6 2003/10/31 14:32:05 pascal Exp $
+// $XdotOrg: xc/programs/xkbcomp/symbols/us,v 1.1.4.3 2004/03/05 13:41:33 eich Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/us,v 1.6 2003/10/31 14:32:05 pascal Exp $
 
 default
 partial hidden alphanumeric_keys modifier_keys 
@@ -8,7 +8,7 @@ xkb_symbols "basic" {
 
     name[Group1]= "US/ASCII";
 
-    include "pc/pc(common)"
+    include "pc(common)"
 
     // Alphanumeric section
     key <TLDE> {	[     grave,	asciitilde	]	};
@@ -71,7 +71,7 @@ xkb_symbols "intl" {
 
     name[Group1]= "US International";
 
-    include "pc/us(basic)"
+    include "us(basic)"
 
     // Alphanumeric section
     key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
diff --git a/symbols/us_intl b/symbols/us_intl
index d33058b8..14296208 100644
--- a/symbols/us_intl
+++ b/symbols/us_intl
@@ -31,7 +31,7 @@ partial default alphanumeric_keys
 xkb_symbols "basic" {
 
   name[Group1]= "US/ASCII";
-  include "pc/us"
+  include "us"
 
   key <TLDE> { [ dead_grave, dead_tilde,    grave,	      asciitilde    ] };
   key <AE05> { [          5, percent,	    EuroSign			    ] };
diff --git a/symbols/uz b/symbols/uz
index 82e2e90f..18640951 100644
--- a/symbols/uz
+++ b/symbols/uz
@@ -18,7 +18,7 @@
 // Cyrillic_ha       to key <AD09> (english 'o'),
 // Cyrillic_hardsign to key <AD10> (english 'p'). 
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/uz,v 1.2 2003/06/21 13:01:59 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/uz,v 1.2 2003/06/21 13:01:59 pascal Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
diff --git a/symbols/yu b/symbols/yu
index 3d6de22a..4e7d221d 100644
--- a/symbols/yu
+++ b/symbols/yu
@@ -16,9 +16,9 @@ xkb_symbols "default" {
 
   name[Group1]= "Serbian Latin";
 
-  include "pc/sr(level3)"
-  include "pc/sr(common)"
-  include "pc/sr(latalpha)"
+  include "sr(level3)"
+  include "sr(common)"
+  include "sr(latalpha)"
   include "level3(ralt_switch_multikey)"
 };
 
@@ -29,8 +29,8 @@ xkb_symbols "unicode" {
 
   name[Group1]= "Serbian Latin Unicode";
 
-  include "pc/yu(default)"
-  include "pc/sr(twoletter)"
+  include "yu(default)"
+  include "sr(twoletter)"
 };
 
 partial alphanumeric_keys
@@ -39,7 +39,7 @@ xkb_symbols "yz" {
 
   name[Group1]= "Serbian Latin (swap Y, Z)";
 
-  include "pc/yu(default)"
+  include "yu(default)"
 
   key <AD06> {   [ y,                   Y,             any,any ]   }; // y
   key <AB01> {   [ z,                   Z,             any,any ]   }; // z
@@ -51,7 +51,7 @@ xkb_symbols "unicodeyz" {
 
   name[Group1]= "Serbian Latin Unicode (swap ZHE, Z)";
 
-  include "pc/yu(unicode)"
+  include "yu(unicode)"
 
   key <AD06> {   [ zcaron,              Zcaron,        any,any ]   }; // y
   key <AB01> {   [ z,                   Z,             any,any ]   }; // z