diff --git a/runtime/keymap/sinhala-phonetic_utf-8.vim b/runtime/keymap/sinhala-phonetic_utf-8.vim
index 43dcc6379a..801cc82c1e 100644
--- a/runtime/keymap/sinhala-phonetic_utf-8.vim
+++ b/runtime/keymap/sinhala-phonetic_utf-8.vim
@@ -1,6 +1,6 @@
 " Vim Keymap file for Sinhala (Sri Lanka) (2003-11-02)
 " Maintainer  : Harshula Jayasuriya <hash@jayasolutions.cjb.net>
-" Last Updated: 2004-11-14
+" Last Updated: 2004-12-22
 " This is a static phonetic mapping for a standard US-English keyboard
 " (qwerty)
 " http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
@@ -100,8 +100,8 @@ R	<char-0x0dca><char-0x200d><char-0x0dbb>	"  ්‍ර - rakaransaya
 Y	<char-0x0dca><char-0x200d><char-0x0dba>	"  ්‍ය - yansaya
 <A-r>	<char-0x0dbb><char-0x0dca><char-0x200d>	"  ර්‍ - repaya
 
-<A-\>	<char-0x0dca><char-0x200d>	" join - conjunct letters cons 0DCA 200D cons
-<A-|>	<char-0x200d>	" touch - ZWJ
+<A-\>	<char-0x0dca><char-0x200d>	" join - conjunct letters cons 0DCA ZWJ cons
+<A-|>	<char-0x200d><char-0x0dca>	" touch - cons ZWJ 0DCA cons
 
 <S-space>	<char-0x00a0>	" - no-break space. <S-space> didn't work.
 <C-space>	<char-0x200c>	" - ZWNJ. <A-space> doesn't work!
diff --git a/src/proto.h b/src/proto.h
index 77ea826c70..ed16258484 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -202,18 +202,12 @@ extern char_u *vimpty_getenv __ARGS((const char_u *string));	/* from pty.c */
 extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path, int (*show_entry)(), int x, int y, guicolor_T fg, guicolor_T bg, guicolor_T scroll_fg, guicolor_T scroll_bg));
 #   endif
 #  endif
-#  ifdef FEAT_GUI_BEOS
-#   include "gui_beos.pro"
-#  endif
 #  ifdef FEAT_GUI_MAC
 #   include "gui_mac.pro"
 #  endif
 #  ifdef FEAT_GUI_X11
 #   include "gui_x11.pro"
 #  endif
-#  if defined(FEAT_GUI_AMIGA)
-#    include "gui_amiga.pro"
-#  endif
 #  ifdef RISCOS
 #   include "gui_riscos.pro"
 #  endif