###############################################################################
# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
#
# 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/or 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 (including the next
# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
#

diff --git a/nls/ja/XI18N_OBJS b/nls/ja/XI18N_OBJS
index 50b51fe..f682a19 100644
--- a/nls/ja/XI18N_OBJS
+++ b/nls/ja/XI18N_OBJS
@@ -4,8 +4,5 @@
 #
 XLC	ja/xlibi18n_ja	_XlcGenericLoader	# XLC_open
 XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
-#XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_regiser XIM_unregister
-XIM	common/ximp40	_Ximp_OpenIM		# XIM_open
-XIM	common/ximlocal	_XimpLocalOpenIM	# XIM_open
 XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_regiser XIM_unregister
 XOM	common/xomGeneric	_XomGenericOpenOM # XOM_open
diff --git a/nls/ja/XLC_LOCALE.pre b/nls/ja/XLC_LOCALE.pre
index 99decf0..69af5a6 100644
--- a/nls/ja/XLC_LOCALE.pre
+++ b/nls/ja/XLC_LOCALE.pre
@@ -39,16 +39,18 @@ fs2	{
 		vertical_rotate	all
 	}
 }
+
 XCOMM 	fs3 class (Supplementary Kanji)
-XCOMM fs3	{
-XCOMM	charset	{
-XCOMM		name		JISX0212.1990-0:GL
-XCOMM		udc_area	\x7521,\x7e7e
-XCOMM	}
-XCOMM	font	{
-XCOMM		primary		JISX0212.1990-0:GL
-XCOMM 	}
-XCOMM }
+fs3	{
+	charset	{
+		name		JISX0212.1990-0:GL
+		udc_area	\x7521,\x7e7e
+	}
+	font	{
+		primary		JISX0212.1990-0:GL
+	}
+}
+
 END XLC_FONTSET
 
 XCOMM 
@@ -107,18 +109,17 @@ cs2	{
 }
 
 XCOMM 	cs3 class
-XCOMM cs3	{
-XCOMM 	side		GL
-XCOMM 	length		2
-XCOMM 	mb_encoding	<SS> \x8f
-XCOMM #if WCHAR32
-XCOMM 	wc_encoding	\x20000000
-XCOMM #else
-XCOMM 	wc_encoding	\x00008000
-XCOMM #endif
-XCOMM 	ct_encoding	JISX0212.1990-0:GL; JISX0212.1990-0:GR
-XCOMM }
-
+cs3	{
+	side		GL
+	length		2
+	mb_encoding	<SS> \x8f
+#if WCHAR32
+	wc_encoding	\x20000000
+#else
+	wc_encoding	\x00008000
+#endif
+	ct_encoding	JISX0212.1990-0:GL; JISX0212.1990-0:GR
+}
 
 END XLC_XLOCALE