530 files changed, 1285 insertions, 1177 deletions

diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile
deleted file mode 100644
index 1d11c977b..000000000
--- a/nx-X11/lib/Imakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-NULL =
-
-#if BuildX11Lib
-X11LIBDIR = X11
-#endif
-
-LINTSUBDIRS = \
-	$(X11LIBDIR) \
-	$(NULL)
-
-SUBDIRS = xtrans $(LINTSUBDIRS)
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-MakeLintLibSubdirs($(LINTSUBDIRS))
-MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
diff --git a/nx-X11/lib/Makefile.am b/nx-X11/lib/Makefile.am
new file mode 100644
index 000000000..1d8eb3ada
--- /dev/null
+++ b/nx-X11/lib/Makefile.am
@@ -0,0 +1,37 @@
+NULL =
+
+SUBDIRS = modules src
+
+pkgconfig_DATA = nx-x11.pc
+
+MAINTAINERCLEANFILES =				\
+    $(srcdir)/autom4te.cache/*			\
+    $(srcdir)/build-aux/*			\
+    $(srcdir)/Makefile.in			\
+    $(srcdir)/src/Makefile.in			\
+    $(srcdir)/src/xkb/Makefile.in		\
+    $(srcdir)/src/util/Makefile.in		\
+    $(srcdir)/src/xcms/Makefile.in		\
+    $(srcdir)/src/xlibi18n/Makefile.in		\
+    $(srcdir)/modules/om/generic/Makefile.in	\
+    $(srcdir)/modules/om/Makefile.in		\
+    $(srcdir)/modules/Makefile.in		\
+    $(srcdir)/modules/im/ximcp/Makefile.in	\
+    $(srcdir)/modules/im/Makefile.in		\
+    $(srcdir)/modules/lc/Makefile.in		\
+    $(srcdir)/modules/lc/gen/Makefile.in	\
+    $(srcdir)/modules/lc/def/Makefile.in	\
+    $(srcdir)/modules/lc/Utf8/Makefile.in	\
+    $(srcdir)/include/Makefile.in		\
+    $(srcdir)/aclocal.m4			\
+    $(srcdir)/src/config.h.in			\
+    $(srcdir)/src/config.h.in~			\
+    $(srcdir)/configure				\
+    $(srcdir)/m4/libtool.m4			\
+    $(srcdir)/m4/lt~obsolete.m4			\
+    $(srcdir)/m4/ltoptions.m4			\
+    $(srcdir)/m4/ltsugar.m4			\
+    $(srcdir)/m4/ltversion.m4			\
+    $(NULL)
+
+DISTCLEANFILES=$(MAINTAINERCLEANFILES)
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
deleted file mode 100644
index a6471bff1..000000000
--- a/nx-X11/lib/X11/Imakefile
+++ /dev/null
@@ -1,1132 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* nx-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE which comes in the source       */
-/* distribution.                                                          */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-        HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
-		Xcms.h Xlocale.h XKBlib.h XlibConf.h Xregion.h ImUtil.h
-
-#if BuildServersOnly && !BuildClients && !NXAgentServer
-all::
-
-BuildIncludes($(HEADERS),IncSubdir,..)
-
-#else
-
-#if NXLibraries
-
-#ifdef SunArchitecture
-NX_INCLUDES = -I../../../nxcomp/include -I/usr/sfw/include
-#else
-NX_INCLUDES = -I../../../nxcomp/include
-#endif
-
-NX_DEFINES = -DNX_TRANS_SOCKET \
-             -DNX_TRANS_EXIT
-
-#            -DNX_TRANS_CHANGE    \
-#            -DNX_TRANS_WARN      \
-#            -DNX_TRANS_INFO      \
-#            -DNX_TRANS_TEST      \
-#            -DNX_TRANS_DEBUG     \
-
-/*
-   This is used to create libX11* links in exports/lib.
-   It is a dependency of the part that links the libNX_X11.so
-   to exports/lib and is therefore called _before_ any libNX*
-   links exist.
-   The make target libX11-links is at the end of the file.
-*/
-/*
-   Currently, this breaks our builds. Autoconf-based packages
-   like nxcompext try to detect host X11 libraries, but will
-   find links to libNX_X11 in exports/lib as libX11 files,
-   which in turn will be test-linked in configure and always
-   fail (for instance, because necessary dependencies like
-   libXcomp will not be available on clean systems.)
-
-   Keep this disabled for now.
-
-   If anything, this code needs to be reworked to create
-   libX11 symlinks only *after* everything has been
-   installed.
-*/
-#EXTRALIBRARYDEPS = libX11-links
-
-#ifdef cygwinArchitecture
-NX_XCOMPLIBNAME   = cygXcomp.dll
-NX_XCOMPEXTLIBNAME   = cygXcompext.dll
-#else
-NX_XCOMPLIBNAME   = libXcomp.so
-NX_XCOMPEXTLIBNAME   = libXcompext.so
-#endif
-
-NX_XCOMPLIBDIR    = $(XTOP)/../nxcomp/src/.libs
-NX_XCOMPLIBLINK   = Xcomp
-NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
-NX_REQUIREDLIBS   = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
-NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status
-
-NX_XCOMPEXTLIBDIR    = $(XTOP)/../nxcompext/src/.libs
-NX_XCOMPEXTLIBTARGET = $(NX_XCOMPEXTLIBDIR)/$(NX_XCOMPEXTLIBNAME)
-NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
-
-#endif
-
-#define DoNormalLib NormalLibX11
-#define DoSharedLib SharedLibX11
-#define DoExtraLib SharedLibX11
-#define DoDebugLib DebugLibX11
-#define DoProfileLib ProfileLibX11
-#define LibName NX_X11
-#define SoRev SOXLIBREV
-#define HugeLibrary YES
-#define IncSubdir nx-X11
-
-/*
- FIXME: This is switchable upstream via configure option, we leave it
- on for now as this is the upstream default.
-*/
-XCMS_DEFINES = -DXCMS
-XCB_DEFINES = -DUSE_XCB=0
-
-#include <Threads.tmpl>
-
-#ifndef MotifBC
-#define MotifBC NO
-#endif
-
-#ifdef SharedX11Reqs
-REQUIREDX11LIBS = SharedX11Reqs
-#endif
-#ifdef cygwinArchitecture
-EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity
-#endif
-
-REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS)
-
-#if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
-XBSDLIB = /**/
-#endif
-#if defined(LunaArchitecture) && defined(Mc88000Architecture)
-EXTRA_LIBRARIES = /**/
-#endif
-#if Malloc0ReturnsNull
-     MALLOC_DEFINES = XMalloc0ReturnsNullDefines
-#endif
-#if HasXdmAuth
-        XDMAUTHDEFS = -DHASXDMAUTH
-#endif
-#if BuildXKBlib
-    XKB_DEFINES = -DXKB 
-        XKBSRCS = XKB.c XKBBind.c XKBCompat.c XKBCtrls.c XKBCvt.c XKBGetMap.c \
-	          XKBGetByName.c XKBNames.c XKBRdBuf.c XKBSetMap.c XKBUse.c \
-		  XKBleds.c XKBBell.c XKBGeom.c XKBSetGeom.c XKBExtDev.c \
-		  XKBList.c XKBMisc.c \
-		  XKBMAlloc.c XKBGAlloc.c XKBAlloc.c
-        XKBOBJS = XKB.o XKBBind.o XKBCompat.o XKBCtrls.o XKBCvt.o XKBGetMap.o \
-		  XKBGetByName.o XKBNames.o XKBRdBuf.o XKBSetMap.o XKBUse.o \
-		  XKBleds.o XKBBell.o XKBGeom.o XKBSetGeom.o XKBExtDev.o \
-		  XKBList.o XKBMisc.o \
-		  XKBMAlloc.o XKBGAlloc.o XKBAlloc.o
-#endif
-#if HasSecureRPC
-        RPCDEFS = -DSECURE_RPC
-#endif
-#if HasPoll
-   POLL_DEFINES = -DUSE_POLL
-#endif
-   CONN_DEFINES = $(CONNECTION_FLAGS)
-   XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0
-   XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0
-#if HasBSD44Sockets
-   SOCK_DEFINES = -DBSD44SOCKETS
-#endif
-#if HasShm
-    SHM_DEFINES = -DHAS_SHM
-#endif
-
-    XF86BIGFONT_DEFINES = XF86BigfontExtensionDefines
-
-     EDB_DEFINES = -DERRORDB=\"$(USRDATADIR)/XErrorDB\"
-     CMS_DEFINES = -DXCMSDB=\"$(USRDATADIR)/Xcms.txt\" -DXCMSDIR=\"$(USRDATADIR)\"
-#if HasSnprintf
-    MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11
-#endif
-#if MotifBC
-      BC_DEFINES = -DMOTIFBC
-#endif
-#if NoRConst
- RCONST_DEFINES = -DNORCONST
-#endif
-#if DisableXLocaleDirEnv
-  SETID_DEFINES = -DNO_XLOCALEDIR
-#elif HasIssetugid
-  SETID_DEFINES = -DHASSETUGID
-#elif HasGetresuid
-  SETID_DEFINES = -DHASGETRESUID
-#endif
-    XLC_DEFINES = -DXLOCALEDIR=\"$(XLOCALEDIR)\" -DXLOCALELIBDIR=\"$(XLOCALELIBDIR)\"
-#if (defined(FreeBSDArchitecture) && OSRelVersion < 500016) || \
-	defined(OpenBSDArchitecture)
-THRSTUBSRCS = UIThrStubs.c
-THRSTUBOBJS = UIThrStubs.o
-#endif
-#if BuildLoadableXlibXcursor
-XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSORREV)\"
-#endif
-#if NeedLibInsideFlag
-    LIB_DEFINES = -D_XLIBINT_
-#endif
-#if defined(LibDirName)
-        POSTLOCALELIBDIR = LibDirName
-        POSTLOCALELIBDEFINES = -DPOSTLOCALELIBDIR=\"$(POSTLOCALELIBDIR)\"
-#endif
-        DEFINES = $(MALLOC_DEFINES) $(LIB_DEFINES) $(MISC_DEFINES)\
-			$(POSTLOCALELIBDEFINES) $(NX_INCLUDES) $(NX_DEFINES) ${XCMS_DEFINES} ${XCB_DEFINES}
-   OPEN_DEFINES = -I$(EXTINCSRC) $(K5INCL) $(K5DEFS)
- DEPEND_DEFINES = $(OPEN_DEFINES) $(TRANS_INCLUDES) $(CONN_DEFINES) $(THREADS_DEFINES) DependDefines
-       AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o
-       AUTHSRCS = AuDispose.c AuGetBest.c AuFileName.c AuRead.c
-           SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(EXTRASRCS) /* try *.c if you have trouble */
-           OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(EXTRAOBJS)
-       LINTLIBS =
-
-EXTRASRCS = $(STATICLCSRCS)
-EXTRAOBJS = $(STATICLCOBJS)
-
-SRCS1 = \
-	Context.c \
-	Depths.c \
-	ParseCmd.c \
-	Quarks.c \
-	AllCells.c \
-	AllPlanes.c \
-	AllowEv.c \
-	AutoRep.c \
-	Backgnd.c \
-	BdrWidth.c \
-	Bell.c \
-	Border.c \
-	ChAccCon.c \
-	ChClMode.c \
-	ChActPGb.c \
-	ChCmap.c \
-	ChGC.c \
-	ChKeyCon.c \
-	ChPntCon.c \
-	ChProp.c \
-	ChSaveSet.c \
-	ChWAttrs.c \
-	ChWindow.c \
-	ChkIfEv.c \
-	ChkMaskEv.c \
-	ChkWinEv.c \
-	ChkTypEv.c \
-	ChkTypWEv.c \
-	CirWin.c \
-	CirWinDn.c \
-	CirWinUp.c \
-	ClDisplay.c \
-	Clear.c \
-	ClearArea.c \
-	ConfWind.c \
-	ConnDis.c \
-	ConvSel.c \
-	CopyArea.c \
-	CopyCmap.c \
-	CopyGC.c \
-	CopyPlane.c \
-	CrBFData.c \
-	CrCmap.c \
-	CrCursor.c \
-	CrGC.c \
-	CrGlCur.c \
-	CrPFBData.c \
-	CrPixmap.c \
-	CrWindow.c \
-	Cursor.c \
-	DefCursor.c \
-	DelProp.c \
-	DestSubs.c \
-	DestWind.c \
-	DisName.c \
-	DrArc.c \
-	DrArcs.c \
-	DrLine.c \
-	DrLines.c \
-	DrPoint.c \
-	DrPoints.c \
-	DrRect.c \
-	DrRects.c \
-	DrSegs.c \
-	ErrDes.c \
-	ErrHndlr.c \
-	EvToWire.c \
-	FetchName.c \
-	FillArc.c \
-	FillArcs.c \
-	FillPoly.c \
-	FillRct.c \
-	FillRcts.c \
-	Flush.c \
-	Font.c \
-	FontNames.c \
-	FontInfo.c \
-	FreeCmap.c \
-	FreeCols.c \
-	FreeCurs.c \
-	FreeEData.c \
-	FreeEventData.c \
-	FreeGC.c \
-	FreePix.c \
-	FSSaver.c \
-	GCMisc.c \
-	Geom.c \
-	GetAtomNm.c \
-	GetColor.c \
-	GetDflt.c \
-	GetEventData.c \
-	GetFPath.c \
-	GetFProp.c \
-	GetGeom.c \
-	GetHColor.c \
-	GetHints.c \
-	GetIFocus.c \
-	GetImage.c \
-	GetKCnt.c \
-	GetMoEv.c \
-	GetPCnt.c \
-	GetPntMap.c \
-	GetProp.c \
-	GetSOwner.c \
-	GetSSaver.c \
-	GetStCmap.c \
-	GetWAttrs.c \
-	GrButton.c \
-	GrKey.c \
-	GrKeybd.c \
-	GrPointer.c \
-	GrServer.c \
-	Host.c \
-	IfEvent.c \
-	ImUtil.c \
-	ImText.c \
-	ImText16.c \
-	InitExt.c \
-	InsCmap.c \
-	IntAtom.c \
-	KeyBind.c \
-	KeysymStr.c \
-	KillCl.c \
-	LiHosts.c \
-	LiICmaps.c \
-	LiProps.c \
-	ListExt.c \
-	LoadFont.c \
-	LookupCol.c \
-	LowerWin.c 
-
-OBJS1 = \
-	Context.o \
-	Depths.o \
-	ParseCmd.o \
-	Quarks.o \
-	AllCells.o \
-	AllPlanes.o \
-	AllowEv.o \
-	AutoRep.o \
-	Backgnd.o \
-	BdrWidth.o \
-	Bell.o \
-	Border.o \
-	ChAccCon.o \
-	ChClMode.o \
-	ChActPGb.o \
-	ChCmap.o \
-	ChGC.o \
-	ChKeyCon.o \
-	ChPntCon.o \
-	ChProp.o \
-	ChSaveSet.o \
-	ChWAttrs.o \
-	ChWindow.o \
-	ChkIfEv.o \
-	ChkMaskEv.o \
-	ChkWinEv.o \
-	ChkTypEv.o \
-	ChkTypWEv.o \
-	CirWin.o \
-	CirWinDn.o \
-	CirWinUp.o \
-	ClDisplay.o \
-	Clear.o \
-	ClearArea.o \
-	ConfWind.o \
-	ConnDis.o \
-	ConvSel.o \
-	CopyArea.o \
-	CopyCmap.o \
-	CopyGC.o \
-	CopyPlane.o \
-	CrBFData.o \
-	CrCmap.o \
-	CrCursor.o \
-	CrGC.o \
-	CrGlCur.o \
-	CrPFBData.o \
-	CrPixmap.o \
-	CrWindow.o \
-	Cursor.o \
-	DefCursor.o \
-	DelProp.o \
-	DestSubs.o \
-	DestWind.o \
-	DisName.o \
-	DrArc.o \
-	DrArcs.o \
-	DrLine.o \
-	DrLines.o \
-	DrPoint.o \
-	DrPoints.o \
-	DrRect.o \
-	DrRects.o \
-	DrSegs.o \
-	ErrDes.o \
-	ErrHndlr.o \
-	EvToWire.o \
-	FetchName.o \
-	FillArc.o \
-	FillArcs.o \
-	FillPoly.o \
-	FillRct.o \
-	FillRcts.o \
-	Flush.o \
-	Font.o \
-	FontNames.o \
-	FontInfo.o \
-	FreeCmap.o \
-	FreeCols.o \
-	FreeCurs.o \
-	FreeEData.o \
-	FreeEventData.o \
-	FreeGC.o \
-	FreePix.o \
-	FSSaver.o \
-	GCMisc.o \
-	Geom.o \
-	GetAtomNm.o \
-	GetColor.o \
-	GetDflt.o \
-	GetEventData.o \
-	GetFPath.o \
-	GetFProp.o \
-	GetGeom.o \
-	GetHColor.o \
-	GetHints.o \
-	GetIFocus.o \
-	GetImage.o \
-	GetKCnt.o \
-	GetMoEv.o \
-	GetPCnt.o \
-	GetPntMap.o \
-	GetProp.o \
-	GetSOwner.o \
-	GetSSaver.o \
-	GetStCmap.o \
-	GetWAttrs.o \
-	GrButton.o \
-	GrKey.o \
-	GrKeybd.o \
-	GrPointer.o \
-	GrServer.o \
-	Host.o \
-	IfEvent.o \
-	ImUtil.o \
-	ImText.o \
-	ImText16.o \
-	InitExt.o \
-	InsCmap.o \
-	IntAtom.o \
-	KeyBind.o \
-	KeysymStr.o \
-	KillCl.o \
-	LiHosts.o \
-	LiICmaps.o \
-	LiProps.o \
-	ListExt.o \
-	LoadFont.o \
-	LookupCol.o \
-	LowerWin.o 
-
-SRCS2 = \
-	Macros.c \
-	MapRaised.c \
-	MapSubs.c \
-	MapWindow.c \
-	MaskEvent.c \
-	Misc.c \
-	ModMap.c \
-	MoveWin.c \
-	NextEvent.c \
-	OpenDis.c \
-	ParseCol.c \
-	ParseGeom.c \
-	PeekEvent.c \
-	PeekIfEv.c \
-	Pending.c \
-	PmapBgnd.c \
-	PmapBord.c \
-	PolyReg.c \
-	PolyTxt.c \
-	PolyTxt16.c \
-	PutBEvent.c \
-	PutImage.c \
-	QuBest.c \
-	QuColor.c \
-	QuColors.c \
-	QuCurShp.c \
-	QuExt.c \
-	QuKeybd.c \
-	QuPntr.c \
-	QuStipShp.c \
-	QuTextE16.c \
-	QuTextExt.c \
-	QuTileShp.c \
-	QuTree.c \
-	RaiseWin.c \
-	RdBitF.c \
-	RecolorC.c \
-	ReconfWin.c \
-	Region.c \
-	RepWindow.c \
-	RestackWs.c \
-	RotProp.c \
-	ScrResStr.c \
-	SelInput.c \
-	SendEvent.c \
-	SetBack.c \
-	SetCRects.c \
-	SetClMask.c \
-	SetClOrig.c \
-	SetDashes.c \
-	SetFPath.c \
-	SetFont.c \
-	SetFore.c \
-	SetFunc.c \
-	SetHints.c \
-	SetIFocus.c \
-	SetLStyle.c \
-	SetPMask.c \
-	SetPntMap.c \
-	SetSOwner.c \
-	SetSSaver.c \
-	SetState.c \
-	SetStip.c \
-	SetStCmap.c \
-	SetTile.c \
-	SetTSOrig.c \
-	StBytes.c \
-	StColor.c \
-	StColors.c \
-	StNColor.c \
-	StName.c \
-	StrKeysym.c \
-	Sync.c \
-	Synchro.c \
-	Text.c \
-	Text16.c \
-	TextExt.c \
-	TextExt16.c \
-	TrCoords.c \
-	UndefCurs.c \
-	UngrabBut.c \
-	UngrabKbd.c \
-	UngrabKey.c \
-	UngrabPtr.c \
-	UngrabSvr.c \
-	UninsCmap.c \
-	UnldFont.c \
-	UnmapSubs.c \
-	UnmapWin.c \
-	VisUtil.c \
-	WarpPtr.c \
-	WinEvent.c \
-	Window.c \
-	WrBitF.c \
-	XlibAsync.c \
-	XlibInt.c \
-	Xrm.c \
-	evtomask.c \
-	globals.c \
-	GetGCVals.c \
-	GetNrmHint.c \
-	GetRGBCMap.c \
-	GetTxtProp.c \
-	GetWMCMapW.c \
-	GetWMProto.c \
-	Iconify.c \
-	PixFormats.c \
-	PropAlloc.c \
-	ReconfWM.c \
-	SetNrmHint.c \
-	SetRGBCMap.c \
-	SetTxtProp.c \
-	SetWMCMapW.c \
-	SetWMProto.c \
-	StrToText.c \
-	TextToStr.c \
-	Withdraw.c \
-	WMGeom.c \
-	WMProps.c \
-	$(AUTHSRCS) $(K5SRCS) $(THRSTUBSRCS)
-
-OBJS2 = \
-	Macros.o \
-	MapRaised.o \
-	MapSubs.o \
-	MapWindow.o \
-	MaskEvent.o \
-	Misc.o \
-	ModMap.o \
-	MoveWin.o \
-	NextEvent.o \
-	OpenDis.o \
-	ParseCol.o \
-	ParseGeom.o \
-	PeekEvent.o \
-	PeekIfEv.o \
-	Pending.o \
-	PmapBgnd.o \
-	PmapBord.o \
-	PolyReg.o \
-	PolyTxt.o \
-	PolyTxt16.o \
-	PutBEvent.o \
-	PutImage.o \
-	QuBest.o \
-	QuColor.o \
-	QuColors.o \
-	QuCurShp.o \
-	QuExt.o \
-	QuKeybd.o \
-	QuPntr.o \
-	QuStipShp.o \
-	QuTextE16.o \
-	QuTextExt.o \
-	QuTileShp.o \
-	QuTree.o \
-	RaiseWin.o \
-	RdBitF.o \
-	RecolorC.o \
-	ReconfWin.o \
-	Region.o \
-	RepWindow.o \
-	RestackWs.o \
-	RotProp.o \
-	ScrResStr.o \
-	SelInput.o \
-	SendEvent.o \
-	SetBack.o \
-	SetCRects.o \
-	SetClMask.o \
-	SetClOrig.o \
-	SetDashes.o \
-	SetFPath.o \
-	SetFont.o \
-	SetFore.o \
-	SetFunc.o \
-	SetHints.o \
-	SetIFocus.o \
-	SetLStyle.o \
-	SetPMask.o \
-	SetPntMap.o \
-	SetSOwner.o \
-	SetSSaver.o \
-	SetState.o \
-	SetStip.o \
-	SetStCmap.o \
-	SetTile.o \
-	SetTSOrig.o \
-	StBytes.o \
-	StColor.o \
-	StColors.o \
-	StNColor.o \
-	StName.o \
-	StrKeysym.o \
-	Sync.o \
-	Synchro.o \
-	Text.o \
-	Text16.o \
-	TextExt.o \
-	TextExt16.o \
-	TrCoords.o \
-	UndefCurs.o \
-	UngrabBut.o \
-	UngrabKbd.o \
-	UngrabKey.o \
-	UngrabPtr.o \
-	UngrabSvr.o \
-	UninsCmap.o \
-	UnldFont.o \
-	UnmapSubs.o \
-	UnmapWin.o \
-	VisUtil.o \
-	WarpPtr.o \
-	WinEvent.o \
-	Window.o \
-	WrBitF.o \
-	XlibAsync.o \
-	XlibInt.o \
-	Xrm.o \
-	evtomask.o \
-	globals.o \
-	GetGCVals.o \
-	GetNrmHint.o \
-	GetRGBCMap.o \
-	GetTxtProp.o \
-	GetWMCMapW.o \
-	GetWMProto.o \
-	Iconify.o \
-	PixFormats.o \
-	PropAlloc.o \
-	ReconfWM.o \
-	SetNrmHint.o \
-	SetRGBCMap.o \
-	SetTxtProp.o \
-	SetWMCMapW.o \
-	SetWMProto.o \
-	StrToText.o \
-	TextToStr.o \
-	Withdraw.o \
-	WMGeom.o \
-	WMProps.o \
-	$(AUTHOBJS) \
-	$(K5OBJS) \
-	$(THRSTUBOBJS)
-
-SRCS3 = \
-	Lab.c \
-	LabGcC.c \
-	LabGcL.c \
-	LabGcLC.c \
-	LabMnL.c \
-	LabMxC.c \
-	LabMxL.c \
-	LabMxLC.c \
-	LabWpAj.c \
-	Luv.c \
-	LuvGcC.c \
-	LuvGcL.c \
-	LuvGcLC.c \
-	LuvMnL.c \
-	LuvMxC.c \
-	LuvMxL.c \
-	LuvMxLC.c \
-	LuvWpAj.c \
-	XYZ.c \
-	uvY.c \
-	xyY.c \
-	HVC.c \
-	HVCGcC.c \
-	HVCGcV.c \
-	HVCGcVC.c \
-	HVCMnV.c \
-	HVCMxC.c \
-	HVCMxV.c \
-	HVCMxVC.c \
-	HVCMxVs.c \
-	HVCWpAj.c \
-	UNDEFINED.c \
-	AddDIC.c \
-	AddSF.c \
-	cmsAllNCol.c \
-	cmsAllCol.c \
-	CCC.c \
-	cmsCmap.c \
-	cmsColNm.c \
-	CvColW.c \
-	CvCols.c \
-	cmsGlobls.c \
-	IdOfPr.c \
-	cmsInt.c \
-	LRGB.c \
-	cmsLkCol.c \
-	cmsMath.c \
-	OfCCC.c \
-	PrOfId.c \
-	cmsProp.c \
-	QBlack.c \
-	QBlue.c \
-	QGreen.c \
-	QRed.c \
-	QWhite.c \
-	QuCol.c \
-	QuCols.c \
-	SetCCC.c \
-	SetGetCols.c \
-	StCol.c \
-	StCols.c \
-	cmsTrig.c \
-	XRGB.c \
-	FSWrap.c \
-	ICWrap.c \
-	IMWrap.c \
-	OCWrap.c \
-	OMWrap.c \
-	lcWrap.c \
-	mbWMProps.c \
-	utf8WMProps.c \
-	mbWrap.c \
-	wcWrap.c \
-	utf8Wrap.c \
-	FilterEv.c \
-	RegstFlt.c \
-	locking.c \
-	LockDis.c \
-	x11_trans.c \
-	xim_trans.c \
-	$(XKBSRCS) $(LCSRCS)
-
-OBJS3 = \
-	Lab.o \
-	LabGcC.o \
-	LabGcL.o \
-	LabGcLC.o \
-	LabMnL.o \
-	LabMxC.o \
-	LabMxL.o \
-	LabMxLC.o \
-	LabWpAj.o \
-	Luv.o \
-	LuvGcC.o \
-	LuvGcL.o \
-	LuvGcLC.o \
-	LuvMnL.o \
-	LuvMxC.o \
-	LuvMxL.o \
-	LuvMxLC.o \
-	LuvWpAj.o \
-	XYZ.o \
-	uvY.o \
-	xyY.o \
-	HVC.o \
-	HVCGcC.o \
-	HVCGcV.o \
-	HVCGcVC.o \
-	HVCMnV.o \
-	HVCMxC.o \
-	HVCMxV.o \
-	HVCMxVC.o \
-	HVCMxVs.o \
-	HVCWpAj.o \
-	UNDEFINED.o \
-	AddDIC.o \
-	AddSF.o \
-	cmsAllNCol.o \
-	cmsAllCol.o \
-	CCC.o \
-	cmsCmap.o \
-	cmsColNm.o \
-	CvColW.o \
-	CvCols.o \
-	cmsGlobls.o \
-	IdOfPr.o \
-	cmsInt.o \
-	LRGB.o \
-	cmsLkCol.o \
-	cmsMath.o \
-	OfCCC.o \
-	PrOfId.o \
-	cmsProp.o \
-	QBlack.o \
-	QBlue.o \
-	QGreen.o \
-	QRed.o \
-	QWhite.o \
-	QuCol.o \
-	QuCols.o \
-	SetCCC.o \
-	SetGetCols.o \
-	StCol.o \
-	StCols.o \
-	cmsTrig.o \
-	XRGB.o \
-	FSWrap.o \
-	ICWrap.o \
-	IMWrap.o \
-	OCWrap.o \
-	OMWrap.o \
-	lcWrap.o \
-	mbWMProps.o \
-	utf8WMProps.o \
-	mbWrap.o \
-	wcWrap.o \
-	utf8Wrap.o \
-	FilterEv.o \
-	RegstFlt.o \
-	locking.o \
-	LockDis.o \
-	x11_trans.o \
-	xim_trans.o \
-	$(XKBOBJS) $(LCOBJS)
-
-STATICI18NSTATICSRCS = \
-	imCallbk.c \
-	imDefFlt.c \
-	imDefIc.c \
-	imDefIm.c \
-	imDefLkup.c \
-	imDispch.c \
-	imEvToWire.c \
-	imExten.c \
-	imImSw.c \
-	imInsClbk.c \
-	imInt.c \
-	imLcFlt.c \
-	imLcGIc.c \
-	imLcIc.c \
-	imLcIm.c \
-	imLcLkup.c \
-	imLcPrs.c \
-	imLcSIc.c \
-	imRm.c \
-	imRmAttr.c \
-	imThaiFlt.c \
-	imThaiIc.c \
-	imThaiIm.c \
-	imTrX.c \
-	imTransR.c \
-	imTrans.c \
-	lcGenConv.c \
-	lcUTF8Load.c \
-	omDefault.c \
-	omGeneric.c \
-	omImText.c \
-	omText.c \
-	omTextEsc.c \
-	omTextExt.c \
-	omTextPer.c \
-	omXChar.c
-
-LCSRCS = \
-	SetLocale.c \
-	imConv.c \
-	imKStoUCS.c \
-	lcCT.c \
-	lcCharSet.c \
-	lcConv.c \
-	lcDB.c \
-	lcDefConv.c \
-	lcFile.c \
-	lcGeneric.c \
-	lcInit.c \
-	lcPrTxt.c \
-	lcPubWrap.c \
-	lcPublic.c \
-	lcRM.c \
-	lcStd.c \
-	lcTxtPr.c \
-	lcUtil.c \
-	lcUTF8.c
-
-STATICLCSRCS = \
-	$(STATICI18NSTATICSRCS)
-
-STATICI18NSTATICOBJS = \
-	imCallbk.o \
-	imDefFlt.o \
-	imDefIc.o \
-	imDefIm.o \
-	imDefLkup.o \
-	imDispch.o \
-	imEvToWire.o \
-	imExten.o \
-	imImSw.o \
-	imInsClbk.o \
-	imInt.o \
-	imLcFlt.o \
-	imLcGIc.o \
-	imLcIc.o \
-	imLcIm.o \
-	imLcLkup.o \
-	imLcPrs.o \
-	imLcSIc.o \
-	imRm.o \
-	imRmAttr.o \
-	imThaiFlt.o \
-	imThaiIc.o \
-	imThaiIm.o \
-	imTrX.o \
-	imTransR.o \
-	imTrans.o \
-	lcGenConv.o \
-	lcUTF8Load.o \
-	omDefault.o \
-	omGeneric.o \
-	omImText.o \
-	omText.o \
-	omTextEsc.o \
-	omTextExt.o \
-	omTextPer.o \
-	omXChar.o
-
-LCOBJS = \
-	SetLocale.o \
-	imConv.o \
-	imKStoUCS.o \
-	lcCT.o \
-	lcCharSet.o \
-	lcConv.o \
-	lcDB.o \
-	lcDefConv.o \
-	lcFile.o \
-	lcGeneric.o \
-	lcInit.o \
-	lcPrTxt.o \
-	lcPubWrap.o \
-	lcPublic.o \
-	lcRM.o \
-	lcStd.o \
-	lcTxtPr.o \
-	lcUtil.o \
-	lcUTF8.o
-
-STATICLCOBJS = \
-	$(STATICI18NSTATICOBJS) 
-
-#include <Library.tmpl>
-
-SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))
-SpecialCLibObjectRule(ConnDis,$(ICONFIGFILES),$(XDMAUTHDEFS) $(RPCDEFS) $(CONN_DEFINES) $(SOCK_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES) $(K5INCL) $(K5DEFS))
-SpecialCLibObjectRule(x11_trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES))
-SpecialCLibObjectRule(xim_trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES))
-SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES))
-SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES))
-SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
-SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
-SpecialCLibObjectRule(cmsColNm,$(ICONFIGFILES),$(CMS_DEFINES))
-SpecialCLibObjectRule(globals,$(ICONFIGFILES),$(CONN_DEFINES))
-SpecialCLibObjectRule(Context,$(ICONFIGFILES),$(BC_DEFINES))
-SpecialCLibObjectRule(Xrm,$(_NOOP_),$(RCONST_DEFINES))
-SpecialCLibObjectRule(imTransR,$(ICONFIGFILES),$(CONN_DEFINES) $(XTRANS_XIM_DEFINES))
-SpecialCLibObjectRule(imTrans,$(ICONFIGFILES),$(CONN_DEFINES) $(XTRANS_XIM_DEFINES))
-SpecialCLibObjectRule(lcFile,$(ICONFIGFILES),$(XLC_DEFINES) $(SETID_DEFINES))
-#if BuildXKBlib
-SpecialCLibObjectRule(XKBCvt,$(_NOOP_),$(RCONST_DEFINES))
-SpecialCLibObjectRule(KeyBind,$(ICONFIGFILES),$(XKB_DEFINES))
-SpecialCLibObjectRule(XKBBind,$(ICONFIGFILES),$(XKB_DEFINES))
-SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES))
-#endif
-#if BuildLoadableXlibXcursor
-SpecialCLibObjectRuleSeparateOpts(CrCursor,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_DEFINES))
-SpecialCLibObjectRuleSeparateOpts(CrGlCur,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_DEFINES))
-SpecialCLibObjectRuleSeparateOpts(CrPixmap,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_DEFINES))
-SpecialCLibObjectRuleSeparateOpts(PutImage,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_DEFINES))
-#endif
-
-#if InstallXcmsTxt
-InstallNonExecFile(Xcms.txt,$(LIBDIR))
-#endif
-InstallNonExecFile(XErrorDB,$(LIBDIR))
-InstallLintLibrary(X11,$(LINTLIBDIR))
-
-MAKEKEYS = ./makekeys
-KEYSYMDEFS =  $(XINCLUDESRC)/keysymdef.h $(XINCLUDESRC)/XF86keysym.h $(XINCLUDESRC)/Sunkeysym.h $(XINCLUDESRC)/DECkeysym.h $(XINCLUDESRC)/HPkeysym.h
-
-#if CrossCompiling
-HOST_LDLIBS=
-HOST_CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) \
-	$(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES)
-#else
-HOST_LDLIBS=$(LDLIBS)
-HOST_CFLAGS=$(CFLAGS)
-#endif
-
-ks_tables.h: $(KEYSYMDEFS) util/makekeys.c
-	RemoveFiles($@ HostProgramTargetName(makekeys) makekeys.Osuf)
-	-HostLinkRule(HostProgramTargetName(makekeys),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(HOST_LDLIBS))
-	RunProgram(MAKEKEYS, $(KEYSYMDEFS) > ks_tables_h)
-	$(MV) ks_tables_h $@
-	RemoveFiles(HostProgramTargetName(makekeys) makekeys.Osuf ks_tables_h)
-
-includes:: ks_tables.h
-
-CONFIGURE ?= ./configure
-
-depend:: ks_tables.h
-
-clean::
-	RemoveFiles(ks_tables_h ks_tables.h HostProgramTargetName(makekeys))
-
-KeysymStr.o: ks_tables.h
-
-StrKeysym.o: ks_tables.h
-
-DependTarget3($(SRCS1),$(SRCS2),$(SRCS3) $(EXTRASRCS))
-
-#endif
-
-includes:: XlibConf.h pathmax.h
-
-#include <Threads.tmpl>
-
-#if ThreadedProject
-#define XThreadsDefine echo '#ifndef XTHREADS' >> $@		@@\
-	echo '#define XTHREADS' >> $@				@@\
-	echo '#endif' >> $@
-#else
-#define XThreadsDefine echo '#undef XTHREADS' >> $@
-#endif
-
-#if HasThreadSafeAPI
-#define MTSafeAPIDefine	echo '#ifndef XUSE_MTSAFE_API' >> $@	@@\
-	echo '#define XUSE_MTSAFE_API' >> $@			@@\
-	echo '#endif' >> $@
-#else
-#define MTSafeAPIDefine echo '#undef XUSE_MTSAFE_API' >> $@
-#endif
-
-XlibConf.h:
-	echo '/* Defines needed to use Xlib from non-imake projects */' > $@
-	XThreadsDefine
-	MTSafeAPIDefine
-
-/* create libX11 links in exports/lib */
-libX11-links:
-	MakeDir($(BUILDLIBDIR))
-	@MAJREV=`echo $(SOXLIBREV) | cut -d. -f1`;\
-	(for i in "" .$$MAJREV .$(SOXLIBREV); do\
-	    t="lib$(LIBNAME).so$$i";\
-	    l="libX11.so$$i";\
-	    $(RM) "$(BUILDLIBDIR)/$$l";\
-	    (set -x; $(LN) "$$t" "$(BUILDLIBDIR)/$$l");\
-	done)
-
-/* remove libX11 _and_ libNX_X11 links in epxorts/lib */
-/* Disable this for now, refer to the comments regarding libX11-links. */
-#clean::
-#	@MAJREV=`echo $(SOXLIBREV) | cut -d. -f1`;\
-#	set -x; for i in "" .$$MAJREV .$(SOXLIBREV); do\
-#	    $(RM) "$(BUILDLIBDIR)/lib$(LIBNAME).so$$i" "$(BUILDLIBDIR)/libX11.so$$i";\
-#	done
diff --git a/nx-X11/lib/X11/XlibConf.h b/nx-X11/lib/X11/XlibConf.h
deleted file mode 100644
index 32fc91b2e..000000000
--- a/nx-X11/lib/X11/XlibConf.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Defines needed to use Xlib from non-imake projects */
-#ifndef XTHREADS
-#define XTHREADS
-#endif
-#ifndef XUSE_MTSAFE_API
-#define XUSE_MTSAFE_API
-#endif
diff --git a/nx-X11/lib/configure.ac b/nx-X11/lib/configure.ac
new file mode 100644
index 000000000..1eebf329f
--- /dev/null
+++ b/nx-X11/lib/configure.ac
@@ -0,0 +1,309 @@
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([libNX_X11], [1.6.5],
+        [https://github.com/ArcticaProject/nx-libs/issues], [libNX_X11])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+
+# Set common system defines for POSIX extensions, such as _GNU_SOURCE
+# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
+# to avoid autoconf errors.
+AC_USE_SYSTEM_EXTENSIONS
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+
+# Initialize libtool
+AC_PROG_LIBTOOL
+
+# Upstream's pkg.m4 (since 0.27) offers this now, but define our own
+# compatible version in case the local version of pkgconfig isn't new enough.
+# https://bugs.freedesktop.org/show_bug.cgi?id=48743
+m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
+         [AC_ARG_WITH([pkgconfigdir],
+                      [AS_HELP_STRING([--with-pkgconfigdir],
+                      [install directory for nx-x11.pc pkg-config file])],
+                       [],[with_pkgconfigdir='$(libdir)/pkgconfig'])
+          AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
+
+NX_COMPILER_BRAND
+NX_DEFAULT_OPTIONS
+
+# Required when PKG_CHECK_MODULES called within an if statement
+PKG_PROG_PKG_CONFIG
+
+# Checks for pkg-config packages
+
+X11_REQUIRES='nx-xproto nx-xextproto nx-xtrans'
+X11_EXTRA_DEPS=""
+
+AC_SUBST(X11_EXTRA_DEPS)
+
+# Issue an error if nx-xtrans.m4 was not found and NX_XTRANS_CONNECTION_FLAGS macro
+# was not expanded, since libNX_X11 with no transport types is rather useless.
+m4_pattern_forbid([^NX_XTRANS_CONNECTION_FLAGS$])
+
+# Transport selection macro from nx-xtrans.m4
+NX_XTRANS_CONNECTION_FLAGS
+
+# Checks for header files.
+AC_CHECK_HEADERS([sys/select.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_CHECK_FUNCS([strtol seteuid])
+
+# Used in lcFile.c (see also --enable-xlocaledir settings below)
+XLOCALEDIR_IS_SAFE="no"
+
+AC_CHECK_DECL([issetugid])
+AC_CHECK_FUNC([issetugid])
+if test "$ac_cv_have_decl_issetugid" = yes && test "$ac_cv_func_issetugid" = yes; then
+    XLOCALEDIR_IS_SAFE="yes"
+    AC_DEFINE(HASSETUGID,1,[Has issetugid() function])
+fi
+AC_CHECK_FUNC([getresuid], [XLOCALEDIR_IS_SAFE="yes"]
+        AC_DEFINE(HASGETRESUID,1,[Has getresuid() & getresgid() functions]))
+# Used in Font.c
+AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
+
+# Checks for system services
+# AC_PATH_XTRA
+
+# Threading support...
+
+AC_ARG_ENABLE(xthreads,
+              AS_HELP_STRING([--disable-xthreads],
+                [Disable Xlib support for Multithreading]),
+              [xthreads=$enableval],[xthreads=yes])
+
+AC_CHECK_LIB(c, getpwuid_r, [mtsafeapi="yes"], [mtsafeapi="no"])
+
+case x$xthreads in
+xyes)
+        AC_DEFINE(XTHREADS,1,[Whether libNX_X11 is compiled with thread support])
+        if test x$mtsafeapi = xyes
+        then
+        AC_DEFINE(XUSE_MTSAFE_API,1,[Whether libNX_X11 needs to use MT safe API's])
+        fi
+        ;;
+*)
+        ;;
+esac
+
+AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"])
+AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
+
+# XXX incomplete, please fill this in
+if test x$xthreads = xyes ; then
+    case $host_os in
+    linux*|gnu*|k*bsd*-gnu)
+        XTHREADLIB=-lpthread ;;
+    netbsd*)
+        XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
+        XTHREADLIB="-lpthread" ;;
+    freebsd*)
+        XTHREAD_CFLAGS="-D_THREAD_SAFE"
+        XTHREADLIB="-pthread" ;;
+    dragonfly*|openbsd*)
+        XTHREADLIB="-pthread" ;;
+    solaris*)
+        XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
+    esac
+fi
+AC_SUBST(XTHREADLIB)
+AC_SUBST(XTHREAD_CFLAGS)
+
+AC_CHECK_FUNC(poll, [has_poll="yes"], [has_poll="no"])
+
+AC_ARG_ENABLE([poll],
+        AS_HELP_STRING([--disable-poll],
+          [Disable poll() usage in XlibInt]),
+        AS_IF([test "x$enable_poll" = "xno"],
+          [want_poll="no"], [want_poll="yes"]),
+          [want_poll="yes"])
+
+if test x"$has_poll" = "xyes" && test x"$want_poll" = "xyes"; then
+        use_poll="yes"
+        AC_DEFINE(USE_POLL,1,[Enable using the poll() function in XlibInt])
+else
+        use_poll="no"
+fi
+
+#
+# Find keysymdef.h
+#
+AC_MSG_CHECKING([keysym definitions])
+AC_ARG_WITH([keysymdefdir],
+        [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
+        [KEYSYMDEFDIR=$withval],
+        [KEYSYMDEFDIR=`pwd`/../include])
+
+if test ! -d "$KEYSYMDEFDIR"; then
+        AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
+fi
+
+FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+for i in $FILES; do
+    if test -f "$KEYSYMDEFDIR/$i"; then
+            KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
+    elif test "x$i" = "xkeysymdef.h"; then
+            AC_MSG_ERROR([Cannot find keysymdef.h])
+    fi
+done
+AC_MSG_RESULT([$KEYSYMDEFS])
+AC_SUBST(KEYSYMDEFS)
+
+AC_ARG_ENABLE(xcms,
+              AS_HELP_STRING([--disable-xcms],
+                [Disable Xlib support for CMS *EXPERIMENTAL*]),
+              [XCMS=$enableval],[XCMS=yes])
+AM_CONDITIONAL(XCMS, [test x$XCMS = xyes ])
+if test x"$XCMS" = "xyes"; then
+        AC_DEFINE(XCMS,1,[Include support for XCMS])
+fi
+
+AC_ARG_ENABLE(xlocale,
+              AS_HELP_STRING([--disable-xlocale],
+                [Disable Xlib locale implementation *EXPERIMENTAL*]),
+              [XLOCALE=$enableval],[XLOCALE=yes])
+
+AM_CONDITIONAL(XLOCALE, [ test x$XLOCALE = xyes ])
+if test x"$XLOCALE" = "xyes"; then
+        AC_DEFINE(XLOCALE,1,[support for X Locales])
+fi
+
+
+# This disables XLOCALEDIR.  Set it if you're using BuildLoadableXlibI18n,
+# don't have either issetugid() or getresuid(), and you need to protect
+# clients that are setgid or setuid to an id other than 0.
+AC_MSG_CHECKING([if XLOCALEDIR support should be enabled])
+AC_ARG_ENABLE(xlocaledir,
+              AS_HELP_STRING([--enable-xlocaledir],
+                [Enable XLOCALEDIR environment variable support]),
+              [ENABLE_XLOCALEDIR=$enableval],[ENABLE_XLOCALEDIR=$XLOCALEDIR_IS_SAFE])
+if test "x$ENABLE_XLOCALEDIR" = "xno"; then
+        AC_DEFINE(NO_XLOCALEDIR,1,[Disable XLOCALEDIR environment variable])
+fi
+AC_MSG_RESULT($ENABLE_XLOCALEDIR)
+
+AC_ARG_ENABLE(xf86bigfont,
+              AS_HELP_STRING([--disable-xf86bigfont],
+                [Disable XF86BigFont extension support]),
+              [XF86BIGFONT=$enableval],[XF86BIGFONT="yes"])
+if test "x$XF86BIGFONT" = "xyes"; then
+# FIXME: Skip check for proto headers for now... Requires .pc files for all the proto
+# header packages we have. Keeping that in mind for later...
+#    PKG_CHECK_MODULES(BIGFONT, [xf86bigfontproto >= 1.2.0],
+        AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension])
+#   ,XF86BIGFONT="no")
+fi
+
+AC_ARG_ENABLE(xkb,
+              AS_HELP_STRING([--disable-xkb],
+                [Disable XKB support *EXPERIMENTAL*]),
+              [XKB=$enableval],[XKB=yes])
+
+AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])
+if test x"$XKB" = "xyes"; then
+   XKBPROTO_REQUIRES="kbproto"
+   X11_REQUIRES="${X11_REQUIRES} kbproto inputproto"
+   AC_DEFINE(XKB,1,[Use XKB])
+else
+   XKBPROTO_REQUIRES=""
+fi
+AC_SUBST(XKBPROTO_REQUIRES)
+
+AC_FUNC_MMAP()
+composecache_default=$ac_cv_func_mmap_fixed_mapped
+AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])
+AC_ARG_ENABLE(composecache,
+              AS_HELP_STRING([--disable-composecache],
+                [Disable compose table cache support]),
+              [COMPOSECACHE=$enableval],[COMPOSECACHE=$composecache_default])
+if test x"$COMPOSECACHE" = "xyes"; then
+        AC_DEFINE(COMPOSECACHE,1,[Include compose table cache support])
+fi
+
+X11_DATADIR="${datadir}/nx/X11"
+AX_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libNX_X11 data])
+AC_SUBST(X11_DATADIR)
+
+X11_LIBDIR="${libdir}"
+AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libNX_X11 library data])
+AC_SUBST(X11_LIBDIR)
+
+# FIXME: Skip check for proto headers for now... Requires .pc files for all the proto
+# header packages we have. Keeping that in mind for later...
+#PKG_CHECK_MODULES(X11, [$X11_REQUIRES])
+X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS $BASE_CFLAGS"
+
+#
+# Yes, it would be nice to put the locale data in
+# /usr/share, but the locale stuff includes loadable
+# libraries which must be located in the same directory
+# as the other locale data, so for now, everything lives
+# in ${libdir}
+#
+
+AC_ARG_WITH(locale-lib-dir,     AS_HELP_STRING([--with-locale-lib-dir=DIR],
+ [Directory where locale libraries files are installed (default: $libdir/X11/locale)]),
+                                [ X11_LOCALELIBDIR="$withval" ],
+                                [ X11_LOCALELIBDIR="${X11_LIBDIR}/locale" ])
+AX_DEFINE_DIR(XLOCALELIBDIR, X11_LOCALELIBDIR, [Location of libNX_X11 locale libraries])
+AC_SUBST(X11_LOCALELIBDIR)
+
+AC_ARG_WITH(locale-data-dir,     AS_HELP_STRING([--with-locale-data-dir=DIR],
+ [Directory where locale data files are installed (default: /usr/share/X11/locale)]),
+                                [ X11_LOCALEDATADIR="$withval" ],
+                                [ X11_LOCALEDATADIR="/usr/share/X11/locale" ])
+AX_DEFINE_DIR(XLOCALEDATADIR, X11_LOCALEDATADIR, [Location of libNX_X11 locale data files])
+AC_SUBST(X11_LOCALEDATADIR)
+
+X11_LOCALEDIR="${X11_LOCALEDATADIR}"
+AX_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libNX_X11 locale data])
+AC_SUBST(X11_LOCALEDIR)
+
+XERRORDB="${X11_DATADIR}/XErrorDB"
+AX_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
+
+NX_CHECK_MALLOC_ZERO
+
+AC_CONFIG_FILES([include/Makefile
+		 modules/im/ximcp/Makefile
+		 modules/im/Makefile
+		 modules/lc/gen/Makefile
+		 modules/lc/def/Makefile
+		 modules/lc/Utf8/Makefile
+		 modules/lc/Makefile
+		 modules/om/generic/Makefile
+		 modules/om/Makefile
+		 modules/Makefile
+		 src/util/Makefile
+		 src/xcms/Makefile
+		 src/xkb/Makefile
+		 src/xlibi18n/Makefile
+		 src/Makefile
+		 Makefile
+		 nx-x11.pc])
+AC_OUTPUT
+
+echo ""
+echo "NX_X11 will be built with the following settings:"
+echo " Threading support:                       "$xthreads
+echo " Use Threads safe API:                    "$mtsafeapi
+echo " Threads stubs in libNX_X11:              "$thrstubs
+echo " USE_POLL:                                "$use_poll
+echo " XCMS:                                    "$XCMS
+echo " Internationalization support:            "$XLOCALE
+echo " XF86BigFont support:                     "$XF86BIGFONT
+echo " XKB support:                             "$XKB
+echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR
+echo " Compose table cache enabled:             "$COMPOSECACHE
+echo ""
diff --git a/nx-X11/lib/include/Makefile.am b/nx-X11/lib/include/Makefile.am
new file mode 100644
index 000000000..9272e3cf5
--- /dev/null
+++ b/nx-X11/lib/include/Makefile.am
@@ -0,0 +1,32 @@
+NULL =
+
+x11includedir=${includedir}/nx-X11
+x11include_HEADERS=		\
+	X11/XKBlib.h		\
+	X11/Xcms.h		\
+	X11/Xlib.h		\
+	X11/Xlibint.h		\
+	X11/Xlocale.h		\
+	X11/Xresource.h		\
+	X11/Xutil.h		\
+	X11/cursorfont.h	\
+	X11/Xregion.h		\
+	X11/ImUtil.h		\
+	$(NULL)
+
+nodist_x11include_HEADERS=\
+	X11/XlibConf.h
+
+xtransincludedir=${includedir}/nx-X11/Xtrans
+xtransinclude_HEADERS =		\
+	xtrans/Xtransint.h	\
+	xtrans/Xtrans.h		\
+	xtrans/Xtranslcl.c	\
+	xtrans/transport.c	\
+	xtrans/Xtrans.c		\
+	xtrans/Xtranssock.c	\
+	xtrans/Xtransutil.c	\
+        $(NULL)
+
+EXTRA_DIST = \
+	X11/XlibConf.h.in
diff --git a/nx-X11/lib/include/X11/.gitignore b/nx-X11/lib/include/X11/.gitignore
new file mode 100644
index 000000000..be3bc6cfb
--- /dev/null
+++ b/nx-X11/lib/include/X11/.gitignore
@@ -0,0 +1 @@
+XlibConf.h
diff --git a/nx-X11/lib/X11/ImUtil.h b/nx-X11/lib/include/X11/ImUtil.h
index a8b95eead..a8b95eead 100644
--- a/nx-X11/lib/X11/ImUtil.h
+++ b/nx-X11/lib/include/X11/ImUtil.h
diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/include/X11/XKBlib.h
index dd2841e9a..dd2841e9a 100644
--- a/nx-X11/lib/X11/XKBlib.h
+++ b/nx-X11/lib/include/X11/XKBlib.h
diff --git a/nx-X11/lib/X11/Xcms.h b/nx-X11/lib/include/X11/Xcms.h
index 3b0410533..3b0410533 100644
--- a/nx-X11/lib/X11/Xcms.h
+++ b/nx-X11/lib/include/X11/Xcms.h
diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/include/X11/Xlib.h
index 362fdb69e..362fdb69e 100644
--- a/nx-X11/lib/X11/Xlib.h
+++ b/nx-X11/lib/include/X11/Xlib.h
diff --git a/nx-X11/lib/include/X11/XlibConf.h.in b/nx-X11/lib/include/X11/XlibConf.h.in
new file mode 100644
index 000000000..8f36ac1d9
--- /dev/null
+++ b/nx-X11/lib/include/X11/XlibConf.h.in
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2005 Keith Packard
+ *
+ * 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, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _XLIBCONF_H_
+#define _XLIBCONF_H_
+/*
+ * This header file exports defines necessary to correctly
+ * use Xlibint.h both inside Xlib and by external libraries
+ * such as extensions.
+ */
+
+/* Threading support? */
+#undef XTHREADS
+
+/* Use multi-threaded libc functions? */
+#undef XUSE_MTSAFE_API
+
+#endif /* _XLIBCONF_H_ */
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/include/X11/Xlibint.h
index b325182e3..b325182e3 100644
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/include/X11/Xlibint.h
diff --git a/nx-X11/lib/X11/Xlocale.h b/nx-X11/lib/include/X11/Xlocale.h
index 4ac9bac30..4ac9bac30 100644
--- a/nx-X11/lib/X11/Xlocale.h
+++ b/nx-X11/lib/include/X11/Xlocale.h
diff --git a/nx-X11/lib/X11/Xregion.h b/nx-X11/lib/include/X11/Xregion.h
index 4f55af82f..4f55af82f 100644
--- a/nx-X11/lib/X11/Xregion.h
+++ b/nx-X11/lib/include/X11/Xregion.h
diff --git a/nx-X11/lib/X11/Xresource.h b/nx-X11/lib/include/X11/Xresource.h
index f3977a209..f3977a209 100644
--- a/nx-X11/lib/X11/Xresource.h
+++ b/nx-X11/lib/include/X11/Xresource.h
diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/include/X11/Xutil.h
index 48fa23cf5..48fa23cf5 100644
--- a/nx-X11/lib/X11/Xutil.h
+++ b/nx-X11/lib/include/X11/Xutil.h
diff --git a/nx-X11/lib/X11/cursorfont.h b/nx-X11/lib/include/X11/cursorfont.h
index a0fbf3c6b..a0fbf3c6b 100644
--- a/nx-X11/lib/X11/cursorfont.h
+++ b/nx-X11/lib/include/X11/cursorfont.h
diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/include/xtrans/Xtrans.c
index 328a970b1..328a970b1 100644
--- a/nx-X11/lib/xtrans/Xtrans.c
+++ b/nx-X11/lib/include/xtrans/Xtrans.c
diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/include/xtrans/Xtrans.h
index 54b2a1425..54b2a1425 100644
--- a/nx-X11/lib/xtrans/Xtrans.h
+++ b/nx-X11/lib/include/xtrans/Xtrans.h
diff --git a/nx-X11/lib/xtrans/Xtransint.h b/nx-X11/lib/include/xtrans/Xtransint.h
index f7e07687b..f7e07687b 100644
--- a/nx-X11/lib/xtrans/Xtransint.h
+++ b/nx-X11/lib/include/xtrans/Xtransint.h
diff --git a/nx-X11/lib/xtrans/Xtranslcl.c b/nx-X11/lib/include/xtrans/Xtranslcl.c
index 7231d2a83..7231d2a83 100644
--- a/nx-X11/lib/xtrans/Xtranslcl.c
+++ b/nx-X11/lib/include/xtrans/Xtranslcl.c
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/include/xtrans/Xtranssock.c
index dff217e9d..dff217e9d 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/include/xtrans/Xtranssock.c
diff --git a/nx-X11/lib/xtrans/Xtransutil.c b/nx-X11/lib/include/xtrans/Xtransutil.c
index 0063e83d8..0063e83d8 100644
--- a/nx-X11/lib/xtrans/Xtransutil.c
+++ b/nx-X11/lib/include/xtrans/Xtransutil.c
diff --git a/nx-X11/lib/xtrans/transport.c b/nx-X11/lib/include/xtrans/transport.c
index b62fc7b64..b62fc7b64 100644
--- a/nx-X11/lib/xtrans/transport.c
+++ b/nx-X11/lib/include/xtrans/transport.c
diff --git a/nx-X11/lib/m4/ax_define_dir.m4 b/nx-X11/lib/m4/ax_define_dir.m4
new file mode 100644
index 000000000..b74d155fd
--- /dev/null
+++ b/nx-X11/lib/m4/ax_define_dir.m4
@@ -0,0 +1,49 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_define_dir.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+#
+# DESCRIPTION
+#
+#   This macro sets VARNAME to the expansion of the DIR variable, taking
+#   care of fixing up ${prefix} and such.
+#
+#   VARNAME is then offered as both an output variable and a C preprocessor
+#   symbol.
+#
+#   Example:
+#
+#     AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
+#   Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2008 Alexandre Oliva
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 6
+
+AU_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR])
+AC_DEFUN([AX_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  eval ax_define_dir="\"[$]$2\""
+  eval ax_define_dir="\"$ax_define_dir\""
+  AC_SUBST($1, "$ax_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ax_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])
diff --git a/nx-X11/lib/m4/nx-macros.m4 b/nx-X11/lib/m4/nx-macros.m4
new file mode 120000
index 000000000..efbc5bdb4
--- /dev/null
+++ b/nx-X11/lib/m4/nx-macros.m4
@@ -0,0 +1 @@
+../../../m4/nx-macros.m4
\ No newline at end of file
diff --git a/nx-X11/lib/m4/nx-xtrans.m4 b/nx-X11/lib/m4/nx-xtrans.m4
new file mode 120000
index 000000000..5e3aef91e
--- /dev/null
+++ b/nx-X11/lib/m4/nx-xtrans.m4
@@ -0,0 +1 @@
+../../../m4/nx-xtrans.m4
\ No newline at end of file
diff --git a/nx-X11/lib/modules/Makefile.am b/nx-X11/lib/modules/Makefile.am
new file mode 100644
index 000000000..3bedb1a20
--- /dev/null
+++ b/nx-X11/lib/modules/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = im lc om
diff --git a/nx-X11/lib/modules/im/Makefile.am b/nx-X11/lib/modules/im/Makefile.am
new file mode 100644
index 000000000..76d27dd77
--- /dev/null
+++ b/nx-X11/lib/modules/im/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = ximcp
diff --git a/nx-X11/lib/modules/im/ximcp/Makefile.am b/nx-X11/lib/modules/im/ximcp/Makefile.am
new file mode 100644
index 000000000..e44ce0d90
--- /dev/null
+++ b/nx-X11/lib/modules/im/ximcp/Makefile.am
@@ -0,0 +1,56 @@
+NULL =
+
+noinst_LTLIBRARIES=libximcp.la
+
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/include/X11		\
+	-I$(top_builddir)/include 		\
+	-I$(top_builddir)/include/X11		\
+	-I$(top_srcdir)/src/xcms		\
+	-I$(top_srcdir)/src/xkb			\
+	-I$(top_srcdir)/src/xlibi18n		\
+	-I$(top_srcdir)/src			\
+	-I$(top_srcdir)/../exports/include	\
+	-D_GNU_SOURCE				\
+	-DXIM_t					\
+	-DTRANS_CLIENT				\
+	$(NULL)
+
+AM_CFLAGS =					\
+	$(X11_CFLAGS)				\
+	$(BIGFONT_CFLAGS)			\
+	$(MALLOC_ZERO_CFLAGS)			\
+	$(CWARNFLAGS)				\
+	$(NULL)
+
+ximcp_la_SOURCES =				\
+		imCallbk.c			\
+		imDefFlt.c			\
+		imDefIc.c			\
+		imDefIm.c			\
+		imDefLkup.c			\
+		imDispch.c			\
+		imEvToWire.c			\
+		imExten.c			\
+		imImSw.c			\
+		imInsClbk.c			\
+		imInt.c				\
+		imLcFlt.c			\
+		imLcGIc.c			\
+		imLcIc.c			\
+		imLcIm.c			\
+		imLcLkup.c			\
+		imLcPrs.c			\
+		imLcSIc.c			\
+		imRmAttr.c			\
+		imRm.c				\
+		imThaiFlt.c			\
+		imThaiIc.c			\
+		imThaiIm.c			\
+		imTrans.c			\
+		imTransR.c			\
+		imTrX.c				\
+		$(NULL)
+
+libximcp_la_SOURCES = $(ximcp_la_SOURCES)
diff --git a/nx-X11/lib/X11/imCallbk.c b/nx-X11/lib/modules/im/ximcp/imCallbk.c
index 4e091d8ef..4e091d8ef 100644
--- a/nx-X11/lib/X11/imCallbk.c
+++ b/nx-X11/lib/modules/im/ximcp/imCallbk.c
diff --git a/nx-X11/lib/X11/imDefFlt.c b/nx-X11/lib/modules/im/ximcp/imDefFlt.c
index b6473e176..b6473e176 100644
--- a/nx-X11/lib/X11/imDefFlt.c
+++ b/nx-X11/lib/modules/im/ximcp/imDefFlt.c
diff --git a/nx-X11/lib/X11/imDefIc.c b/nx-X11/lib/modules/im/ximcp/imDefIc.c
index 3cf46827a..3cf46827a 100644
--- a/nx-X11/lib/X11/imDefIc.c
+++ b/nx-X11/lib/modules/im/ximcp/imDefIc.c
diff --git a/nx-X11/lib/X11/imDefIm.c b/nx-X11/lib/modules/im/ximcp/imDefIm.c
index 2a1ccb4ec..2a1ccb4ec 100644
--- a/nx-X11/lib/X11/imDefIm.c
+++ b/nx-X11/lib/modules/im/ximcp/imDefIm.c
diff --git a/nx-X11/lib/X11/imDefLkup.c b/nx-X11/lib/modules/im/ximcp/imDefLkup.c
index af39008bc..af39008bc 100644
--- a/nx-X11/lib/X11/imDefLkup.c
+++ b/nx-X11/lib/modules/im/ximcp/imDefLkup.c
diff --git a/nx-X11/lib/X11/imDispch.c b/nx-X11/lib/modules/im/ximcp/imDispch.c
index 862a9b651..862a9b651 100644
--- a/nx-X11/lib/X11/imDispch.c
+++ b/nx-X11/lib/modules/im/ximcp/imDispch.c
diff --git a/nx-X11/lib/X11/imEvToWire.c b/nx-X11/lib/modules/im/ximcp/imEvToWire.c
index 45677c461..45677c461 100644
--- a/nx-X11/lib/X11/imEvToWire.c
+++ b/nx-X11/lib/modules/im/ximcp/imEvToWire.c
diff --git a/nx-X11/lib/X11/imExten.c b/nx-X11/lib/modules/im/ximcp/imExten.c
index 532b18d3b..532b18d3b 100644
--- a/nx-X11/lib/X11/imExten.c
+++ b/nx-X11/lib/modules/im/ximcp/imExten.c
diff --git a/nx-X11/lib/X11/imImSw.c b/nx-X11/lib/modules/im/ximcp/imImSw.c
index 28b1725a6..28b1725a6 100644
--- a/nx-X11/lib/X11/imImSw.c
+++ b/nx-X11/lib/modules/im/ximcp/imImSw.c
diff --git a/nx-X11/lib/X11/imInsClbk.c b/nx-X11/lib/modules/im/ximcp/imInsClbk.c
index 3ae6b1bd7..3ae6b1bd7 100644
--- a/nx-X11/lib/X11/imInsClbk.c
+++ b/nx-X11/lib/modules/im/ximcp/imInsClbk.c
diff --git a/nx-X11/lib/X11/imInt.c b/nx-X11/lib/modules/im/ximcp/imInt.c
index 05e04dac8..05e04dac8 100644
--- a/nx-X11/lib/X11/imInt.c
+++ b/nx-X11/lib/modules/im/ximcp/imInt.c
diff --git a/nx-X11/lib/X11/imLcFlt.c b/nx-X11/lib/modules/im/ximcp/imLcFlt.c
index 50f4c252a..50f4c252a 100644
--- a/nx-X11/lib/X11/imLcFlt.c
+++ b/nx-X11/lib/modules/im/ximcp/imLcFlt.c
diff --git a/nx-X11/lib/X11/imLcGIc.c b/nx-X11/lib/modules/im/ximcp/imLcGIc.c
index 003b3897a..003b3897a 100644
--- a/nx-X11/lib/X11/imLcGIc.c
+++ b/nx-X11/lib/modules/im/ximcp/imLcGIc.c
diff --git a/nx-X11/lib/X11/imLcIc.c b/nx-X11/lib/modules/im/ximcp/imLcIc.c
index 7ab9050c1..7ab9050c1 100644
--- a/nx-X11/lib/X11/imLcIc.c
+++ b/nx-X11/lib/modules/im/ximcp/imLcIc.c
diff --git a/nx-X11/lib/X11/imLcIm.c b/nx-X11/lib/modules/im/ximcp/imLcIm.c
index b3662bc96..b3662bc96 100644
--- a/nx-X11/lib/X11/imLcIm.c
+++ b/nx-X11/lib/modules/im/ximcp/imLcIm.c
diff --git a/nx-X11/lib/X11/imLcLkup.c b/nx-X11/lib/modules/im/ximcp/imLcLkup.c
index 878b8e350..878b8e350 100644
--- a/nx-X11/lib/X11/imLcLkup.c
+++ b/nx-X11/lib/modules/im/ximcp/imLcLkup.c
diff --git a/nx-X11/lib/X11/imLcPrs.c b/nx-X11/lib/modules/im/ximcp/imLcPrs.c
index fa992e5d3..fa992e5d3 100644
--- a/nx-X11/lib/X11/imLcPrs.c
+++ b/nx-X11/lib/modules/im/ximcp/imLcPrs.c
diff --git a/nx-X11/lib/X11/imLcSIc.c b/nx-X11/lib/modules/im/ximcp/imLcSIc.c
index 944bd8abd..944bd8abd 100644
--- a/nx-X11/lib/X11/imLcSIc.c
+++ b/nx-X11/lib/modules/im/ximcp/imLcSIc.c
diff --git a/nx-X11/lib/X11/imRm.c b/nx-X11/lib/modules/im/ximcp/imRm.c
index 373217173..373217173 100644
--- a/nx-X11/lib/X11/imRm.c
+++ b/nx-X11/lib/modules/im/ximcp/imRm.c
diff --git a/nx-X11/lib/X11/imRmAttr.c b/nx-X11/lib/modules/im/ximcp/imRmAttr.c
index 9d4e46258..9d4e46258 100644
--- a/nx-X11/lib/X11/imRmAttr.c
+++ b/nx-X11/lib/modules/im/ximcp/imRmAttr.c
diff --git a/nx-X11/lib/X11/imThaiFlt.c b/nx-X11/lib/modules/im/ximcp/imThaiFlt.c
index 401bd9a08..401bd9a08 100644
--- a/nx-X11/lib/X11/imThaiFlt.c
+++ b/nx-X11/lib/modules/im/ximcp/imThaiFlt.c
diff --git a/nx-X11/lib/X11/imThaiIc.c b/nx-X11/lib/modules/im/ximcp/imThaiIc.c
index b559145d0..b559145d0 100644
--- a/nx-X11/lib/X11/imThaiIc.c
+++ b/nx-X11/lib/modules/im/ximcp/imThaiIc.c
diff --git a/nx-X11/lib/X11/imThaiIm.c b/nx-X11/lib/modules/im/ximcp/imThaiIm.c
index c17723aca..c17723aca 100644
--- a/nx-X11/lib/X11/imThaiIm.c
+++ b/nx-X11/lib/modules/im/ximcp/imThaiIm.c
diff --git a/nx-X11/lib/X11/imTrX.c b/nx-X11/lib/modules/im/ximcp/imTrX.c
index 148b7fc90..148b7fc90 100644
--- a/nx-X11/lib/X11/imTrX.c
+++ b/nx-X11/lib/modules/im/ximcp/imTrX.c
diff --git a/nx-X11/lib/X11/imTrans.c b/nx-X11/lib/modules/im/ximcp/imTrans.c
index 7f936cff6..7f936cff6 100644
--- a/nx-X11/lib/X11/imTrans.c
+++ b/nx-X11/lib/modules/im/ximcp/imTrans.c
diff --git a/nx-X11/lib/X11/imTransR.c b/nx-X11/lib/modules/im/ximcp/imTransR.c
index 50b549e71..50b549e71 100644
--- a/nx-X11/lib/X11/imTransR.c
+++ b/nx-X11/lib/modules/im/ximcp/imTransR.c
diff --git a/nx-X11/lib/modules/lc/Makefile.am b/nx-X11/lib/modules/lc/Makefile.am
new file mode 100644
index 000000000..fe1ad2055
--- /dev/null
+++ b/nx-X11/lib/modules/lc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = Utf8 def gen
diff --git a/nx-X11/lib/modules/lc/Utf8/Makefile.am b/nx-X11/lib/modules/lc/Utf8/Makefile.am
new file mode 100644
index 000000000..7eb0fe258
--- /dev/null
+++ b/nx-X11/lib/modules/lc/Utf8/Makefile.am
@@ -0,0 +1,28 @@
+NULL =
+
+noinst_LTLIBRARIES = libxlcUTF8Load.la
+
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/include/X11		\
+	-I$(top_builddir)/include		\
+	-I$(top_builddir)/include/X11 		\
+	-I$(top_srcdir)/src/xcms 		\
+	-I$(top_srcdir)/src/xkb			\
+	-I$(top_srcdir)/src/xlibi18n		\
+	-I$(top_srcdir)/../exports/include	\
+	-D_GNU_SOURCE				\
+	$(NULL)
+
+AM_CFLAGS =					\
+	$(X11_CFLAGS)				\
+	$(BIGFONT_CFLAGS)			\
+	$(MALLOC_ZERO_CFLAGS)			\
+	$(CWARNFLAGS)				\
+	$(NULL)
+
+xlcUTF8Load_la_SOURCES =			\
+	lcUTF8Load.c				\
+	$(NULL)
+
+libxlcUTF8Load_la_SOURCES = $(xlcUTF8Load_la_SOURCES)
diff --git a/nx-X11/lib/X11/lcUTF8Load.c b/nx-X11/lib/modules/lc/Utf8/lcUTF8Load.c
index 82ea3b54d..82ea3b54d 100644
--- a/nx-X11/lib/X11/lcUTF8Load.c
+++ b/nx-X11/lib/modules/lc/Utf8/lcUTF8Load.c
diff --git a/nx-X11/lib/modules/lc/def/Makefile.am b/nx-X11/lib/modules/lc/def/Makefile.am
new file mode 100644
index 000000000..7d5766367
--- /dev/null
+++ b/nx-X11/lib/modules/lc/def/Makefile.am
@@ -0,0 +1,27 @@
+NULL =
+
+noinst_LTLIBRARIES = libxlcDef.la
+
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/include/X11		\
+	-I$(top_builddir)/include		\
+	-I$(top_builddir)/include/X11		\
+	-I$(top_srcdir)/src/xcms		\
+	-I$(top_srcdir)/src/xkb			\
+	-I$(top_srcdir)/src/xlibi18n		\
+	-I$(top_srcdir)/../exports/include	\
+	-D_GNU_SOURCE				\
+	$(NULL)
+
+AM_CFLAGS =					\
+	$(X11_CFLAGS)				\
+	$(BIGFONT_CFLAGS)			\
+	$(CWARNFLAG)				\
+	$(NULL)
+
+xlcDef_la_SOURCES =				\
+	lcDefConv.c				\
+	$(NULL)
+
+libxlcDef_la_SOURCES = $(xlcDef_la_SOURCES)
diff --git a/nx-X11/lib/X11/lcDefConv.c b/nx-X11/lib/modules/lc/def/lcDefConv.c
index 2096d871b..2096d871b 100644
--- a/nx-X11/lib/X11/lcDefConv.c
+++ b/nx-X11/lib/modules/lc/def/lcDefConv.c
diff --git a/nx-X11/lib/modules/lc/gen/Makefile.am b/nx-X11/lib/modules/lc/gen/Makefile.am
new file mode 100644
index 000000000..6106cfd4b
--- /dev/null
+++ b/nx-X11/lib/modules/lc/gen/Makefile.am
@@ -0,0 +1,27 @@
+NULL =
+
+noinst_LTLIBRARIES = libxlibi18n.la
+
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/include/X11		\
+	-I$(top_builddir)/include		\
+	-I$(top_builddir)/include/X11		\
+	-I$(top_srcdir)/src/xcms		\
+	-I$(top_srcdir)/src/xkb			\
+	-I$(top_srcdir)/src/xlibi18n		\
+	-I$(top_srcdir)/../exports/include	\
+	-D_GNU_SOURCE				\
+	$(NULL)
+
+AM_CFLAGS =					\
+	$(X11_CFLAGS)				\
+	$(BIGFONT_CFLAGS)			\
+	$(CWARNFLAGS)				\
+	$(NULL)
+
+xlibi18n_la_SOURCES =				\
+	lcGenConv.c				\
+	$(NULL)
+
+libxlibi18n_la_SOURCES = $(xlibi18n_la_SOURCES)
diff --git a/nx-X11/lib/X11/lcGenConv.c b/nx-X11/lib/modules/lc/gen/lcGenConv.c
index 799f49a30..799f49a30 100644
--- a/nx-X11/lib/X11/lcGenConv.c
+++ b/nx-X11/lib/modules/lc/gen/lcGenConv.c
diff --git a/nx-X11/lib/modules/om/Makefile.am b/nx-X11/lib/modules/om/Makefile.am
new file mode 100644
index 000000000..b564eeefd
--- /dev/null
+++ b/nx-X11/lib/modules/om/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = generic
diff --git a/nx-X11/lib/modules/om/generic/Makefile.am b/nx-X11/lib/modules/om/generic/Makefile.am
new file mode 100644
index 000000000..5e4bbc2ec
--- /dev/null
+++ b/nx-X11/lib/modules/om/generic/Makefile.am
@@ -0,0 +1,36 @@
+NULL =
+
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/include/X11		\
+	-I$(top_builddir)/include		\
+	-I$(top_builddir)/include/X11		\
+	-I$(top_srcdir)/src/xcms		\
+	-I$(top_srcdir)/src/xkb			\
+	-I$(top_srcdir)/src/xlibi18n		\
+	-I$(top_srcdir)/src			\
+	-I$(top_srcdir)/../exports/include	\
+	-D_GNU_SOURCE				\
+	$(NULL)
+
+AM_CFLAGS =					\
+	$(X11_CFLAGS)				\
+	$(BIGFONT_CFLAGS)			\
+	$(MALLOC_ZERO_CFLAGS)			\
+	$(CWARNFLAGS)				\
+	$(NULL)
+
+noinst_LTLIBRARIES = libxomGeneric.la
+
+xomGeneric_la_SOURCES =				\
+	omDefault.c				\
+	omGeneric.c				\
+	omImText.c				\
+	omText.c				\
+	omTextEsc.c				\
+	omTextExt.c				\
+	omTextPer.c				\
+	omXChar.c				\
+	$(NULL)
+
+libxomGeneric_la_SOURCES = $(xomGeneric_la_SOURCES)
diff --git a/nx-X11/lib/X11/omDefault.c b/nx-X11/lib/modules/om/generic/omDefault.c
index 134ef461a..134ef461a 100644
--- a/nx-X11/lib/X11/omDefault.c
+++ b/nx-X11/lib/modules/om/generic/omDefault.c
diff --git a/nx-X11/lib/X11/omGeneric.c b/nx-X11/lib/modules/om/generic/omGeneric.c
index 68eec01c0..68eec01c0 100644
--- a/nx-X11/lib/X11/omGeneric.c
+++ b/nx-X11/lib/modules/om/generic/omGeneric.c
diff --git a/nx-X11/lib/X11/omImText.c b/nx-X11/lib/modules/om/generic/omImText.c
index 9cfb5497d..9cfb5497d 100644
--- a/nx-X11/lib/X11/omImText.c
+++ b/nx-X11/lib/modules/om/generic/omImText.c
diff --git a/nx-X11/lib/X11/omText.c b/nx-X11/lib/modules/om/generic/omText.c
index bfceca96e..bfceca96e 100644
--- a/nx-X11/lib/X11/omText.c
+++ b/nx-X11/lib/modules/om/generic/omText.c
diff --git a/nx-X11/lib/X11/omTextEsc.c b/nx-X11/lib/modules/om/generic/omTextEsc.c
index df1fb10c0..df1fb10c0 100644
--- a/nx-X11/lib/X11/omTextEsc.c
+++ b/nx-X11/lib/modules/om/generic/omTextEsc.c
diff --git a/nx-X11/lib/X11/omTextExt.c b/nx-X11/lib/modules/om/generic/omTextExt.c
index baeadf6b0..baeadf6b0 100644
--- a/nx-X11/lib/X11/omTextExt.c
+++ b/nx-X11/lib/modules/om/generic/omTextExt.c
diff --git a/nx-X11/lib/X11/omTextPer.c b/nx-X11/lib/modules/om/generic/omTextPer.c
index ae08fe6a4..ae08fe6a4 100644
--- a/nx-X11/lib/X11/omTextPer.c
+++ b/nx-X11/lib/modules/om/generic/omTextPer.c
diff --git a/nx-X11/lib/X11/omXChar.c b/nx-X11/lib/modules/om/generic/omXChar.c
index c9bbb8e88..c9bbb8e88 100644
--- a/nx-X11/lib/X11/omXChar.c
+++ b/nx-X11/lib/modules/om/generic/omXChar.c
diff --git a/nx-X11/lib/nx-x11.pc.in b/nx-X11/lib/nx-x11.pc.in
new file mode 100644
index 000000000..a827429b7
--- /dev/null
+++ b/nx-X11/lib/nx-x11.pc.in
@@ -0,0 +1,18 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+xthreadlib=@XTHREADLIB@
+
+Name: NX_X11
+Description: NX_X11 Library
+Version: @PACKAGE_VERSION@
+# FIXME: we currently build from one source tree... Get back to this
+# whenever we take the nx-libs source code apart and split up the
+# components
+#Requires: nx-xproto @XKBPROTO_REQUIRES@
+#Requires.private: @X11_EXTRA_DEPS@
+Cflags: -I${includedir} @XTHREAD_CFLAGS@
+Libs: -L${libdir} -lNX_X11
+Libs.private: @XTHREADLIB@
diff --git a/nx-X11/lib/X11/.gitignore b/nx-X11/lib/src/.gitignore
index 8215e21de..8215e21de 100644
--- a/nx-X11/lib/X11/.gitignore
+++ b/nx-X11/lib/src/.gitignore
diff --git a/nx-X11/lib/X11/AllCells.c b/nx-X11/lib/src/AllCells.c
index 6e97e1181..6e97e1181 100644
--- a/nx-X11/lib/X11/AllCells.c
+++ b/nx-X11/lib/src/AllCells.c
diff --git a/nx-X11/lib/X11/AllPlanes.c b/nx-X11/lib/src/AllPlanes.c
index b2e245387..b2e245387 100644
--- a/nx-X11/lib/X11/AllPlanes.c
+++ b/nx-X11/lib/src/AllPlanes.c
diff --git a/nx-X11/lib/X11/AllowEv.c b/nx-X11/lib/src/AllowEv.c
index 4a17e7b2d..4a17e7b2d 100644
--- a/nx-X11/lib/X11/AllowEv.c
+++ b/nx-X11/lib/src/AllowEv.c
diff --git a/nx-X11/lib/X11/AuDispose.c b/nx-X11/lib/src/AuDispose.c
index bb890201d..bb890201d 100644
--- a/nx-X11/lib/X11/AuDispose.c
+++ b/nx-X11/lib/src/AuDispose.c
diff --git a/nx-X11/lib/X11/AuFileName.c b/nx-X11/lib/src/AuFileName.c
index 6c4fb7dc3..6c4fb7dc3 100644
--- a/nx-X11/lib/X11/AuFileName.c
+++ b/nx-X11/lib/src/AuFileName.c
diff --git a/nx-X11/lib/X11/AuGetBest.c b/nx-X11/lib/src/AuGetBest.c
index 2518805cc..2518805cc 100644
--- a/nx-X11/lib/X11/AuGetBest.c
+++ b/nx-X11/lib/src/AuGetBest.c
diff --git a/nx-X11/lib/X11/AuRead.c b/nx-X11/lib/src/AuRead.c
index 61814792d..61814792d 100644
--- a/nx-X11/lib/X11/AuRead.c
+++ b/nx-X11/lib/src/AuRead.c
diff --git a/nx-X11/lib/X11/AutoRep.c b/nx-X11/lib/src/AutoRep.c
index 66b4097a8..66b4097a8 100644
--- a/nx-X11/lib/X11/AutoRep.c
+++ b/nx-X11/lib/src/AutoRep.c
diff --git a/nx-X11/lib/X11/Backgnd.c b/nx-X11/lib/src/Backgnd.c
index bf7d75f8f..bf7d75f8f 100644
--- a/nx-X11/lib/X11/Backgnd.c
+++ b/nx-X11/lib/src/Backgnd.c
diff --git a/nx-X11/lib/X11/BdrWidth.c b/nx-X11/lib/src/BdrWidth.c
index 5da8ce772..5da8ce772 100644
--- a/nx-X11/lib/X11/BdrWidth.c
+++ b/nx-X11/lib/src/BdrWidth.c
diff --git a/nx-X11/lib/X11/Bell.c b/nx-X11/lib/src/Bell.c
index 7da8772cf..7da8772cf 100644
--- a/nx-X11/lib/X11/Bell.c
+++ b/nx-X11/lib/src/Bell.c
diff --git a/nx-X11/lib/X11/Border.c b/nx-X11/lib/src/Border.c
index 133043a5b..133043a5b 100644
--- a/nx-X11/lib/X11/Border.c
+++ b/nx-X11/lib/src/Border.c
diff --git a/nx-X11/lib/X11/ChAccCon.c b/nx-X11/lib/src/ChAccCon.c
index f8d099668..f8d099668 100644
--- a/nx-X11/lib/X11/ChAccCon.c
+++ b/nx-X11/lib/src/ChAccCon.c
diff --git a/nx-X11/lib/X11/ChActPGb.c b/nx-X11/lib/src/ChActPGb.c
index bebef2b01..bebef2b01 100644
--- a/nx-X11/lib/X11/ChActPGb.c
+++ b/nx-X11/lib/src/ChActPGb.c
diff --git a/nx-X11/lib/X11/ChClMode.c b/nx-X11/lib/src/ChClMode.c
index 5250a80bc..5250a80bc 100644
--- a/nx-X11/lib/X11/ChClMode.c
+++ b/nx-X11/lib/src/ChClMode.c
diff --git a/nx-X11/lib/X11/ChCmap.c b/nx-X11/lib/src/ChCmap.c
index d9372cdf3..d9372cdf3 100644
--- a/nx-X11/lib/X11/ChCmap.c
+++ b/nx-X11/lib/src/ChCmap.c
diff --git a/nx-X11/lib/X11/ChGC.c b/nx-X11/lib/src/ChGC.c
index 8f677dc3a..8f677dc3a 100644
--- a/nx-X11/lib/X11/ChGC.c
+++ b/nx-X11/lib/src/ChGC.c
diff --git a/nx-X11/lib/X11/ChKeyCon.c b/nx-X11/lib/src/ChKeyCon.c
index bcf522340..bcf522340 100644
--- a/nx-X11/lib/X11/ChKeyCon.c
+++ b/nx-X11/lib/src/ChKeyCon.c
diff --git a/nx-X11/lib/X11/ChPntCon.c b/nx-X11/lib/src/ChPntCon.c
index c177c0045..c177c0045 100644
--- a/nx-X11/lib/X11/ChPntCon.c
+++ b/nx-X11/lib/src/ChPntCon.c
diff --git a/nx-X11/lib/X11/ChProp.c b/nx-X11/lib/src/ChProp.c
index 190a224f8..190a224f8 100644
--- a/nx-X11/lib/X11/ChProp.c
+++ b/nx-X11/lib/src/ChProp.c
diff --git a/nx-X11/lib/X11/ChSaveSet.c b/nx-X11/lib/src/ChSaveSet.c
index 068b042d2..068b042d2 100644
--- a/nx-X11/lib/X11/ChSaveSet.c
+++ b/nx-X11/lib/src/ChSaveSet.c
diff --git a/nx-X11/lib/X11/ChWAttrs.c b/nx-X11/lib/src/ChWAttrs.c
index 25cbcbd05..25cbcbd05 100644
--- a/nx-X11/lib/X11/ChWAttrs.c
+++ b/nx-X11/lib/src/ChWAttrs.c
diff --git a/nx-X11/lib/X11/ChWindow.c b/nx-X11/lib/src/ChWindow.c
index 89a81e12a..89a81e12a 100644
--- a/nx-X11/lib/X11/ChWindow.c
+++ b/nx-X11/lib/src/ChWindow.c
diff --git a/nx-X11/lib/X11/ChkIfEv.c b/nx-X11/lib/src/ChkIfEv.c
index 313e4395c..313e4395c 100644
--- a/nx-X11/lib/X11/ChkIfEv.c
+++ b/nx-X11/lib/src/ChkIfEv.c
diff --git a/nx-X11/lib/X11/ChkMaskEv.c b/nx-X11/lib/src/ChkMaskEv.c
index 78928e079..78928e079 100644
--- a/nx-X11/lib/X11/ChkMaskEv.c
+++ b/nx-X11/lib/src/ChkMaskEv.c
diff --git a/nx-X11/lib/X11/ChkTypEv.c b/nx-X11/lib/src/ChkTypEv.c
index 2e9bcdd0a..2e9bcdd0a 100644
--- a/nx-X11/lib/X11/ChkTypEv.c
+++ b/nx-X11/lib/src/ChkTypEv.c
diff --git a/nx-X11/lib/X11/ChkTypWEv.c b/nx-X11/lib/src/ChkTypWEv.c
index 2f247be26..2f247be26 100644
--- a/nx-X11/lib/X11/ChkTypWEv.c
+++ b/nx-X11/lib/src/ChkTypWEv.c
diff --git a/nx-X11/lib/X11/ChkWinEv.c b/nx-X11/lib/src/ChkWinEv.c
index 9fb7db06a..9fb7db06a 100644
--- a/nx-X11/lib/X11/ChkWinEv.c
+++ b/nx-X11/lib/src/ChkWinEv.c
diff --git a/nx-X11/lib/X11/CirWin.c b/nx-X11/lib/src/CirWin.c
index e37a42ade..e37a42ade 100644
--- a/nx-X11/lib/X11/CirWin.c
+++ b/nx-X11/lib/src/CirWin.c
diff --git a/nx-X11/lib/X11/CirWinDn.c b/nx-X11/lib/src/CirWinDn.c
index f2b54852b..f2b54852b 100644
--- a/nx-X11/lib/X11/CirWinDn.c
+++ b/nx-X11/lib/src/CirWinDn.c
diff --git a/nx-X11/lib/X11/CirWinUp.c b/nx-X11/lib/src/CirWinUp.c
index be9f094cd..be9f094cd 100644
--- a/nx-X11/lib/X11/CirWinUp.c
+++ b/nx-X11/lib/src/CirWinUp.c
diff --git a/nx-X11/lib/X11/ClDisplay.c b/nx-X11/lib/src/ClDisplay.c
index 898fc9144..898fc9144 100644
--- a/nx-X11/lib/X11/ClDisplay.c
+++ b/nx-X11/lib/src/ClDisplay.c
diff --git a/nx-X11/lib/X11/Clear.c b/nx-X11/lib/src/Clear.c
index 63dc64045..63dc64045 100644
--- a/nx-X11/lib/X11/Clear.c
+++ b/nx-X11/lib/src/Clear.c
diff --git a/nx-X11/lib/X11/ClearArea.c b/nx-X11/lib/src/ClearArea.c
index 41fd17c80..41fd17c80 100644
--- a/nx-X11/lib/X11/ClearArea.c
+++ b/nx-X11/lib/src/ClearArea.c
diff --git a/nx-X11/lib/X11/Cmap.h b/nx-X11/lib/src/Cmap.h
index db2de5697..db2de5697 100644
--- a/nx-X11/lib/X11/Cmap.h
+++ b/nx-X11/lib/src/Cmap.h
diff --git a/nx-X11/lib/X11/ConfWind.c b/nx-X11/lib/src/ConfWind.c
index eefce4dd5..eefce4dd5 100644
--- a/nx-X11/lib/X11/ConfWind.c
+++ b/nx-X11/lib/src/ConfWind.c
diff --git a/nx-X11/lib/X11/ConnDis.c b/nx-X11/lib/src/ConnDis.c
index dfc0227fe..dfc0227fe 100644
--- a/nx-X11/lib/X11/ConnDis.c
+++ b/nx-X11/lib/src/ConnDis.c
diff --git a/nx-X11/lib/X11/Context.c b/nx-X11/lib/src/Context.c
index 8a078713a..8a078713a 100644
--- a/nx-X11/lib/X11/Context.c
+++ b/nx-X11/lib/src/Context.c
diff --git a/nx-X11/lib/X11/ConvSel.c b/nx-X11/lib/src/ConvSel.c
index fb6e8e338..fb6e8e338 100644
--- a/nx-X11/lib/X11/ConvSel.c
+++ b/nx-X11/lib/src/ConvSel.c
diff --git a/nx-X11/lib/X11/CopyArea.c b/nx-X11/lib/src/CopyArea.c
index 582582120..582582120 100644
--- a/nx-X11/lib/X11/CopyArea.c
+++ b/nx-X11/lib/src/CopyArea.c
diff --git a/nx-X11/lib/X11/CopyCmap.c b/nx-X11/lib/src/CopyCmap.c
index 5444550cd..5444550cd 100644
--- a/nx-X11/lib/X11/CopyCmap.c
+++ b/nx-X11/lib/src/CopyCmap.c
diff --git a/nx-X11/lib/X11/CopyGC.c b/nx-X11/lib/src/CopyGC.c
index 9c71249cf..9c71249cf 100644
--- a/nx-X11/lib/X11/CopyGC.c
+++ b/nx-X11/lib/src/CopyGC.c
diff --git a/nx-X11/lib/X11/CopyPlane.c b/nx-X11/lib/src/CopyPlane.c
index 818687687..818687687 100644
--- a/nx-X11/lib/X11/CopyPlane.c
+++ b/nx-X11/lib/src/CopyPlane.c
diff --git a/nx-X11/lib/X11/Cr.h b/nx-X11/lib/src/Cr.h
index e71d86d1c..e71d86d1c 100644
--- a/nx-X11/lib/X11/Cr.h
+++ b/nx-X11/lib/src/Cr.h
diff --git a/nx-X11/lib/X11/CrBFData.c b/nx-X11/lib/src/CrBFData.c
index 6708a9b91..6708a9b91 100644
--- a/nx-X11/lib/X11/CrBFData.c
+++ b/nx-X11/lib/src/CrBFData.c
diff --git a/nx-X11/lib/X11/CrCmap.c b/nx-X11/lib/src/CrCmap.c
index 9904c7dda..9904c7dda 100644
--- a/nx-X11/lib/X11/CrCmap.c
+++ b/nx-X11/lib/src/CrCmap.c
diff --git a/nx-X11/lib/X11/CrCursor.c b/nx-X11/lib/src/CrCursor.c
index c8c174e5f..c8c174e5f 100644
--- a/nx-X11/lib/X11/CrCursor.c
+++ b/nx-X11/lib/src/CrCursor.c
diff --git a/nx-X11/lib/X11/CrGC.c b/nx-X11/lib/src/CrGC.c
index 2d5f17c00..2d5f17c00 100644
--- a/nx-X11/lib/X11/CrGC.c
+++ b/nx-X11/lib/src/CrGC.c
diff --git a/nx-X11/lib/X11/CrGlCur.c b/nx-X11/lib/src/CrGlCur.c
index 88133b7f4..88133b7f4 100644
--- a/nx-X11/lib/X11/CrGlCur.c
+++ b/nx-X11/lib/src/CrGlCur.c
diff --git a/nx-X11/lib/X11/CrPFBData.c b/nx-X11/lib/src/CrPFBData.c
index 17d551bb7..17d551bb7 100644
--- a/nx-X11/lib/X11/CrPFBData.c
+++ b/nx-X11/lib/src/CrPFBData.c
diff --git a/nx-X11/lib/X11/CrPixmap.c b/nx-X11/lib/src/CrPixmap.c
index cdf312076..cdf312076 100644
--- a/nx-X11/lib/X11/CrPixmap.c
+++ b/nx-X11/lib/src/CrPixmap.c
diff --git a/nx-X11/lib/X11/CrWindow.c b/nx-X11/lib/src/CrWindow.c
index 7b5460186..7b5460186 100644
--- a/nx-X11/lib/X11/CrWindow.c
+++ b/nx-X11/lib/src/CrWindow.c
diff --git a/nx-X11/lib/X11/Cursor.c b/nx-X11/lib/src/Cursor.c
index 80b91c36d..80b91c36d 100644
--- a/nx-X11/lib/X11/Cursor.c
+++ b/nx-X11/lib/src/Cursor.c
diff --git a/nx-X11/lib/X11/DefCursor.c b/nx-X11/lib/src/DefCursor.c
index e3cee0649..e3cee0649 100644
--- a/nx-X11/lib/X11/DefCursor.c
+++ b/nx-X11/lib/src/DefCursor.c
diff --git a/nx-X11/lib/X11/DelProp.c b/nx-X11/lib/src/DelProp.c
index da486b8ef..da486b8ef 100644
--- a/nx-X11/lib/X11/DelProp.c
+++ b/nx-X11/lib/src/DelProp.c
diff --git a/nx-X11/lib/X11/Depths.c b/nx-X11/lib/src/Depths.c
index a8b719d00..a8b719d00 100644
--- a/nx-X11/lib/X11/Depths.c
+++ b/nx-X11/lib/src/Depths.c
diff --git a/nx-X11/lib/X11/DestSubs.c b/nx-X11/lib/src/DestSubs.c
index 7c6c428be..7c6c428be 100644
--- a/nx-X11/lib/X11/DestSubs.c
+++ b/nx-X11/lib/src/DestSubs.c
diff --git a/nx-X11/lib/X11/DestWind.c b/nx-X11/lib/src/DestWind.c
index c1aec893a..c1aec893a 100644
--- a/nx-X11/lib/X11/DestWind.c
+++ b/nx-X11/lib/src/DestWind.c
diff --git a/nx-X11/lib/X11/DisName.c b/nx-X11/lib/src/DisName.c
index 87a1e2f0e..87a1e2f0e 100644
--- a/nx-X11/lib/X11/DisName.c
+++ b/nx-X11/lib/src/DisName.c
diff --git a/nx-X11/lib/X11/DrArc.c b/nx-X11/lib/src/DrArc.c
index d72fac9d7..d72fac9d7 100644
--- a/nx-X11/lib/X11/DrArc.c
+++ b/nx-X11/lib/src/DrArc.c
diff --git a/nx-X11/lib/X11/DrArcs.c b/nx-X11/lib/src/DrArcs.c
index 14405aa3d..14405aa3d 100644
--- a/nx-X11/lib/X11/DrArcs.c
+++ b/nx-X11/lib/src/DrArcs.c
diff --git a/nx-X11/lib/X11/DrLine.c b/nx-X11/lib/src/DrLine.c
index dc82d5a15..dc82d5a15 100644
--- a/nx-X11/lib/X11/DrLine.c
+++ b/nx-X11/lib/src/DrLine.c
diff --git a/nx-X11/lib/X11/DrLines.c b/nx-X11/lib/src/DrLines.c
index 68071b6b4..68071b6b4 100644
--- a/nx-X11/lib/X11/DrLines.c
+++ b/nx-X11/lib/src/DrLines.c
diff --git a/nx-X11/lib/X11/DrPoint.c b/nx-X11/lib/src/DrPoint.c
index f0332e853..f0332e853 100644
--- a/nx-X11/lib/X11/DrPoint.c
+++ b/nx-X11/lib/src/DrPoint.c
diff --git a/nx-X11/lib/X11/DrPoints.c b/nx-X11/lib/src/DrPoints.c
index 287fa057d..287fa057d 100644
--- a/nx-X11/lib/X11/DrPoints.c
+++ b/nx-X11/lib/src/DrPoints.c
diff --git a/nx-X11/lib/X11/DrRect.c b/nx-X11/lib/src/DrRect.c
index d9141eef9..d9141eef9 100644
--- a/nx-X11/lib/X11/DrRect.c
+++ b/nx-X11/lib/src/DrRect.c
diff --git a/nx-X11/lib/X11/DrRects.c b/nx-X11/lib/src/DrRects.c
index 7827bf18d..7827bf18d 100644
--- a/nx-X11/lib/X11/DrRects.c
+++ b/nx-X11/lib/src/DrRects.c
diff --git a/nx-X11/lib/X11/DrSegs.c b/nx-X11/lib/src/DrSegs.c
index 93eab4d08..93eab4d08 100644
--- a/nx-X11/lib/X11/DrSegs.c
+++ b/nx-X11/lib/src/DrSegs.c
diff --git a/nx-X11/lib/X11/ErrDes.c b/nx-X11/lib/src/ErrDes.c
index f13e3dce4..f13e3dce4 100644
--- a/nx-X11/lib/X11/ErrDes.c
+++ b/nx-X11/lib/src/ErrDes.c
diff --git a/nx-X11/lib/X11/ErrHndlr.c b/nx-X11/lib/src/ErrHndlr.c
index 167a68b1e..167a68b1e 100644
--- a/nx-X11/lib/X11/ErrHndlr.c
+++ b/nx-X11/lib/src/ErrHndlr.c
diff --git a/nx-X11/lib/X11/EvToWire.c b/nx-X11/lib/src/EvToWire.c
index 4aca053ab..4aca053ab 100644
--- a/nx-X11/lib/X11/EvToWire.c
+++ b/nx-X11/lib/src/EvToWire.c
diff --git a/nx-X11/lib/X11/FSSaver.c b/nx-X11/lib/src/FSSaver.c
index 3df8ae681..3df8ae681 100644
--- a/nx-X11/lib/X11/FSSaver.c
+++ b/nx-X11/lib/src/FSSaver.c
diff --git a/nx-X11/lib/X11/FSWrap.c b/nx-X11/lib/src/FSWrap.c
index 015965779..015965779 100644
--- a/nx-X11/lib/X11/FSWrap.c
+++ b/nx-X11/lib/src/FSWrap.c
diff --git a/nx-X11/lib/X11/FetchName.c b/nx-X11/lib/src/FetchName.c
index 52c65c52c..52c65c52c 100644
--- a/nx-X11/lib/X11/FetchName.c
+++ b/nx-X11/lib/src/FetchName.c
diff --git a/nx-X11/lib/X11/FillArc.c b/nx-X11/lib/src/FillArc.c
index c67f977b7..c67f977b7 100644
--- a/nx-X11/lib/X11/FillArc.c
+++ b/nx-X11/lib/src/FillArc.c
diff --git a/nx-X11/lib/X11/FillArcs.c b/nx-X11/lib/src/FillArcs.c
index 62cfabf8f..62cfabf8f 100644
--- a/nx-X11/lib/X11/FillArcs.c
+++ b/nx-X11/lib/src/FillArcs.c
diff --git a/nx-X11/lib/X11/FillPoly.c b/nx-X11/lib/src/FillPoly.c
index ea162a41e..ea162a41e 100644
--- a/nx-X11/lib/X11/FillPoly.c
+++ b/nx-X11/lib/src/FillPoly.c
diff --git a/nx-X11/lib/X11/FillRct.c b/nx-X11/lib/src/FillRct.c
index 3ca9afe9e..3ca9afe9e 100644
--- a/nx-X11/lib/X11/FillRct.c
+++ b/nx-X11/lib/src/FillRct.c
diff --git a/nx-X11/lib/X11/FillRcts.c b/nx-X11/lib/src/FillRcts.c
index ad334244f..ad334244f 100644
--- a/nx-X11/lib/X11/FillRcts.c
+++ b/nx-X11/lib/src/FillRcts.c
diff --git a/nx-X11/lib/X11/FilterEv.c b/nx-X11/lib/src/FilterEv.c
index 0a48e5486..0a48e5486 100644
--- a/nx-X11/lib/X11/FilterEv.c
+++ b/nx-X11/lib/src/FilterEv.c
diff --git a/nx-X11/lib/X11/Flush.c b/nx-X11/lib/src/Flush.c
index 46168999b..46168999b 100644
--- a/nx-X11/lib/X11/Flush.c
+++ b/nx-X11/lib/src/Flush.c
diff --git a/nx-X11/lib/X11/Font.c b/nx-X11/lib/src/Font.c
index 6bbab3f19..6bbab3f19 100644
--- a/nx-X11/lib/X11/Font.c
+++ b/nx-X11/lib/src/Font.c
diff --git a/nx-X11/lib/X11/FontInfo.c b/nx-X11/lib/src/FontInfo.c
index a2d12c2ec..a2d12c2ec 100644
--- a/nx-X11/lib/X11/FontInfo.c
+++ b/nx-X11/lib/src/FontInfo.c
diff --git a/nx-X11/lib/X11/FontNames.c b/nx-X11/lib/src/FontNames.c
index 9ffdfd299..9ffdfd299 100644
--- a/nx-X11/lib/X11/FontNames.c
+++ b/nx-X11/lib/src/FontNames.c
diff --git a/nx-X11/lib/X11/FreeCmap.c b/nx-X11/lib/src/FreeCmap.c
index e2b76fa6f..e2b76fa6f 100644
--- a/nx-X11/lib/X11/FreeCmap.c
+++ b/nx-X11/lib/src/FreeCmap.c
diff --git a/nx-X11/lib/X11/FreeCols.c b/nx-X11/lib/src/FreeCols.c
index a8b7f8867..a8b7f8867 100644
--- a/nx-X11/lib/X11/FreeCols.c
+++ b/nx-X11/lib/src/FreeCols.c
diff --git a/nx-X11/lib/X11/FreeCurs.c b/nx-X11/lib/src/FreeCurs.c
index 89fb577cc..89fb577cc 100644
--- a/nx-X11/lib/X11/FreeCurs.c
+++ b/nx-X11/lib/src/FreeCurs.c
diff --git a/nx-X11/lib/X11/FreeEData.c b/nx-X11/lib/src/FreeEData.c
index ce78467d3..ce78467d3 100644
--- a/nx-X11/lib/X11/FreeEData.c
+++ b/nx-X11/lib/src/FreeEData.c
diff --git a/nx-X11/lib/X11/FreeEventData.c b/nx-X11/lib/src/FreeEventData.c
index e2d40b0db..e2d40b0db 100644
--- a/nx-X11/lib/X11/FreeEventData.c
+++ b/nx-X11/lib/src/FreeEventData.c
diff --git a/nx-X11/lib/X11/FreeGC.c b/nx-X11/lib/src/FreeGC.c
index 926d50745..926d50745 100644
--- a/nx-X11/lib/X11/FreeGC.c
+++ b/nx-X11/lib/src/FreeGC.c
diff --git a/nx-X11/lib/X11/FreePix.c b/nx-X11/lib/src/FreePix.c
index 21367978e..21367978e 100644
--- a/nx-X11/lib/X11/FreePix.c
+++ b/nx-X11/lib/src/FreePix.c
diff --git a/nx-X11/lib/X11/GCMisc.c b/nx-X11/lib/src/GCMisc.c
index 751e27dca..751e27dca 100644
--- a/nx-X11/lib/X11/GCMisc.c
+++ b/nx-X11/lib/src/GCMisc.c
diff --git a/nx-X11/lib/X11/Geom.c b/nx-X11/lib/src/Geom.c
index 1da74f1c3..1da74f1c3 100644
--- a/nx-X11/lib/X11/Geom.c
+++ b/nx-X11/lib/src/Geom.c
diff --git a/nx-X11/lib/X11/GetAtomNm.c b/nx-X11/lib/src/GetAtomNm.c
index 32de50d23..32de50d23 100644
--- a/nx-X11/lib/X11/GetAtomNm.c
+++ b/nx-X11/lib/src/GetAtomNm.c
diff --git a/nx-X11/lib/X11/GetColor.c b/nx-X11/lib/src/GetColor.c
index cd0eb9f63..cd0eb9f63 100644
--- a/nx-X11/lib/X11/GetColor.c
+++ b/nx-X11/lib/src/GetColor.c
diff --git a/nx-X11/lib/X11/GetDflt.c b/nx-X11/lib/src/GetDflt.c
index c2cc1da47..c2cc1da47 100644
--- a/nx-X11/lib/X11/GetDflt.c
+++ b/nx-X11/lib/src/GetDflt.c
diff --git a/nx-X11/lib/X11/GetEventData.c b/nx-X11/lib/src/GetEventData.c
index b93dee6cd..b93dee6cd 100644
--- a/nx-X11/lib/X11/GetEventData.c
+++ b/nx-X11/lib/src/GetEventData.c
diff --git a/nx-X11/lib/X11/GetFPath.c b/nx-X11/lib/src/GetFPath.c
index 3d87e4f64..3d87e4f64 100644
--- a/nx-X11/lib/X11/GetFPath.c
+++ b/nx-X11/lib/src/GetFPath.c
diff --git a/nx-X11/lib/X11/GetFProp.c b/nx-X11/lib/src/GetFProp.c
index 1e0cd3285..1e0cd3285 100644
--- a/nx-X11/lib/X11/GetFProp.c
+++ b/nx-X11/lib/src/GetFProp.c
diff --git a/nx-X11/lib/X11/GetGCVals.c b/nx-X11/lib/src/GetGCVals.c
index 4861739a6..4861739a6 100644
--- a/nx-X11/lib/X11/GetGCVals.c
+++ b/nx-X11/lib/src/GetGCVals.c
diff --git a/nx-X11/lib/X11/GetGeom.c b/nx-X11/lib/src/GetGeom.c
index 1e1249d81..1e1249d81 100644
--- a/nx-X11/lib/X11/GetGeom.c
+++ b/nx-X11/lib/src/GetGeom.c
diff --git a/nx-X11/lib/X11/GetHColor.c b/nx-X11/lib/src/GetHColor.c
index 081a2248d..081a2248d 100644
--- a/nx-X11/lib/X11/GetHColor.c
+++ b/nx-X11/lib/src/GetHColor.c
diff --git a/nx-X11/lib/X11/GetHints.c b/nx-X11/lib/src/GetHints.c
index 7bfd35358..7bfd35358 100644
--- a/nx-X11/lib/X11/GetHints.c
+++ b/nx-X11/lib/src/GetHints.c
diff --git a/nx-X11/lib/X11/GetIFocus.c b/nx-X11/lib/src/GetIFocus.c
index 0a7f36e8d..0a7f36e8d 100644
--- a/nx-X11/lib/X11/GetIFocus.c
+++ b/nx-X11/lib/src/GetIFocus.c
diff --git a/nx-X11/lib/X11/GetImage.c b/nx-X11/lib/src/GetImage.c
index d80f6715f..d80f6715f 100644
--- a/nx-X11/lib/X11/GetImage.c
+++ b/nx-X11/lib/src/GetImage.c
diff --git a/nx-X11/lib/X11/GetKCnt.c b/nx-X11/lib/src/GetKCnt.c
index 5829fbeaa..5829fbeaa 100644
--- a/nx-X11/lib/X11/GetKCnt.c
+++ b/nx-X11/lib/src/GetKCnt.c
diff --git a/nx-X11/lib/X11/GetMoEv.c b/nx-X11/lib/src/GetMoEv.c
index ad9c77277..ad9c77277 100644
--- a/nx-X11/lib/X11/GetMoEv.c
+++ b/nx-X11/lib/src/GetMoEv.c
diff --git a/nx-X11/lib/X11/GetNrmHint.c b/nx-X11/lib/src/GetNrmHint.c
index cc8fd235e..cc8fd235e 100644
--- a/nx-X11/lib/X11/GetNrmHint.c
+++ b/nx-X11/lib/src/GetNrmHint.c
diff --git a/nx-X11/lib/X11/GetPCnt.c b/nx-X11/lib/src/GetPCnt.c
index 72d9495b5..72d9495b5 100644
--- a/nx-X11/lib/X11/GetPCnt.c
+++ b/nx-X11/lib/src/GetPCnt.c
diff --git a/nx-X11/lib/X11/GetPntMap.c b/nx-X11/lib/src/GetPntMap.c
index 07625f8a0..07625f8a0 100644
--- a/nx-X11/lib/X11/GetPntMap.c
+++ b/nx-X11/lib/src/GetPntMap.c
diff --git a/nx-X11/lib/X11/GetProp.c b/nx-X11/lib/src/GetProp.c
index 9eb422ee3..9eb422ee3 100644
--- a/nx-X11/lib/X11/GetProp.c
+++ b/nx-X11/lib/src/GetProp.c
diff --git a/nx-X11/lib/X11/GetRGBCMap.c b/nx-X11/lib/src/GetRGBCMap.c
index 746b53fbf..746b53fbf 100644
--- a/nx-X11/lib/X11/GetRGBCMap.c
+++ b/nx-X11/lib/src/GetRGBCMap.c
diff --git a/nx-X11/lib/X11/GetSOwner.c b/nx-X11/lib/src/GetSOwner.c
index 2258f8ce1..2258f8ce1 100644
--- a/nx-X11/lib/X11/GetSOwner.c
+++ b/nx-X11/lib/src/GetSOwner.c
diff --git a/nx-X11/lib/X11/GetSSaver.c b/nx-X11/lib/src/GetSSaver.c
index 7c2a3061a..7c2a3061a 100644
--- a/nx-X11/lib/X11/GetSSaver.c
+++ b/nx-X11/lib/src/GetSSaver.c
diff --git a/nx-X11/lib/X11/GetStCmap.c b/nx-X11/lib/src/GetStCmap.c
index 560de67ba..560de67ba 100644
--- a/nx-X11/lib/X11/GetStCmap.c
+++ b/nx-X11/lib/src/GetStCmap.c
diff --git a/nx-X11/lib/X11/GetTxtProp.c b/nx-X11/lib/src/GetTxtProp.c
index 2694b8184..2694b8184 100644
--- a/nx-X11/lib/X11/GetTxtProp.c
+++ b/nx-X11/lib/src/GetTxtProp.c
diff --git a/nx-X11/lib/X11/GetWAttrs.c b/nx-X11/lib/src/GetWAttrs.c
index c10824cf4..c10824cf4 100644
--- a/nx-X11/lib/X11/GetWAttrs.c
+++ b/nx-X11/lib/src/GetWAttrs.c
diff --git a/nx-X11/lib/X11/GetWMCMapW.c b/nx-X11/lib/src/GetWMCMapW.c
index 722ec60f8..722ec60f8 100644
--- a/nx-X11/lib/X11/GetWMCMapW.c
+++ b/nx-X11/lib/src/GetWMCMapW.c
diff --git a/nx-X11/lib/X11/GetWMProto.c b/nx-X11/lib/src/GetWMProto.c
index 1ea4f55d5..1ea4f55d5 100644
--- a/nx-X11/lib/X11/GetWMProto.c
+++ b/nx-X11/lib/src/GetWMProto.c
diff --git a/nx-X11/lib/X11/GrButton.c b/nx-X11/lib/src/GrButton.c
index 621f49a5c..621f49a5c 100644
--- a/nx-X11/lib/X11/GrButton.c
+++ b/nx-X11/lib/src/GrButton.c
diff --git a/nx-X11/lib/X11/GrKey.c b/nx-X11/lib/src/GrKey.c
index d2da5952f..d2da5952f 100644
--- a/nx-X11/lib/X11/GrKey.c
+++ b/nx-X11/lib/src/GrKey.c
diff --git a/nx-X11/lib/X11/GrKeybd.c b/nx-X11/lib/src/GrKeybd.c
index 07dc84115..07dc84115 100644
--- a/nx-X11/lib/X11/GrKeybd.c
+++ b/nx-X11/lib/src/GrKeybd.c
diff --git a/nx-X11/lib/X11/GrPointer.c b/nx-X11/lib/src/GrPointer.c
index a0d98277c..a0d98277c 100644
--- a/nx-X11/lib/X11/GrPointer.c
+++ b/nx-X11/lib/src/GrPointer.c
diff --git a/nx-X11/lib/X11/GrServer.c b/nx-X11/lib/src/GrServer.c
index c4c62bef3..c4c62bef3 100644
--- a/nx-X11/lib/X11/GrServer.c
+++ b/nx-X11/lib/src/GrServer.c
diff --git a/nx-X11/lib/X11/Host.c b/nx-X11/lib/src/Host.c
index b07c9c312..b07c9c312 100644
--- a/nx-X11/lib/X11/Host.c
+++ b/nx-X11/lib/src/Host.c
diff --git a/nx-X11/lib/X11/Iconify.c b/nx-X11/lib/src/Iconify.c
index 542f5885c..542f5885c 100644
--- a/nx-X11/lib/X11/Iconify.c
+++ b/nx-X11/lib/src/Iconify.c
diff --git a/nx-X11/lib/X11/IfEvent.c b/nx-X11/lib/src/IfEvent.c
index 1a5eef7ce..1a5eef7ce 100644
--- a/nx-X11/lib/X11/IfEvent.c
+++ b/nx-X11/lib/src/IfEvent.c
diff --git a/nx-X11/lib/X11/ImText.c b/nx-X11/lib/src/ImText.c
index c12f26854..c12f26854 100644
--- a/nx-X11/lib/X11/ImText.c
+++ b/nx-X11/lib/src/ImText.c
diff --git a/nx-X11/lib/X11/ImText16.c b/nx-X11/lib/src/ImText16.c
index b0b60710c..b0b60710c 100644
--- a/nx-X11/lib/X11/ImText16.c
+++ b/nx-X11/lib/src/ImText16.c
diff --git a/nx-X11/lib/X11/ImUtil.c b/nx-X11/lib/src/ImUtil.c
index 79ba80ecc..79ba80ecc 100644
--- a/nx-X11/lib/X11/ImUtil.c
+++ b/nx-X11/lib/src/ImUtil.c
diff --git a/nx-X11/lib/X11/InitExt.c b/nx-X11/lib/src/InitExt.c
index d02527d5c..d02527d5c 100644
--- a/nx-X11/lib/X11/InitExt.c
+++ b/nx-X11/lib/src/InitExt.c
diff --git a/nx-X11/lib/X11/InsCmap.c b/nx-X11/lib/src/InsCmap.c
index 735ab080e..735ab080e 100644
--- a/nx-X11/lib/X11/InsCmap.c
+++ b/nx-X11/lib/src/InsCmap.c
diff --git a/nx-X11/lib/X11/IntAtom.c b/nx-X11/lib/src/IntAtom.c
index 3042b65dd..3042b65dd 100644
--- a/nx-X11/lib/X11/IntAtom.c
+++ b/nx-X11/lib/src/IntAtom.c
diff --git a/nx-X11/lib/X11/Key.h b/nx-X11/lib/src/Key.h
index 3a1639c5c..3a1639c5c 100644
--- a/nx-X11/lib/X11/Key.h
+++ b/nx-X11/lib/src/Key.h
diff --git a/nx-X11/lib/X11/KeyBind.c b/nx-X11/lib/src/KeyBind.c
index acaf7fd8f..acaf7fd8f 100644
--- a/nx-X11/lib/X11/KeyBind.c
+++ b/nx-X11/lib/src/KeyBind.c
diff --git a/nx-X11/lib/X11/KeysymStr.c b/nx-X11/lib/src/KeysymStr.c
index ba6c8450a..ba6c8450a 100644
--- a/nx-X11/lib/X11/KeysymStr.c
+++ b/nx-X11/lib/src/KeysymStr.c
diff --git a/nx-X11/lib/X11/KillCl.c b/nx-X11/lib/src/KillCl.c
index cfd8cb000..cfd8cb000 100644
--- a/nx-X11/lib/X11/KillCl.c
+++ b/nx-X11/lib/src/KillCl.c
diff --git a/nx-X11/lib/X11/LiHosts.c b/nx-X11/lib/src/LiHosts.c
index 29c36ffb5..29c36ffb5 100644
--- a/nx-X11/lib/X11/LiHosts.c
+++ b/nx-X11/lib/src/LiHosts.c
diff --git a/nx-X11/lib/X11/LiICmaps.c b/nx-X11/lib/src/LiICmaps.c
index 45a2f2fd3..45a2f2fd3 100644
--- a/nx-X11/lib/X11/LiICmaps.c
+++ b/nx-X11/lib/src/LiICmaps.c
diff --git a/nx-X11/lib/X11/LiProps.c b/nx-X11/lib/src/LiProps.c
index d9c746563..d9c746563 100644
--- a/nx-X11/lib/X11/LiProps.c
+++ b/nx-X11/lib/src/LiProps.c
diff --git a/nx-X11/lib/X11/ListExt.c b/nx-X11/lib/src/ListExt.c
index 7fdf9932c..7fdf9932c 100644
--- a/nx-X11/lib/X11/ListExt.c
+++ b/nx-X11/lib/src/ListExt.c
diff --git a/nx-X11/lib/X11/LoadFont.c b/nx-X11/lib/src/LoadFont.c
index f547976ba..f547976ba 100644
--- a/nx-X11/lib/X11/LoadFont.c
+++ b/nx-X11/lib/src/LoadFont.c
diff --git a/nx-X11/lib/X11/LockDis.c b/nx-X11/lib/src/LockDis.c
index 12dd97df0..12dd97df0 100644
--- a/nx-X11/lib/X11/LockDis.c
+++ b/nx-X11/lib/src/LockDis.c
diff --git a/nx-X11/lib/X11/LookupCol.c b/nx-X11/lib/src/LookupCol.c
index f7f969f56..f7f969f56 100644
--- a/nx-X11/lib/X11/LookupCol.c
+++ b/nx-X11/lib/src/LookupCol.c
diff --git a/nx-X11/lib/X11/LowerWin.c b/nx-X11/lib/src/LowerWin.c
index d430e6fd7..d430e6fd7 100644
--- a/nx-X11/lib/X11/LowerWin.c
+++ b/nx-X11/lib/src/LowerWin.c
diff --git a/nx-X11/lib/X11/Macros.c b/nx-X11/lib/src/Macros.c
index e29dcd4e8..e29dcd4e8 100644
--- a/nx-X11/lib/X11/Macros.c
+++ b/nx-X11/lib/src/Macros.c
diff --git a/nx-X11/lib/src/Makefile.am b/nx-X11/lib/src/Makefile.am
new file mode 100644
index 000000000..90011f602
--- /dev/null
+++ b/nx-X11/lib/src/Makefile.am
@@ -0,0 +1,387 @@
+NULL =
+
+if XKB
+XKB_SUBDIRS = xkb
+endif
+SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
+
+lib_LTLIBRARIES = libNX_X11.la
+
+BUILT_SOURCES=ks_tables.h
+CLEANFILES=ks_tables.h ks_tables_h
+
+AM_CPPFLAGS=						\
+	-I$(top_srcdir)/include				\
+	-I$(top_srcdir)/include/X11			\
+	-I$(top_builddir)/include			\
+	-I$(top_builddir)/include/X11			\
+	-I$(top_srcdir)/src/xcms			\
+	-I$(top_srcdir)/src/xkb				\
+	-I$(top_srcdir)/src/xlibi18n			\
+	-I$(top_srcdir)/../exports/include		\
+	-D_GNU_SOURCE					\
+	-DX11_t						\
+	-DTRANS_CLIENT					\
+	-DUSE_XCB=0					\
+	$(NULL)
+
+AM_CFLAGS=						\
+	$(X11_CFLAGS)					\
+	$(BIGFONT_CFLAGS)				\
+	$(XMALLOC_ZERO_CFLAGS)				\
+	$(CWARNFLAGS)					\
+	$(NULL)
+
+#
+# =============================== I18N =============================
+#
+
+I18N_LIBS =						\
+	xlibi18n/libi18n.la				\
+	$(NULL)
+
+#
+# =============================== XCMS =============================
+#
+
+XCMS_LIBS =						\
+	xcms/libxcms.la					\
+	$(NULL)
+
+#
+# =============================== XKB ==============================
+#
+
+XKB_LIBS =						\
+	xkb/libxkb.la					\
+	$(NULL)
+
+#
+# =============================== XLIB =============================
+#
+
+libNX_X11_la_SOURCES =					\
+		AllCells.c				\
+		AllowEv.c				\
+		AllPlanes.c				\
+		AuDispose.c				\
+		AuFileName.c				\
+		AuGetBest.c				\
+		AuRead.c				\
+		AutoRep.c				\
+		Backgnd.c				\
+		BdrWidth.c				\
+		Bell.c					\
+		Border.c				\
+		ChAccCon.c				\
+		ChActPGb.c				\
+		ChClMode.c				\
+		ChCmap.c				\
+		ChGC.c					\
+		ChKeyCon.c				\
+		ChkIfEv.c				\
+		ChkMaskEv.c				\
+		ChkTypEv.c				\
+		ChkTypWEv.c				\
+		ChkWinEv.c				\
+		ChPntCon.c				\
+		ChProp.c				\
+		ChSaveSet.c				\
+		ChWAttrs.c				\
+		ChWindow.c				\
+		CirWin.c				\
+		CirWinDn.c				\
+		CirWinUp.c				\
+		ClDisplay.c				\
+		ClearArea.c				\
+		Clear.c					\
+		ConfWind.c				\
+		ConnDis.c				\
+		Context.c				\
+		ConvSel.c				\
+		CopyArea.c				\
+		CopyCmap.c				\
+		CopyGC.c				\
+		CopyPlane.c				\
+		CrBFData.c				\
+		CrCmap.c				\
+		CrCursor.c				\
+		CrGC.c					\
+		CrGlCur.c				\
+		CrPFBData.c				\
+		CrPixmap.c				\
+		CrWindow.c				\
+		Cursor.c				\
+		DefCursor.c				\
+		DelProp.c				\
+		Depths.c				\
+		DestSubs.c				\
+		DestWind.c				\
+		DisName.c				\
+		DrArc.c					\
+		DrArcs.c				\
+		DrLine.c				\
+		DrLines.c				\
+		DrPoint.c				\
+		DrPoints.c				\
+		DrRect.c				\
+		DrRects.c				\
+		DrSegs.c				\
+		ErrDes.c				\
+		ErrHndlr.c				\
+		evtomask.c				\
+		EvToWire.c				\
+		FetchName.c				\
+		FillArc.c				\
+		FillArcs.c				\
+		FillPoly.c				\
+		FillRct.c				\
+		FillRcts.c				\
+		FilterEv.c				\
+		Flush.c					\
+		Font.c					\
+		FontInfo.c				\
+		FontNames.c				\
+		FreeCmap.c				\
+		FreeCols.c				\
+		FreeCurs.c				\
+		FreeEData.c				\
+		FreeEventData.c				\
+		FreeGC.c				\
+		FreePix.c				\
+		FSSaver.c				\
+		FSWrap.c				\
+		GCMisc.c				\
+		Geom.c					\
+		GetAtomNm.c				\
+		GetColor.c				\
+		GetDflt.c				\
+		GetEventData.c				\
+		GetFPath.c				\
+		GetFProp.c				\
+		GetGCVals.c				\
+		GetGeom.c				\
+		GetHColor.c				\
+		GetHints.c				\
+		GetIFocus.c				\
+		GetImage.c				\
+		GetKCnt.c				\
+		GetMoEv.c				\
+		GetNrmHint.c				\
+		GetPCnt.c				\
+		GetPntMap.c				\
+		GetProp.c				\
+		GetRGBCMap.c				\
+		GetSOwner.c				\
+		GetSSaver.c				\
+		GetStCmap.c				\
+		GetTxtProp.c				\
+		GetWAttrs.c				\
+		GetWMCMapW.c				\
+		GetWMProto.c				\
+		globals.c				\
+		GrButton.c				\
+		GrKeybd.c				\
+		GrKey.c					\
+		GrPointer.c				\
+		GrServer.c				\
+		Host.c					\
+		Iconify.c				\
+		IfEvent.c				\
+		imConv.c				\
+		ImText16.c				\
+		ImText.c				\
+		ImUtil.c				\
+		InitExt.c				\
+		InsCmap.c				\
+		IntAtom.c				\
+		KeyBind.c				\
+		KeysymStr.c				\
+		KillCl.c				\
+		LiHosts.c				\
+		LiICmaps.c				\
+		LiProps.c				\
+		ListExt.c				\
+		LoadFont.c				\
+		LockDis.c				\
+		locking.c				\
+		LookupCol.c				\
+		LowerWin.c				\
+		Macros.c				\
+		MapRaised.c				\
+		MapSubs.c				\
+		MapWindow.c				\
+		MaskEvent.c				\
+		Misc.c					\
+		ModMap.c				\
+		MoveWin.c				\
+		NextEvent.c				\
+		OCWrap.c				\
+		OMWrap.c				\
+		OpenDis.c				\
+		ParseCmd.c				\
+		ParseCol.c				\
+		ParseGeom.c				\
+		PeekEvent.c				\
+		PeekIfEv.c				\
+		Pending.c				\
+		PixFormats.c				\
+		PmapBgnd.c				\
+		PmapBord.c				\
+		PolyReg.c				\
+		PolyTxt16.c				\
+		PolyTxt.c				\
+		PropAlloc.c				\
+		PutBEvent.c				\
+		PutImage.c				\
+		Quarks.c				\
+		QuBest.c				\
+		QuColor.c				\
+		QuColors.c				\
+		QuCurShp.c				\
+		QuExt.c					\
+		QuKeybd.c				\
+		QuPntr.c				\
+		QuStipShp.c				\
+		QuTextE16.c				\
+		QuTextExt.c				\
+		QuTileShp.c				\
+		QuTree.c				\
+		RaiseWin.c				\
+		RdBitF.c				\
+		RecolorC.c				\
+		ReconfWin.c				\
+		ReconfWM.c				\
+		Region.c				\
+		RegstFlt.c				\
+		RepWindow.c				\
+		RestackWs.c				\
+		RotProp.c				\
+		ScrResStr.c				\
+		SelInput.c				\
+		SendEvent.c				\
+		SetBack.c				\
+		SetClMask.c				\
+		SetClOrig.c				\
+		SetCRects.c				\
+		SetDashes.c				\
+		SetFont.c				\
+		SetFore.c				\
+		SetFPath.c				\
+		SetFunc.c				\
+		SetHints.c				\
+		SetIFocus.c				\
+		SetLocale.c				\
+		SetLStyle.c				\
+		SetNrmHint.c				\
+		SetPMask.c				\
+		SetPntMap.c				\
+		SetRGBCMap.c				\
+		SetSOwner.c				\
+		SetSSaver.c				\
+		SetState.c				\
+		SetStCmap.c				\
+		SetStip.c				\
+		SetTile.c				\
+		SetTSOrig.c				\
+		SetTxtProp.c				\
+		SetWMCMapW.c				\
+		SetWMProto.c				\
+		StBytes.c				\
+		StColor.c				\
+		StColors.c				\
+		StName.c				\
+		StNColor.c				\
+		StrKeysym.c				\
+		StrToText.c				\
+		Sync.c					\
+		Synchro.c				\
+		Text16.c				\
+		Text.c					\
+		TextExt16.c				\
+		TextExt.c				\
+		TextToStr.c				\
+		TrCoords.c				\
+		UndefCurs.c				\
+		UngrabBut.c				\
+		UngrabKbd.c				\
+		UngrabKey.c				\
+		UngrabPtr.c				\
+		UngrabSvr.c				\
+		UninsCmap.c				\
+		UnldFont.c				\
+		UnmapSubs.c				\
+		UnmapWin.c				\
+		VisUtil.c				\
+		WarpPtr.c				\
+		Window.c				\
+		WinEvent.c				\
+		Withdraw.c				\
+		WMGeom.c				\
+		WMProps.c				\
+		WrBitF.c				\
+		XlibAsync.c				\
+		XlibInt.c				\
+		Xrm.c					\
+		x11_trans.c				\
+		$(NULL)
+
+#
+# ========================= Extra stuff ============================
+#
+
+x11datadir = @X11_DATADIR@
+x11data_DATA = XErrorDB
+
+EXTRA_DIST =						\
+	$(x11data_DATA)					\
+	$(NULL)
+
+if THRSTUBS
+libNX_X11_la_SOURCES+=UIThrStubs.c
+else
+EXTRA_DIST +=						\
+	UIThrStubs.c					\
+	$(NULL)
+endif
+
+libNX_X11_la_LDFLAGS = -version-number 6:3:0 -no-undefined
+
+if XLOCALE
+USE_I18N_LIBS = $(I18N_LIBS)
+endif
+
+if XCMS
+USE_XCMS_LIBS = $(XCMS_LIBS)
+endif
+
+if XKB
+USE_XKB_LIBS = $(XKB_LIBS)
+endif
+
+libNX_X11_la_LIBADD =					\
+	$(USE_I18N_LIBS)				\
+	$(USE_XCMS_LIBS)				\
+	$(USE_XKB_LIBS)					\
+	$(X11_LIBS)					\
+	-L$(top_srcdir)/../../nxcomp/src/.libs -lXcomp	\
+	$(NULL)
+
+preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
+.c.ii:
+	$(COMPILE) -E -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+#
+# Building ks_tables.h requires the makekeys utility
+#
+
+KEYSYMDEFS=@KEYSYMDEFS@
+
+ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
+	$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
+	mv ks_tables_h $@
+
+$(top_builddir)/src/util/makekeys$(EXEEXT): force
+	cd util && $(MAKE)
+
+force:
diff --git a/nx-X11/lib/X11/MapRaised.c b/nx-X11/lib/src/MapRaised.c
index 6ad6aef08..6ad6aef08 100644
--- a/nx-X11/lib/X11/MapRaised.c
+++ b/nx-X11/lib/src/MapRaised.c
diff --git a/nx-X11/lib/X11/MapSubs.c b/nx-X11/lib/src/MapSubs.c
index 14e8b8af5..14e8b8af5 100644
--- a/nx-X11/lib/X11/MapSubs.c
+++ b/nx-X11/lib/src/MapSubs.c
diff --git a/nx-X11/lib/X11/MapWindow.c b/nx-X11/lib/src/MapWindow.c
index cc041ff51..cc041ff51 100644
--- a/nx-X11/lib/X11/MapWindow.c
+++ b/nx-X11/lib/src/MapWindow.c
diff --git a/nx-X11/lib/X11/MaskEvent.c b/nx-X11/lib/src/MaskEvent.c
index 1fadc487e..1fadc487e 100644
--- a/nx-X11/lib/X11/MaskEvent.c
+++ b/nx-X11/lib/src/MaskEvent.c
diff --git a/nx-X11/lib/X11/Misc.c b/nx-X11/lib/src/Misc.c
index c3a028408..c3a028408 100644
--- a/nx-X11/lib/X11/Misc.c
+++ b/nx-X11/lib/src/Misc.c
diff --git a/nx-X11/lib/X11/ModMap.c b/nx-X11/lib/src/ModMap.c
index ca15dde25..ca15dde25 100644
--- a/nx-X11/lib/X11/ModMap.c
+++ b/nx-X11/lib/src/ModMap.c
diff --git a/nx-X11/lib/X11/MoveWin.c b/nx-X11/lib/src/MoveWin.c
index 2eb2283be..2eb2283be 100644
--- a/nx-X11/lib/X11/MoveWin.c
+++ b/nx-X11/lib/src/MoveWin.c
diff --git a/nx-X11/lib/X11/NextEvent.c b/nx-X11/lib/src/NextEvent.c
index d3048aee2..d3048aee2 100644
--- a/nx-X11/lib/X11/NextEvent.c
+++ b/nx-X11/lib/src/NextEvent.c
diff --git a/nx-X11/lib/X11/OCWrap.c b/nx-X11/lib/src/OCWrap.c
index fe23a3495..fe23a3495 100644
--- a/nx-X11/lib/X11/OCWrap.c
+++ b/nx-X11/lib/src/OCWrap.c
diff --git a/nx-X11/lib/X11/OMWrap.c b/nx-X11/lib/src/OMWrap.c
index 045ca16bc..045ca16bc 100644
--- a/nx-X11/lib/X11/OMWrap.c
+++ b/nx-X11/lib/src/OMWrap.c
diff --git a/nx-X11/lib/X11/OpenDis.c b/nx-X11/lib/src/OpenDis.c
index 965924650..965924650 100644
--- a/nx-X11/lib/X11/OpenDis.c
+++ b/nx-X11/lib/src/OpenDis.c
diff --git a/nx-X11/lib/X11/ParseCmd.c b/nx-X11/lib/src/ParseCmd.c
index b4bb97654..b4bb97654 100644
--- a/nx-X11/lib/X11/ParseCmd.c
+++ b/nx-X11/lib/src/ParseCmd.c
diff --git a/nx-X11/lib/X11/ParseCol.c b/nx-X11/lib/src/ParseCol.c
index e997b1b8c..e997b1b8c 100644
--- a/nx-X11/lib/X11/ParseCol.c
+++ b/nx-X11/lib/src/ParseCol.c
diff --git a/nx-X11/lib/X11/ParseGeom.c b/nx-X11/lib/src/ParseGeom.c
index dfd812fc9..dfd812fc9 100644
--- a/nx-X11/lib/X11/ParseGeom.c
+++ b/nx-X11/lib/src/ParseGeom.c
diff --git a/nx-X11/lib/X11/PeekEvent.c b/nx-X11/lib/src/PeekEvent.c
index ffbaa05b4..ffbaa05b4 100644
--- a/nx-X11/lib/X11/PeekEvent.c
+++ b/nx-X11/lib/src/PeekEvent.c
diff --git a/nx-X11/lib/X11/PeekIfEv.c b/nx-X11/lib/src/PeekIfEv.c
index f2f2cede4..f2f2cede4 100644
--- a/nx-X11/lib/X11/PeekIfEv.c
+++ b/nx-X11/lib/src/PeekIfEv.c
diff --git a/nx-X11/lib/X11/Pending.c b/nx-X11/lib/src/Pending.c
index d3804c629..d3804c629 100644
--- a/nx-X11/lib/X11/Pending.c
+++ b/nx-X11/lib/src/Pending.c
diff --git a/nx-X11/lib/X11/PixFormats.c b/nx-X11/lib/src/PixFormats.c
index 6d9f64d2c..6d9f64d2c 100644
--- a/nx-X11/lib/X11/PixFormats.c
+++ b/nx-X11/lib/src/PixFormats.c
diff --git a/nx-X11/lib/X11/PmapBgnd.c b/nx-X11/lib/src/PmapBgnd.c
index 9c5155833..9c5155833 100644
--- a/nx-X11/lib/X11/PmapBgnd.c
+++ b/nx-X11/lib/src/PmapBgnd.c
diff --git a/nx-X11/lib/X11/PmapBord.c b/nx-X11/lib/src/PmapBord.c
index 7e1be616e..7e1be616e 100644
--- a/nx-X11/lib/X11/PmapBord.c
+++ b/nx-X11/lib/src/PmapBord.c
diff --git a/nx-X11/lib/X11/PolyReg.c b/nx-X11/lib/src/PolyReg.c
index cb30f8422..cb30f8422 100644
--- a/nx-X11/lib/X11/PolyReg.c
+++ b/nx-X11/lib/src/PolyReg.c
diff --git a/nx-X11/lib/X11/PolyTxt.c b/nx-X11/lib/src/PolyTxt.c
index 471383b57..471383b57 100644
--- a/nx-X11/lib/X11/PolyTxt.c
+++ b/nx-X11/lib/src/PolyTxt.c
diff --git a/nx-X11/lib/X11/PolyTxt16.c b/nx-X11/lib/src/PolyTxt16.c
index 2e4be1673..2e4be1673 100644
--- a/nx-X11/lib/X11/PolyTxt16.c
+++ b/nx-X11/lib/src/PolyTxt16.c
diff --git a/nx-X11/lib/X11/PropAlloc.c b/nx-X11/lib/src/PropAlloc.c
index 87817d88a..87817d88a 100644
--- a/nx-X11/lib/X11/PropAlloc.c
+++ b/nx-X11/lib/src/PropAlloc.c
diff --git a/nx-X11/lib/X11/PutBEvent.c b/nx-X11/lib/src/PutBEvent.c
index 1768e032c..1768e032c 100644
--- a/nx-X11/lib/X11/PutBEvent.c
+++ b/nx-X11/lib/src/PutBEvent.c
diff --git a/nx-X11/lib/X11/PutImage.c b/nx-X11/lib/src/PutImage.c
index daf172cf0..daf172cf0 100644
--- a/nx-X11/lib/X11/PutImage.c
+++ b/nx-X11/lib/src/PutImage.c
diff --git a/nx-X11/lib/X11/QuBest.c b/nx-X11/lib/src/QuBest.c
index 97b1f116b..97b1f116b 100644
--- a/nx-X11/lib/X11/QuBest.c
+++ b/nx-X11/lib/src/QuBest.c
diff --git a/nx-X11/lib/X11/QuColor.c b/nx-X11/lib/src/QuColor.c
index 4638095c0..4638095c0 100644
--- a/nx-X11/lib/X11/QuColor.c
+++ b/nx-X11/lib/src/QuColor.c
diff --git a/nx-X11/lib/X11/QuColors.c b/nx-X11/lib/src/QuColors.c
index 0b9bc508f..0b9bc508f 100644
--- a/nx-X11/lib/X11/QuColors.c
+++ b/nx-X11/lib/src/QuColors.c
diff --git a/nx-X11/lib/X11/QuCurShp.c b/nx-X11/lib/src/QuCurShp.c
index bb17c42fc..bb17c42fc 100644
--- a/nx-X11/lib/X11/QuCurShp.c
+++ b/nx-X11/lib/src/QuCurShp.c
diff --git a/nx-X11/lib/X11/QuExt.c b/nx-X11/lib/src/QuExt.c
index 4e230e776..4e230e776 100644
--- a/nx-X11/lib/X11/QuExt.c
+++ b/nx-X11/lib/src/QuExt.c
diff --git a/nx-X11/lib/X11/QuKeybd.c b/nx-X11/lib/src/QuKeybd.c
index 0a2d4d0fc..0a2d4d0fc 100644
--- a/nx-X11/lib/X11/QuKeybd.c
+++ b/nx-X11/lib/src/QuKeybd.c
diff --git a/nx-X11/lib/X11/QuPntr.c b/nx-X11/lib/src/QuPntr.c
index e1379a6f5..e1379a6f5 100644
--- a/nx-X11/lib/X11/QuPntr.c
+++ b/nx-X11/lib/src/QuPntr.c
diff --git a/nx-X11/lib/X11/QuStipShp.c b/nx-X11/lib/src/QuStipShp.c
index 9f612fcb1..9f612fcb1 100644
--- a/nx-X11/lib/X11/QuStipShp.c
+++ b/nx-X11/lib/src/QuStipShp.c
diff --git a/nx-X11/lib/X11/QuTextE16.c b/nx-X11/lib/src/QuTextE16.c
index e458bc52c..e458bc52c 100644
--- a/nx-X11/lib/X11/QuTextE16.c
+++ b/nx-X11/lib/src/QuTextE16.c
diff --git a/nx-X11/lib/X11/QuTextExt.c b/nx-X11/lib/src/QuTextExt.c
index 8a17dbb27..8a17dbb27 100644
--- a/nx-X11/lib/X11/QuTextExt.c
+++ b/nx-X11/lib/src/QuTextExt.c
diff --git a/nx-X11/lib/X11/QuTileShp.c b/nx-X11/lib/src/QuTileShp.c
index f713f4248..f713f4248 100644
--- a/nx-X11/lib/X11/QuTileShp.c
+++ b/nx-X11/lib/src/QuTileShp.c
diff --git a/nx-X11/lib/X11/QuTree.c b/nx-X11/lib/src/QuTree.c
index 8da2ae261..8da2ae261 100644
--- a/nx-X11/lib/X11/QuTree.c
+++ b/nx-X11/lib/src/QuTree.c
diff --git a/nx-X11/lib/X11/Quarks.c b/nx-X11/lib/src/Quarks.c
index 132ec6f67..132ec6f67 100644
--- a/nx-X11/lib/X11/Quarks.c
+++ b/nx-X11/lib/src/Quarks.c
diff --git a/nx-X11/lib/X11/RaiseWin.c b/nx-X11/lib/src/RaiseWin.c
index f431db579..f431db579 100644
--- a/nx-X11/lib/X11/RaiseWin.c
+++ b/nx-X11/lib/src/RaiseWin.c
diff --git a/nx-X11/lib/X11/RdBitF.c b/nx-X11/lib/src/RdBitF.c
index 319a0ee0b..319a0ee0b 100644
--- a/nx-X11/lib/X11/RdBitF.c
+++ b/nx-X11/lib/src/RdBitF.c
diff --git a/nx-X11/lib/X11/RecolorC.c b/nx-X11/lib/src/RecolorC.c
index a54b48cb8..a54b48cb8 100644
--- a/nx-X11/lib/X11/RecolorC.c
+++ b/nx-X11/lib/src/RecolorC.c
diff --git a/nx-X11/lib/X11/ReconfWM.c b/nx-X11/lib/src/ReconfWM.c
index b3d8624cf..b3d8624cf 100644
--- a/nx-X11/lib/X11/ReconfWM.c
+++ b/nx-X11/lib/src/ReconfWM.c
diff --git a/nx-X11/lib/X11/ReconfWin.c b/nx-X11/lib/src/ReconfWin.c
index bfa99f528..bfa99f528 100644
--- a/nx-X11/lib/X11/ReconfWin.c
+++ b/nx-X11/lib/src/ReconfWin.c
diff --git a/nx-X11/lib/X11/Region.c b/nx-X11/lib/src/Region.c
index 28fa3e416..28fa3e416 100644
--- a/nx-X11/lib/X11/Region.c
+++ b/nx-X11/lib/src/Region.c
diff --git a/nx-X11/lib/X11/RegstFlt.c b/nx-X11/lib/src/RegstFlt.c
index 077ea424c..077ea424c 100644
--- a/nx-X11/lib/X11/RegstFlt.c
+++ b/nx-X11/lib/src/RegstFlt.c
diff --git a/nx-X11/lib/X11/RepWindow.c b/nx-X11/lib/src/RepWindow.c
index 1fde8d80f..1fde8d80f 100644
--- a/nx-X11/lib/X11/RepWindow.c
+++ b/nx-X11/lib/src/RepWindow.c
diff --git a/nx-X11/lib/X11/RestackWs.c b/nx-X11/lib/src/RestackWs.c
index 52391ecd2..52391ecd2 100644
--- a/nx-X11/lib/X11/RestackWs.c
+++ b/nx-X11/lib/src/RestackWs.c
diff --git a/nx-X11/lib/X11/RotProp.c b/nx-X11/lib/src/RotProp.c
index 98d7dbd81..98d7dbd81 100644
--- a/nx-X11/lib/X11/RotProp.c
+++ b/nx-X11/lib/src/RotProp.c
diff --git a/nx-X11/lib/X11/ScrResStr.c b/nx-X11/lib/src/ScrResStr.c
index 1dd04a383..1dd04a383 100644
--- a/nx-X11/lib/X11/ScrResStr.c
+++ b/nx-X11/lib/src/ScrResStr.c
diff --git a/nx-X11/lib/X11/SelInput.c b/nx-X11/lib/src/SelInput.c
index a3fa294f4..a3fa294f4 100644
--- a/nx-X11/lib/X11/SelInput.c
+++ b/nx-X11/lib/src/SelInput.c
diff --git a/nx-X11/lib/X11/SendEvent.c b/nx-X11/lib/src/SendEvent.c
index 1de986007..1de986007 100644
--- a/nx-X11/lib/X11/SendEvent.c
+++ b/nx-X11/lib/src/SendEvent.c
diff --git a/nx-X11/lib/X11/SetBack.c b/nx-X11/lib/src/SetBack.c
index 269d10cc7..269d10cc7 100644
--- a/nx-X11/lib/X11/SetBack.c
+++ b/nx-X11/lib/src/SetBack.c
diff --git a/nx-X11/lib/X11/SetCRects.c b/nx-X11/lib/src/SetCRects.c
index c7ad3fcf2..c7ad3fcf2 100644
--- a/nx-X11/lib/X11/SetCRects.c
+++ b/nx-X11/lib/src/SetCRects.c
diff --git a/nx-X11/lib/X11/SetClMask.c b/nx-X11/lib/src/SetClMask.c
index 82cdb2cce..82cdb2cce 100644
--- a/nx-X11/lib/X11/SetClMask.c
+++ b/nx-X11/lib/src/SetClMask.c
diff --git a/nx-X11/lib/X11/SetClOrig.c b/nx-X11/lib/src/SetClOrig.c
index 800e1570d..800e1570d 100644
--- a/nx-X11/lib/X11/SetClOrig.c
+++ b/nx-X11/lib/src/SetClOrig.c
diff --git a/nx-X11/lib/X11/SetDashes.c b/nx-X11/lib/src/SetDashes.c
index ffe4a95ff..ffe4a95ff 100644
--- a/nx-X11/lib/X11/SetDashes.c
+++ b/nx-X11/lib/src/SetDashes.c
diff --git a/nx-X11/lib/X11/SetFPath.c b/nx-X11/lib/src/SetFPath.c
index 60aaef01e..60aaef01e 100644
--- a/nx-X11/lib/X11/SetFPath.c
+++ b/nx-X11/lib/src/SetFPath.c
diff --git a/nx-X11/lib/X11/SetFont.c b/nx-X11/lib/src/SetFont.c
index 33ffca02d..33ffca02d 100644
--- a/nx-X11/lib/X11/SetFont.c
+++ b/nx-X11/lib/src/SetFont.c
diff --git a/nx-X11/lib/X11/SetFore.c b/nx-X11/lib/src/SetFore.c
index 50c9f1228..50c9f1228 100644
--- a/nx-X11/lib/X11/SetFore.c
+++ b/nx-X11/lib/src/SetFore.c
diff --git a/nx-X11/lib/X11/SetFunc.c b/nx-X11/lib/src/SetFunc.c
index ffe4ec0cc..ffe4ec0cc 100644
--- a/nx-X11/lib/X11/SetFunc.c
+++ b/nx-X11/lib/src/SetFunc.c
diff --git a/nx-X11/lib/X11/SetHints.c b/nx-X11/lib/src/SetHints.c
index eed360f46..eed360f46 100644
--- a/nx-X11/lib/X11/SetHints.c
+++ b/nx-X11/lib/src/SetHints.c
diff --git a/nx-X11/lib/X11/SetIFocus.c b/nx-X11/lib/src/SetIFocus.c
index bee96ca82..bee96ca82 100644
--- a/nx-X11/lib/X11/SetIFocus.c
+++ b/nx-X11/lib/src/SetIFocus.c
diff --git a/nx-X11/lib/X11/SetLStyle.c b/nx-X11/lib/src/SetLStyle.c
index 8b00fae9c..8b00fae9c 100644
--- a/nx-X11/lib/X11/SetLStyle.c
+++ b/nx-X11/lib/src/SetLStyle.c
diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/src/SetLocale.c
index 3bbfd3ee6..3bbfd3ee6 100644
--- a/nx-X11/lib/X11/SetLocale.c
+++ b/nx-X11/lib/src/SetLocale.c
diff --git a/nx-X11/lib/X11/SetNrmHint.c b/nx-X11/lib/src/SetNrmHint.c
index 937f4eb6b..937f4eb6b 100644
--- a/nx-X11/lib/X11/SetNrmHint.c
+++ b/nx-X11/lib/src/SetNrmHint.c
diff --git a/nx-X11/lib/X11/SetPMask.c b/nx-X11/lib/src/SetPMask.c
index 9f236b00b..9f236b00b 100644
--- a/nx-X11/lib/X11/SetPMask.c
+++ b/nx-X11/lib/src/SetPMask.c
diff --git a/nx-X11/lib/X11/SetPntMap.c b/nx-X11/lib/src/SetPntMap.c
index 14e104d6d..14e104d6d 100644
--- a/nx-X11/lib/X11/SetPntMap.c
+++ b/nx-X11/lib/src/SetPntMap.c
diff --git a/nx-X11/lib/X11/SetRGBCMap.c b/nx-X11/lib/src/SetRGBCMap.c
index f413c0d69..f413c0d69 100644
--- a/nx-X11/lib/X11/SetRGBCMap.c
+++ b/nx-X11/lib/src/SetRGBCMap.c
diff --git a/nx-X11/lib/X11/SetSOwner.c b/nx-X11/lib/src/SetSOwner.c
index bc8f56403..bc8f56403 100644
--- a/nx-X11/lib/X11/SetSOwner.c
+++ b/nx-X11/lib/src/SetSOwner.c
diff --git a/nx-X11/lib/X11/SetSSaver.c b/nx-X11/lib/src/SetSSaver.c
index adce749e1..adce749e1 100644
--- a/nx-X11/lib/X11/SetSSaver.c
+++ b/nx-X11/lib/src/SetSSaver.c
diff --git a/nx-X11/lib/X11/SetStCmap.c b/nx-X11/lib/src/SetStCmap.c
index 7b8aa862d..7b8aa862d 100644
--- a/nx-X11/lib/X11/SetStCmap.c
+++ b/nx-X11/lib/src/SetStCmap.c
diff --git a/nx-X11/lib/X11/SetState.c b/nx-X11/lib/src/SetState.c
index e5aa21c05..e5aa21c05 100644
--- a/nx-X11/lib/X11/SetState.c
+++ b/nx-X11/lib/src/SetState.c
diff --git a/nx-X11/lib/X11/SetStip.c b/nx-X11/lib/src/SetStip.c
index e95882786..e95882786 100644
--- a/nx-X11/lib/X11/SetStip.c
+++ b/nx-X11/lib/src/SetStip.c
diff --git a/nx-X11/lib/X11/SetTSOrig.c b/nx-X11/lib/src/SetTSOrig.c
index 0117c818b..0117c818b 100644
--- a/nx-X11/lib/X11/SetTSOrig.c
+++ b/nx-X11/lib/src/SetTSOrig.c
diff --git a/nx-X11/lib/X11/SetTile.c b/nx-X11/lib/src/SetTile.c
index d32edff06..d32edff06 100644
--- a/nx-X11/lib/X11/SetTile.c
+++ b/nx-X11/lib/src/SetTile.c
diff --git a/nx-X11/lib/X11/SetTxtProp.c b/nx-X11/lib/src/SetTxtProp.c
index c3f272712..c3f272712 100644
--- a/nx-X11/lib/X11/SetTxtProp.c
+++ b/nx-X11/lib/src/SetTxtProp.c
diff --git a/nx-X11/lib/X11/SetWMCMapW.c b/nx-X11/lib/src/SetWMCMapW.c
index 98d6c80b3..98d6c80b3 100644
--- a/nx-X11/lib/X11/SetWMCMapW.c
+++ b/nx-X11/lib/src/SetWMCMapW.c
diff --git a/nx-X11/lib/X11/SetWMProto.c b/nx-X11/lib/src/SetWMProto.c
index 14067b870..14067b870 100644
--- a/nx-X11/lib/X11/SetWMProto.c
+++ b/nx-X11/lib/src/SetWMProto.c
diff --git a/nx-X11/lib/X11/StBytes.c b/nx-X11/lib/src/StBytes.c
index f058d354b..f058d354b 100644
--- a/nx-X11/lib/X11/StBytes.c
+++ b/nx-X11/lib/src/StBytes.c
diff --git a/nx-X11/lib/X11/StColor.c b/nx-X11/lib/src/StColor.c
index d5a217fb0..d5a217fb0 100644
--- a/nx-X11/lib/X11/StColor.c
+++ b/nx-X11/lib/src/StColor.c
diff --git a/nx-X11/lib/X11/StColors.c b/nx-X11/lib/src/StColors.c
index 17a215cc0..17a215cc0 100644
--- a/nx-X11/lib/X11/StColors.c
+++ b/nx-X11/lib/src/StColors.c
diff --git a/nx-X11/lib/X11/StNColor.c b/nx-X11/lib/src/StNColor.c
index 8b821c3ef..8b821c3ef 100644
--- a/nx-X11/lib/X11/StNColor.c
+++ b/nx-X11/lib/src/StNColor.c
diff --git a/nx-X11/lib/X11/StName.c b/nx-X11/lib/src/StName.c
index a003a109e..a003a109e 100644
--- a/nx-X11/lib/X11/StName.c
+++ b/nx-X11/lib/src/StName.c
diff --git a/nx-X11/lib/X11/StrKeysym.c b/nx-X11/lib/src/StrKeysym.c
index 125aceca3..125aceca3 100644
--- a/nx-X11/lib/X11/StrKeysym.c
+++ b/nx-X11/lib/src/StrKeysym.c
diff --git a/nx-X11/lib/X11/StrToText.c b/nx-X11/lib/src/StrToText.c
index ff33492f2..ff33492f2 100644
--- a/nx-X11/lib/X11/StrToText.c
+++ b/nx-X11/lib/src/StrToText.c
diff --git a/nx-X11/lib/X11/Sync.c b/nx-X11/lib/src/Sync.c
index bc768d4f6..bc768d4f6 100644
--- a/nx-X11/lib/X11/Sync.c
+++ b/nx-X11/lib/src/Sync.c
diff --git a/nx-X11/lib/X11/Synchro.c b/nx-X11/lib/src/Synchro.c
index 930448ee9..930448ee9 100644
--- a/nx-X11/lib/X11/Synchro.c
+++ b/nx-X11/lib/src/Synchro.c
diff --git a/nx-X11/lib/X11/Text.c b/nx-X11/lib/src/Text.c
index 223b1cf8b..223b1cf8b 100644
--- a/nx-X11/lib/X11/Text.c
+++ b/nx-X11/lib/src/Text.c
diff --git a/nx-X11/lib/X11/Text16.c b/nx-X11/lib/src/Text16.c
index 008a3f7a5..008a3f7a5 100644
--- a/nx-X11/lib/X11/Text16.c
+++ b/nx-X11/lib/src/Text16.c
diff --git a/nx-X11/lib/X11/TextExt.c b/nx-X11/lib/src/TextExt.c
index b883b01b4..b883b01b4 100644
--- a/nx-X11/lib/X11/TextExt.c
+++ b/nx-X11/lib/src/TextExt.c
diff --git a/nx-X11/lib/X11/TextExt16.c b/nx-X11/lib/src/TextExt16.c
index 01a0f32e4..01a0f32e4 100644
--- a/nx-X11/lib/X11/TextExt16.c
+++ b/nx-X11/lib/src/TextExt16.c
diff --git a/nx-X11/lib/X11/TextToStr.c b/nx-X11/lib/src/TextToStr.c
index 03f71558b..03f71558b 100644
--- a/nx-X11/lib/X11/TextToStr.c
+++ b/nx-X11/lib/src/TextToStr.c
diff --git a/nx-X11/lib/X11/TrCoords.c b/nx-X11/lib/src/TrCoords.c
index 77c1f0672..77c1f0672 100644
--- a/nx-X11/lib/X11/TrCoords.c
+++ b/nx-X11/lib/src/TrCoords.c
diff --git a/nx-X11/lib/X11/UIThrStubs.c b/nx-X11/lib/src/UIThrStubs.c
index 0c913d41f..0c913d41f 100644
--- a/nx-X11/lib/X11/UIThrStubs.c
+++ b/nx-X11/lib/src/UIThrStubs.c
diff --git a/nx-X11/lib/X11/UndefCurs.c b/nx-X11/lib/src/UndefCurs.c
index 1d46ff946..1d46ff946 100644
--- a/nx-X11/lib/X11/UndefCurs.c
+++ b/nx-X11/lib/src/UndefCurs.c
diff --git a/nx-X11/lib/X11/UngrabBut.c b/nx-X11/lib/src/UngrabBut.c
index 13545ed98..13545ed98 100644
--- a/nx-X11/lib/X11/UngrabBut.c
+++ b/nx-X11/lib/src/UngrabBut.c
diff --git a/nx-X11/lib/X11/UngrabKbd.c b/nx-X11/lib/src/UngrabKbd.c
index 974e8a324..974e8a324 100644
--- a/nx-X11/lib/X11/UngrabKbd.c
+++ b/nx-X11/lib/src/UngrabKbd.c
diff --git a/nx-X11/lib/X11/UngrabKey.c b/nx-X11/lib/src/UngrabKey.c
index 919c4e76c..919c4e76c 100644
--- a/nx-X11/lib/X11/UngrabKey.c
+++ b/nx-X11/lib/src/UngrabKey.c
diff --git a/nx-X11/lib/X11/UngrabPtr.c b/nx-X11/lib/src/UngrabPtr.c
index 16417921c..16417921c 100644
--- a/nx-X11/lib/X11/UngrabPtr.c
+++ b/nx-X11/lib/src/UngrabPtr.c
diff --git a/nx-X11/lib/X11/UngrabSvr.c b/nx-X11/lib/src/UngrabSvr.c
index 20ad9aa35..20ad9aa35 100644
--- a/nx-X11/lib/X11/UngrabSvr.c
+++ b/nx-X11/lib/src/UngrabSvr.c
diff --git a/nx-X11/lib/X11/UninsCmap.c b/nx-X11/lib/src/UninsCmap.c
index db574ef7c..db574ef7c 100644
--- a/nx-X11/lib/X11/UninsCmap.c
+++ b/nx-X11/lib/src/UninsCmap.c
diff --git a/nx-X11/lib/X11/UnldFont.c b/nx-X11/lib/src/UnldFont.c
index a4f69fee4..a4f69fee4 100644
--- a/nx-X11/lib/X11/UnldFont.c
+++ b/nx-X11/lib/src/UnldFont.c
diff --git a/nx-X11/lib/X11/UnmapSubs.c b/nx-X11/lib/src/UnmapSubs.c
index 7490a70e9..7490a70e9 100644
--- a/nx-X11/lib/X11/UnmapSubs.c
+++ b/nx-X11/lib/src/UnmapSubs.c
diff --git a/nx-X11/lib/X11/UnmapWin.c b/nx-X11/lib/src/UnmapWin.c
index 51ae16319..51ae16319 100644
--- a/nx-X11/lib/X11/UnmapWin.c
+++ b/nx-X11/lib/src/UnmapWin.c
diff --git a/nx-X11/lib/X11/VisUtil.c b/nx-X11/lib/src/VisUtil.c
index 17ca3631f..17ca3631f 100644
--- a/nx-X11/lib/X11/VisUtil.c
+++ b/nx-X11/lib/src/VisUtil.c
diff --git a/nx-X11/lib/X11/WMGeom.c b/nx-X11/lib/src/WMGeom.c
index 7947536f5..7947536f5 100644
--- a/nx-X11/lib/X11/WMGeom.c
+++ b/nx-X11/lib/src/WMGeom.c
diff --git a/nx-X11/lib/X11/WMProps.c b/nx-X11/lib/src/WMProps.c
index e77f7ba56..e77f7ba56 100644
--- a/nx-X11/lib/X11/WMProps.c
+++ b/nx-X11/lib/src/WMProps.c
diff --git a/nx-X11/lib/X11/WarpPtr.c b/nx-X11/lib/src/WarpPtr.c
index c88ca4704..c88ca4704 100644
--- a/nx-X11/lib/X11/WarpPtr.c
+++ b/nx-X11/lib/src/WarpPtr.c
diff --git a/nx-X11/lib/X11/WinEvent.c b/nx-X11/lib/src/WinEvent.c
index 48801b739..48801b739 100644
--- a/nx-X11/lib/X11/WinEvent.c
+++ b/nx-X11/lib/src/WinEvent.c
diff --git a/nx-X11/lib/X11/Window.c b/nx-X11/lib/src/Window.c
index 85a28f372..85a28f372 100644
--- a/nx-X11/lib/X11/Window.c
+++ b/nx-X11/lib/src/Window.c
diff --git a/nx-X11/lib/X11/Withdraw.c b/nx-X11/lib/src/Withdraw.c
index 9c2280234..9c2280234 100644
--- a/nx-X11/lib/X11/Withdraw.c
+++ b/nx-X11/lib/src/Withdraw.c
diff --git a/nx-X11/lib/X11/WrBitF.c b/nx-X11/lib/src/WrBitF.c
index 47b47208f..47b47208f 100644
--- a/nx-X11/lib/X11/WrBitF.c
+++ b/nx-X11/lib/src/WrBitF.c
diff --git a/nx-X11/lib/X11/XErrorDB b/nx-X11/lib/src/XErrorDB
index 7b6d46513..7b6d46513 100644
--- a/nx-X11/lib/X11/XErrorDB
+++ b/nx-X11/lib/src/XErrorDB
diff --git a/nx-X11/lib/X11/Xatomtype.h b/nx-X11/lib/src/Xatomtype.h
index 1b2b47766..1b2b47766 100644
--- a/nx-X11/lib/X11/Xatomtype.h
+++ b/nx-X11/lib/src/Xatomtype.h
diff --git a/nx-X11/lib/X11/Xintatom.h b/nx-X11/lib/src/Xintatom.h
index b2d307bab..b2d307bab 100644
--- a/nx-X11/lib/X11/Xintatom.h
+++ b/nx-X11/lib/src/Xintatom.h
diff --git a/nx-X11/lib/X11/Xintconn.h b/nx-X11/lib/src/Xintconn.h
index 675f684ac..675f684ac 100644
--- a/nx-X11/lib/X11/Xintconn.h
+++ b/nx-X11/lib/src/Xintconn.h
diff --git a/nx-X11/lib/X11/XlibAsync.c b/nx-X11/lib/src/XlibAsync.c
index 2e528d8b1..2e528d8b1 100644
--- a/nx-X11/lib/X11/XlibAsync.c
+++ b/nx-X11/lib/src/XlibAsync.c
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/src/XlibInt.c
index 5afc65149..5afc65149 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/src/XlibInt.c
diff --git a/nx-X11/lib/X11/XomGeneric.h b/nx-X11/lib/src/XomGeneric.h
index d6f182d19..d6f182d19 100644
--- a/nx-X11/lib/X11/XomGeneric.h
+++ b/nx-X11/lib/src/XomGeneric.h
diff --git a/nx-X11/lib/X11/Xprivate.h b/nx-X11/lib/src/Xprivate.h
index 2dd62ce7d..2dd62ce7d 100644
--- a/nx-X11/lib/X11/Xprivate.h
+++ b/nx-X11/lib/src/Xprivate.h
diff --git a/nx-X11/lib/X11/Xresinternal.h b/nx-X11/lib/src/Xresinternal.h
index c740102b6..c740102b6 100644
--- a/nx-X11/lib/X11/Xresinternal.h
+++ b/nx-X11/lib/src/Xresinternal.h
diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/src/Xrm.c
index e3587d021..e3587d021 100644
--- a/nx-X11/lib/X11/Xrm.c
+++ b/nx-X11/lib/src/Xrm.c
diff --git a/nx-X11/lib/X11/evtomask.c b/nx-X11/lib/src/evtomask.c
index c5dbad262..c5dbad262 100644
--- a/nx-X11/lib/X11/evtomask.c
+++ b/nx-X11/lib/src/evtomask.c
diff --git a/nx-X11/lib/X11/globals.c b/nx-X11/lib/src/globals.c
index efae2f8bb..efae2f8bb 100644
--- a/nx-X11/lib/X11/globals.c
+++ b/nx-X11/lib/src/globals.c
diff --git a/nx-X11/lib/X11/imConv.c b/nx-X11/lib/src/imConv.c
index c3c1974de..c3c1974de 100644
--- a/nx-X11/lib/X11/imConv.c
+++ b/nx-X11/lib/src/imConv.c
diff --git a/nx-X11/lib/X11/locking.c b/nx-X11/lib/src/locking.c
index 9f4fe0677..9f4fe0677 100644
--- a/nx-X11/lib/X11/locking.c
+++ b/nx-X11/lib/src/locking.c
diff --git a/nx-X11/lib/X11/locking.h b/nx-X11/lib/src/locking.h
index 277c9afc8..277c9afc8 100644
--- a/nx-X11/lib/X11/locking.h
+++ b/nx-X11/lib/src/locking.h
diff --git a/nx-X11/lib/X11/pathmax.h b/nx-X11/lib/src/pathmax.h
index 86e65fadf..86e65fadf 100644
--- a/nx-X11/lib/X11/pathmax.h
+++ b/nx-X11/lib/src/pathmax.h
diff --git a/nx-X11/lib/X11/poly.h b/nx-X11/lib/src/poly.h
index e064783d7..e064783d7 100644
--- a/nx-X11/lib/X11/poly.h
+++ b/nx-X11/lib/src/poly.h
diff --git a/nx-X11/lib/src/util/Makefile.am b/nx-X11/lib/src/util/Makefile.am
new file mode 100644
index 000000000..31847cc1a
--- /dev/null
+++ b/nx-X11/lib/src/util/Makefile.am
@@ -0,0 +1,15 @@
+NULL =
+
+noinst_PROGRAMS=makekeys
+
+AM_CFLAGS =					\
+	$(X11_CFLAGS)				\
+	$(CWARNFLAGS)				\
+	$(NULL)
+
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/../exports/include	\
+	$(NULL)
+
+EXTRA_DIST = mkks.sh
diff --git a/nx-X11/lib/X11/util/makekeys.c b/nx-X11/lib/src/util/makekeys.c
index 897b882dc..897b882dc 100644
--- a/nx-X11/lib/X11/util/makekeys.c
+++ b/nx-X11/lib/src/util/makekeys.c
diff --git a/nx-X11/lib/src/util/mkks.sh b/nx-X11/lib/src/util/mkks.sh
new file mode 100644
index 000000000..ab5ca80c9
--- /dev/null
+++ b/nx-X11/lib/src/util/mkks.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cat $* | awk 'BEGIN { \
+    printf "/*\n * This file is generated from %s.  Do not edit.\n */\n", \
+	   "$(INCLUDESRC)/keysymdef.h";\
+} \
+/^#define/ { \
+	len = length($2)-3; \
+	printf("{ \"%s\", %s },\n", substr($2,4,len), $3); \
+}'
diff --git a/nx-X11/lib/X11/utlist.h b/nx-X11/lib/src/utlist.h
index 215c2c62e..215c2c62e 100644
--- a/nx-X11/lib/X11/utlist.h
+++ b/nx-X11/lib/src/utlist.h
diff --git a/nx-X11/lib/X11/x11_trans.c b/nx-X11/lib/src/x11_trans.c
index 40df7b9b1..40df7b9b1 100644
--- a/nx-X11/lib/X11/x11_trans.c
+++ b/nx-X11/lib/src/x11_trans.c
diff --git a/nx-X11/lib/X11/AddDIC.c b/nx-X11/lib/src/xcms/AddDIC.c
index ecc6650ab..ecc6650ab 100644
--- a/nx-X11/lib/X11/AddDIC.c
+++ b/nx-X11/lib/src/xcms/AddDIC.c
diff --git a/nx-X11/lib/X11/AddSF.c b/nx-X11/lib/src/xcms/AddSF.c
index 2e244e73b..2e244e73b 100644
--- a/nx-X11/lib/X11/AddSF.c
+++ b/nx-X11/lib/src/xcms/AddSF.c
diff --git a/nx-X11/lib/X11/CCC.c b/nx-X11/lib/src/xcms/CCC.c
index de6d6318a..de6d6318a 100644
--- a/nx-X11/lib/X11/CCC.c
+++ b/nx-X11/lib/src/xcms/CCC.c
diff --git a/nx-X11/lib/X11/Cv.h b/nx-X11/lib/src/xcms/Cv.h
index 0b662811f..0b662811f 100644
--- a/nx-X11/lib/X11/Cv.h
+++ b/nx-X11/lib/src/xcms/Cv.h
diff --git a/nx-X11/lib/X11/CvColW.c b/nx-X11/lib/src/xcms/CvColW.c
index 4aabded0d..4aabded0d 100644
--- a/nx-X11/lib/X11/CvColW.c
+++ b/nx-X11/lib/src/xcms/CvColW.c
diff --git a/nx-X11/lib/X11/CvCols.c b/nx-X11/lib/src/xcms/CvCols.c
index 87d49311c..87d49311c 100644
--- a/nx-X11/lib/X11/CvCols.c
+++ b/nx-X11/lib/src/xcms/CvCols.c
diff --git a/nx-X11/lib/X11/HVC.c b/nx-X11/lib/src/xcms/HVC.c
index 98d7142c3..98d7142c3 100644
--- a/nx-X11/lib/X11/HVC.c
+++ b/nx-X11/lib/src/xcms/HVC.c
diff --git a/nx-X11/lib/X11/HVCGcC.c b/nx-X11/lib/src/xcms/HVCGcC.c
index 6d52eac63..6d52eac63 100644
--- a/nx-X11/lib/X11/HVCGcC.c
+++ b/nx-X11/lib/src/xcms/HVCGcC.c
diff --git a/nx-X11/lib/X11/HVCGcV.c b/nx-X11/lib/src/xcms/HVCGcV.c
index 0752a0724..0752a0724 100644
--- a/nx-X11/lib/X11/HVCGcV.c
+++ b/nx-X11/lib/src/xcms/HVCGcV.c
diff --git a/nx-X11/lib/X11/HVCGcVC.c b/nx-X11/lib/src/xcms/HVCGcVC.c
index 7ace5f13f..7ace5f13f 100644
--- a/nx-X11/lib/X11/HVCGcVC.c
+++ b/nx-X11/lib/src/xcms/HVCGcVC.c
diff --git a/nx-X11/lib/X11/HVCMnV.c b/nx-X11/lib/src/xcms/HVCMnV.c
index 10a9f857a..10a9f857a 100644
--- a/nx-X11/lib/X11/HVCMnV.c
+++ b/nx-X11/lib/src/xcms/HVCMnV.c
diff --git a/nx-X11/lib/X11/HVCMxC.c b/nx-X11/lib/src/xcms/HVCMxC.c
index 074844ccc..074844ccc 100644
--- a/nx-X11/lib/X11/HVCMxC.c
+++ b/nx-X11/lib/src/xcms/HVCMxC.c
diff --git a/nx-X11/lib/X11/HVCMxV.c b/nx-X11/lib/src/xcms/HVCMxV.c
index d5ef94ec5..d5ef94ec5 100644
--- a/nx-X11/lib/X11/HVCMxV.c
+++ b/nx-X11/lib/src/xcms/HVCMxV.c
diff --git a/nx-X11/lib/X11/HVCMxVC.c b/nx-X11/lib/src/xcms/HVCMxVC.c
index c7e087866..c7e087866 100644
--- a/nx-X11/lib/X11/HVCMxVC.c
+++ b/nx-X11/lib/src/xcms/HVCMxVC.c
diff --git a/nx-X11/lib/X11/HVCMxVs.c b/nx-X11/lib/src/xcms/HVCMxVs.c
index 540e5c2f4..540e5c2f4 100644
--- a/nx-X11/lib/X11/HVCMxVs.c
+++ b/nx-X11/lib/src/xcms/HVCMxVs.c
diff --git a/nx-X11/lib/X11/HVCWpAj.c b/nx-X11/lib/src/xcms/HVCWpAj.c
index dcefe7535..dcefe7535 100644
--- a/nx-X11/lib/X11/HVCWpAj.c
+++ b/nx-X11/lib/src/xcms/HVCWpAj.c
diff --git a/nx-X11/lib/X11/IdOfPr.c b/nx-X11/lib/src/xcms/IdOfPr.c
index 9f43dd387..9f43dd387 100644
--- a/nx-X11/lib/X11/IdOfPr.c
+++ b/nx-X11/lib/src/xcms/IdOfPr.c
diff --git a/nx-X11/lib/X11/LRGB.c b/nx-X11/lib/src/xcms/LRGB.c
index 38cc6cfb4..38cc6cfb4 100644
--- a/nx-X11/lib/X11/LRGB.c
+++ b/nx-X11/lib/src/xcms/LRGB.c
diff --git a/nx-X11/lib/X11/Lab.c b/nx-X11/lib/src/xcms/Lab.c
index 6f7075643..6f7075643 100644
--- a/nx-X11/lib/X11/Lab.c
+++ b/nx-X11/lib/src/xcms/Lab.c
diff --git a/nx-X11/lib/X11/LabGcC.c b/nx-X11/lib/src/xcms/LabGcC.c
index a5ec9f457..a5ec9f457 100644
--- a/nx-X11/lib/X11/LabGcC.c
+++ b/nx-X11/lib/src/xcms/LabGcC.c
diff --git a/nx-X11/lib/X11/LabGcL.c b/nx-X11/lib/src/xcms/LabGcL.c
index 3038b18a8..3038b18a8 100644
--- a/nx-X11/lib/X11/LabGcL.c
+++ b/nx-X11/lib/src/xcms/LabGcL.c
diff --git a/nx-X11/lib/X11/LabGcLC.c b/nx-X11/lib/src/xcms/LabGcLC.c
index 494d34e57..494d34e57 100644
--- a/nx-X11/lib/X11/LabGcLC.c
+++ b/nx-X11/lib/src/xcms/LabGcLC.c
diff --git a/nx-X11/lib/X11/LabMnL.c b/nx-X11/lib/src/xcms/LabMnL.c
index 18ff04cd1..18ff04cd1 100644
--- a/nx-X11/lib/X11/LabMnL.c
+++ b/nx-X11/lib/src/xcms/LabMnL.c
diff --git a/nx-X11/lib/X11/LabMxC.c b/nx-X11/lib/src/xcms/LabMxC.c
index fcadd236a..fcadd236a 100644
--- a/nx-X11/lib/X11/LabMxC.c
+++ b/nx-X11/lib/src/xcms/LabMxC.c
diff --git a/nx-X11/lib/X11/LabMxL.c b/nx-X11/lib/src/xcms/LabMxL.c
index 66ef48481..66ef48481 100644
--- a/nx-X11/lib/X11/LabMxL.c
+++ b/nx-X11/lib/src/xcms/LabMxL.c
diff --git a/nx-X11/lib/X11/LabMxLC.c b/nx-X11/lib/src/xcms/LabMxLC.c
index 8cc089a22..8cc089a22 100644
--- a/nx-X11/lib/X11/LabMxLC.c
+++ b/nx-X11/lib/src/xcms/LabMxLC.c
diff --git a/nx-X11/lib/X11/LabWpAj.c b/nx-X11/lib/src/xcms/LabWpAj.c
index 0559fdee3..0559fdee3 100644
--- a/nx-X11/lib/X11/LabWpAj.c
+++ b/nx-X11/lib/src/xcms/LabWpAj.c
diff --git a/nx-X11/lib/X11/Luv.c b/nx-X11/lib/src/xcms/Luv.c
index 2bce977ea..2bce977ea 100644
--- a/nx-X11/lib/X11/Luv.c
+++ b/nx-X11/lib/src/xcms/Luv.c
diff --git a/nx-X11/lib/X11/LuvGcC.c b/nx-X11/lib/src/xcms/LuvGcC.c
index cadf4a8b2..cadf4a8b2 100644
--- a/nx-X11/lib/X11/LuvGcC.c
+++ b/nx-X11/lib/src/xcms/LuvGcC.c
diff --git a/nx-X11/lib/X11/LuvGcL.c b/nx-X11/lib/src/xcms/LuvGcL.c
index f5b6d99e4..f5b6d99e4 100644
--- a/nx-X11/lib/X11/LuvGcL.c
+++ b/nx-X11/lib/src/xcms/LuvGcL.c
diff --git a/nx-X11/lib/X11/LuvGcLC.c b/nx-X11/lib/src/xcms/LuvGcLC.c
index a9f8cbaf1..a9f8cbaf1 100644
--- a/nx-X11/lib/X11/LuvGcLC.c
+++ b/nx-X11/lib/src/xcms/LuvGcLC.c
diff --git a/nx-X11/lib/X11/LuvMnL.c b/nx-X11/lib/src/xcms/LuvMnL.c
index b873fa652..b873fa652 100644
--- a/nx-X11/lib/X11/LuvMnL.c
+++ b/nx-X11/lib/src/xcms/LuvMnL.c
diff --git a/nx-X11/lib/X11/LuvMxC.c b/nx-X11/lib/src/xcms/LuvMxC.c
index a67251477..a67251477 100644
--- a/nx-X11/lib/X11/LuvMxC.c
+++ b/nx-X11/lib/src/xcms/LuvMxC.c
diff --git a/nx-X11/lib/X11/LuvMxL.c b/nx-X11/lib/src/xcms/LuvMxL.c
index d1d495b08..d1d495b08 100644
--- a/nx-X11/lib/X11/LuvMxL.c
+++ b/nx-X11/lib/src/xcms/LuvMxL.c
diff --git a/nx-X11/lib/X11/LuvMxLC.c b/nx-X11/lib/src/xcms/LuvMxLC.c
index 60b954916..60b954916 100644
--- a/nx-X11/lib/X11/LuvMxLC.c
+++ b/nx-X11/lib/src/xcms/LuvMxLC.c
diff --git a/nx-X11/lib/X11/LuvWpAj.c b/nx-X11/lib/src/xcms/LuvWpAj.c
index aa2a3f462..aa2a3f462 100644
--- a/nx-X11/lib/X11/LuvWpAj.c
+++ b/nx-X11/lib/src/xcms/LuvWpAj.c
diff --git a/nx-X11/lib/src/xcms/Makefile.am b/nx-X11/lib/src/xcms/Makefile.am
new file mode 100644
index 000000000..ba7ab2403
--- /dev/null
+++ b/nx-X11/lib/src/xcms/Makefile.am
@@ -0,0 +1,92 @@
+NULL =
+
+noinst_LTLIBRARIES = libxcms.la
+
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/include/X11		\
+	-I$(top_builddir)/include		\
+	-I$(top_builddir)/include/X11		\
+	-I$(top_srcdir)/src/xcms		\
+	-I$(top_srcdir)/src/xkb			\
+	-I$(top_srcdir)/src/xlibi18n		\
+	-I$(top_srcdir)/src			\
+	-I$(top_srcdir)/../exports/include	\
+	-D_GNU_SOURCE				\
+	-DXCMSDIR=\"$(X11dir)\"			\
+	$(NULL)
+
+AM_CFLAGS =					\
+	$(X11_CFLAGS)				\
+	$(BIGFONT_CFLAGS)			\
+	$(XMALLOC_ZERO_CFLAGS)			\
+	$(CWARNFLAGS)
+
+libxcms_la_SOURCES =				\
+		AddDIC.c			\
+		AddSF.c				\
+		CCC.c				\
+		CvColW.c			\
+		CvCols.c			\
+		HVC.c				\
+		HVCGcC.c			\
+		HVCGcV.c			\
+		HVCGcVC.c			\
+		HVCMnV.c			\
+		HVCMxC.c			\
+		HVCMxV.c			\
+		HVCMxVC.c			\
+		HVCMxVs.c			\
+		HVCWpAj.c			\
+		IdOfPr.c			\
+		LRGB.c				\
+		Lab.c				\
+		LabGcC.c			\
+		LabGcL.c			\
+		LabGcLC.c			\
+		LabMnL.c			\
+		LabMxC.c			\
+		LabMxL.c			\
+		LabMxLC.c			\
+		LabWpAj.c			\
+		Luv.c				\
+		LuvGcC.c			\
+		LuvGcL.c			\
+		LuvGcLC.c			\
+		LuvMnL.c			\
+		LuvMxC.c			\
+		LuvMxL.c			\
+		LuvMxLC.c			\
+		LuvWpAj.c			\
+		OfCCC.c				\
+		PrOfId.c			\
+		QBlack.c			\
+		QBlue.c				\
+		QGreen.c			\
+		QRed.c				\
+		QWhite.c			\
+		QuCol.c				\
+		QuCols.c			\
+		SetCCC.c			\
+		SetGetCols.c			\
+		StCol.c				\
+		StCols.c			\
+		UNDEFINED.c			\
+		XRGB.c				\
+		XYZ.c				\
+		cmsAllCol.c			\
+		cmsAllNCol.c			\
+		cmsCmap.c			\
+		cmsColNm.c			\
+		cmsGlobls.c			\
+		cmsInt.c			\
+		cmsLkCol.c			\
+		cmsMath.c			\
+		cmsProp.c			\
+		cmsTrig.c			\
+		uvY.c				\
+		xyY.c				\
+		$(NULL)
+
+X11dir = $(X11_DATADIR)
+dist_X11_DATA = Xcms.txt
diff --git a/nx-X11/lib/X11/OfCCC.c b/nx-X11/lib/src/xcms/OfCCC.c
index 06fc3d7a1..06fc3d7a1 100644
--- a/nx-X11/lib/X11/OfCCC.c
+++ b/nx-X11/lib/src/xcms/OfCCC.c
diff --git a/nx-X11/lib/X11/PrOfId.c b/nx-X11/lib/src/xcms/PrOfId.c
index a96d28cec..a96d28cec 100644
--- a/nx-X11/lib/X11/PrOfId.c
+++ b/nx-X11/lib/src/xcms/PrOfId.c
diff --git a/nx-X11/lib/X11/QBlack.c b/nx-X11/lib/src/xcms/QBlack.c
index d7a69d399..d7a69d399 100644
--- a/nx-X11/lib/X11/QBlack.c
+++ b/nx-X11/lib/src/xcms/QBlack.c
diff --git a/nx-X11/lib/X11/QBlue.c b/nx-X11/lib/src/xcms/QBlue.c
index 4555344e6..4555344e6 100644
--- a/nx-X11/lib/X11/QBlue.c
+++ b/nx-X11/lib/src/xcms/QBlue.c
diff --git a/nx-X11/lib/X11/QGreen.c b/nx-X11/lib/src/xcms/QGreen.c
index 0c888358a..0c888358a 100644
--- a/nx-X11/lib/X11/QGreen.c
+++ b/nx-X11/lib/src/xcms/QGreen.c
diff --git a/nx-X11/lib/X11/QRed.c b/nx-X11/lib/src/xcms/QRed.c
index 357380d60..357380d60 100644
--- a/nx-X11/lib/X11/QRed.c
+++ b/nx-X11/lib/src/xcms/QRed.c
diff --git a/nx-X11/lib/X11/QWhite.c b/nx-X11/lib/src/xcms/QWhite.c
index 36b764c9d..36b764c9d 100644
--- a/nx-X11/lib/X11/QWhite.c
+++ b/nx-X11/lib/src/xcms/QWhite.c
diff --git a/nx-X11/lib/X11/QuCol.c b/nx-X11/lib/src/xcms/QuCol.c
index b4c1cd33a..b4c1cd33a 100644
--- a/nx-X11/lib/X11/QuCol.c
+++ b/nx-X11/lib/src/xcms/QuCol.c
diff --git a/nx-X11/lib/X11/QuCols.c b/nx-X11/lib/src/xcms/QuCols.c
index 25a38b818..25a38b818 100644
--- a/nx-X11/lib/X11/QuCols.c
+++ b/nx-X11/lib/src/xcms/QuCols.c
diff --git a/nx-X11/lib/X11/SetCCC.c b/nx-X11/lib/src/xcms/SetCCC.c
index e8171b4ea..e8171b4ea 100644
--- a/nx-X11/lib/X11/SetCCC.c
+++ b/nx-X11/lib/src/xcms/SetCCC.c
diff --git a/nx-X11/lib/X11/SetGetCols.c b/nx-X11/lib/src/xcms/SetGetCols.c
index 83fa4c200..83fa4c200 100644
--- a/nx-X11/lib/X11/SetGetCols.c
+++ b/nx-X11/lib/src/xcms/SetGetCols.c
diff --git a/nx-X11/lib/X11/StCol.c b/nx-X11/lib/src/xcms/StCol.c
index 941ad0743..941ad0743 100644
--- a/nx-X11/lib/X11/StCol.c
+++ b/nx-X11/lib/src/xcms/StCol.c
diff --git a/nx-X11/lib/X11/StCols.c b/nx-X11/lib/src/xcms/StCols.c
index 42a29cd7f..42a29cd7f 100644
--- a/nx-X11/lib/X11/StCols.c
+++ b/nx-X11/lib/src/xcms/StCols.c
diff --git a/nx-X11/lib/X11/UNDEFINED.c b/nx-X11/lib/src/xcms/UNDEFINED.c
index 7b1bdb68c..7b1bdb68c 100644
--- a/nx-X11/lib/X11/UNDEFINED.c
+++ b/nx-X11/lib/src/xcms/UNDEFINED.c
diff --git a/nx-X11/lib/X11/XRGB.c b/nx-X11/lib/src/xcms/XRGB.c
index 03f980e99..03f980e99 100644
--- a/nx-X11/lib/X11/XRGB.c
+++ b/nx-X11/lib/src/xcms/XRGB.c
diff --git a/nx-X11/lib/X11/XYZ.c b/nx-X11/lib/src/xcms/XYZ.c
index 826565773..826565773 100644
--- a/nx-X11/lib/X11/XYZ.c
+++ b/nx-X11/lib/src/xcms/XYZ.c
diff --git a/nx-X11/lib/X11/Xcms.txt b/nx-X11/lib/src/xcms/Xcms.txt
index 1c5b1adec..1c5b1adec 100644
--- a/nx-X11/lib/X11/Xcms.txt
+++ b/nx-X11/lib/src/xcms/Xcms.txt
diff --git a/nx-X11/lib/X11/Xcmsint.h b/nx-X11/lib/src/xcms/Xcmsint.h
index 8a2decb11..8a2decb11 100644
--- a/nx-X11/lib/X11/Xcmsint.h
+++ b/nx-X11/lib/src/xcms/Xcmsint.h
diff --git a/nx-X11/lib/X11/cmsAllCol.c b/nx-X11/lib/src/xcms/cmsAllCol.c
index aeea46461..aeea46461 100644
--- a/nx-X11/lib/X11/cmsAllCol.c
+++ b/nx-X11/lib/src/xcms/cmsAllCol.c
diff --git a/nx-X11/lib/X11/cmsAllNCol.c b/nx-X11/lib/src/xcms/cmsAllNCol.c
index d39de6cbd..d39de6cbd 100644
--- a/nx-X11/lib/X11/cmsAllNCol.c
+++ b/nx-X11/lib/src/xcms/cmsAllNCol.c
diff --git a/nx-X11/lib/X11/cmsCmap.c b/nx-X11/lib/src/xcms/cmsCmap.c
index c7087ecb1..c7087ecb1 100644
--- a/nx-X11/lib/X11/cmsCmap.c
+++ b/nx-X11/lib/src/xcms/cmsCmap.c
diff --git a/nx-X11/lib/X11/cmsColNm.c b/nx-X11/lib/src/xcms/cmsColNm.c
index c6f1e0f31..c6f1e0f31 100644
--- a/nx-X11/lib/X11/cmsColNm.c
+++ b/nx-X11/lib/src/xcms/cmsColNm.c
diff --git a/nx-X11/lib/X11/cmsGlobls.c b/nx-X11/lib/src/xcms/cmsGlobls.c
index c9e82f242..c9e82f242 100644
--- a/nx-X11/lib/X11/cmsGlobls.c
+++ b/nx-X11/lib/src/xcms/cmsGlobls.c
diff --git a/nx-X11/lib/X11/cmsInt.c b/nx-X11/lib/src/xcms/cmsInt.c
index f4aef04ff..f4aef04ff 100644
--- a/nx-X11/lib/X11/cmsInt.c
+++ b/nx-X11/lib/src/xcms/cmsInt.c
diff --git a/nx-X11/lib/X11/cmsLkCol.c b/nx-X11/lib/src/xcms/cmsLkCol.c
index 15e987424..15e987424 100644
--- a/nx-X11/lib/X11/cmsLkCol.c
+++ b/nx-X11/lib/src/xcms/cmsLkCol.c
diff --git a/nx-X11/lib/X11/cmsMath.c b/nx-X11/lib/src/xcms/cmsMath.c
index 487eb3f9c..487eb3f9c 100644
--- a/nx-X11/lib/X11/cmsMath.c
+++ b/nx-X11/lib/src/xcms/cmsMath.c
diff --git a/nx-X11/lib/X11/cmsProp.c b/nx-X11/lib/src/xcms/cmsProp.c
index a7aa5b5c5..a7aa5b5c5 100644
--- a/nx-X11/lib/X11/cmsProp.c
+++ b/nx-X11/lib/src/xcms/cmsProp.c
diff --git a/nx-X11/lib/X11/cmsTrig.c b/nx-X11/lib/src/xcms/cmsTrig.c
index b23033aa8..b23033aa8 100644
--- a/nx-X11/lib/X11/cmsTrig.c
+++ b/nx-X11/lib/src/xcms/cmsTrig.c
diff --git a/nx-X11/lib/X11/uvY.c b/nx-X11/lib/src/xcms/uvY.c
index 19e6c5232..19e6c5232 100644
--- a/nx-X11/lib/X11/uvY.c
+++ b/nx-X11/lib/src/xcms/uvY.c
diff --git a/nx-X11/lib/X11/xyY.c b/nx-X11/lib/src/xcms/xyY.c
index e85b8d249..e85b8d249 100644
--- a/nx-X11/lib/X11/xyY.c
+++ b/nx-X11/lib/src/xcms/xyY.c
diff --git a/nx-X11/lib/src/xkb/Makefile.am b/nx-X11/lib/src/xkb/Makefile.am
new file mode 100644
index 000000000..b22eb9fad
--- /dev/null
+++ b/nx-X11/lib/src/xkb/Makefile.am
@@ -0,0 +1,46 @@
+NULL =
+
+noinst_LTLIBRARIES = libxkb.la
+
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/include/X11		\
+	-I$(top_builddir)/include		\
+	-I$(top_builddir)/include/X11		\
+	-I$(top_srcdir)/src/xcms		\
+	-I$(top_srcdir)/src/xkb			\
+	-I$(top_srcdir)/src/xlibi18n		\
+	-I$(top_srcdir)/../exports/include	\
+	-D_GNU_SOURCE				\
+	$(NULL)
+
+AM_CFLAGS =					\
+	$(X11_CFLAGS)				\
+	$(BIGFONT_CFLAGS)			\
+	$(XMALLOC_ZERO_CFLAGS)			\
+	$(CWARNFLAGS)				\
+	$(NULL)
+
+libxkb_la_SOURCES =				\
+	XKB.c					\
+	XKBBind.c				\
+	XKBCompat.c				\
+	XKBCtrls.c				\
+	XKBCvt.c				\
+	XKBGetMap.c				\
+	XKBGetByName.c				\
+	XKBNames.c				\
+	XKBRdBuf.c				\
+	XKBSetMap.c				\
+	XKBUse.c				\
+	XKBleds.c				\
+	XKBBell.c				\
+	XKBGeom.c				\
+	XKBSetGeom.c				\
+	XKBExtDev.c				\
+	XKBList.c				\
+	XKBMisc.c				\
+	XKBMAlloc.c				\
+	XKBGAlloc.c				\
+	XKBAlloc.c				\
+	$(NULL)
diff --git a/nx-X11/lib/X11/XKB.c b/nx-X11/lib/src/xkb/XKB.c
index 6df9c3ebc..6df9c3ebc 100644
--- a/nx-X11/lib/X11/XKB.c
+++ b/nx-X11/lib/src/xkb/XKB.c
diff --git a/nx-X11/lib/X11/XKBAlloc.c b/nx-X11/lib/src/xkb/XKBAlloc.c
index 9c3430c1a..9c3430c1a 100644
--- a/nx-X11/lib/X11/XKBAlloc.c
+++ b/nx-X11/lib/src/xkb/XKBAlloc.c
diff --git a/nx-X11/lib/X11/XKBBell.c b/nx-X11/lib/src/xkb/XKBBell.c
index d3e3a57ff..d3e3a57ff 100644
--- a/nx-X11/lib/X11/XKBBell.c
+++ b/nx-X11/lib/src/xkb/XKBBell.c
diff --git a/nx-X11/lib/X11/XKBBind.c b/nx-X11/lib/src/xkb/XKBBind.c
index c679dc552..c679dc552 100644
--- a/nx-X11/lib/X11/XKBBind.c
+++ b/nx-X11/lib/src/xkb/XKBBind.c
diff --git a/nx-X11/lib/X11/XKBCompat.c b/nx-X11/lib/src/xkb/XKBCompat.c
index a5222b56e..a5222b56e 100644
--- a/nx-X11/lib/X11/XKBCompat.c
+++ b/nx-X11/lib/src/xkb/XKBCompat.c
diff --git a/nx-X11/lib/X11/XKBCtrls.c b/nx-X11/lib/src/xkb/XKBCtrls.c
index 2e8546d92..2e8546d92 100644
--- a/nx-X11/lib/X11/XKBCtrls.c
+++ b/nx-X11/lib/src/xkb/XKBCtrls.c
diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/src/xkb/XKBCvt.c
index c42c3af1c..c42c3af1c 100644
--- a/nx-X11/lib/X11/XKBCvt.c
+++ b/nx-X11/lib/src/xkb/XKBCvt.c
diff --git a/nx-X11/lib/X11/XKBExtDev.c b/nx-X11/lib/src/xkb/XKBExtDev.c
index cb40ecd04..cb40ecd04 100644
--- a/nx-X11/lib/X11/XKBExtDev.c
+++ b/nx-X11/lib/src/xkb/XKBExtDev.c
diff --git a/nx-X11/lib/X11/XKBGAlloc.c b/nx-X11/lib/src/xkb/XKBGAlloc.c
index ab05f8d88..ab05f8d88 100644
--- a/nx-X11/lib/X11/XKBGAlloc.c
+++ b/nx-X11/lib/src/xkb/XKBGAlloc.c
diff --git a/nx-X11/lib/X11/XKBGeom.c b/nx-X11/lib/src/xkb/XKBGeom.c
index f57fe7cf6..f57fe7cf6 100644
--- a/nx-X11/lib/X11/XKBGeom.c
+++ b/nx-X11/lib/src/xkb/XKBGeom.c
diff --git a/nx-X11/lib/X11/XKBGetByName.c b/nx-X11/lib/src/xkb/XKBGetByName.c
index c673781ed..c673781ed 100644
--- a/nx-X11/lib/X11/XKBGetByName.c
+++ b/nx-X11/lib/src/xkb/XKBGetByName.c
diff --git a/nx-X11/lib/X11/XKBGetMap.c b/nx-X11/lib/src/xkb/XKBGetMap.c
index 6e3c74343..6e3c74343 100644
--- a/nx-X11/lib/X11/XKBGetMap.c
+++ b/nx-X11/lib/src/xkb/XKBGetMap.c
diff --git a/nx-X11/lib/X11/XKBList.c b/nx-X11/lib/src/xkb/XKBList.c
index d3d29e2a6..d3d29e2a6 100644
--- a/nx-X11/lib/X11/XKBList.c
+++ b/nx-X11/lib/src/xkb/XKBList.c
diff --git a/nx-X11/lib/X11/XKBMAlloc.c b/nx-X11/lib/src/xkb/XKBMAlloc.c
index 2467a2024..2467a2024 100644
--- a/nx-X11/lib/X11/XKBMAlloc.c
+++ b/nx-X11/lib/src/xkb/XKBMAlloc.c
diff --git a/nx-X11/lib/X11/XKBMisc.c b/nx-X11/lib/src/xkb/XKBMisc.c
index ab48b6124..ab48b6124 100644
--- a/nx-X11/lib/X11/XKBMisc.c
+++ b/nx-X11/lib/src/xkb/XKBMisc.c
diff --git a/nx-X11/lib/X11/XKBNames.c b/nx-X11/lib/src/xkb/XKBNames.c
index 951fd1da8..951fd1da8 100644
--- a/nx-X11/lib/X11/XKBNames.c
+++ b/nx-X11/lib/src/xkb/XKBNames.c
diff --git a/nx-X11/lib/X11/XKBRdBuf.c b/nx-X11/lib/src/xkb/XKBRdBuf.c
index 381f4c900..381f4c900 100644
--- a/nx-X11/lib/X11/XKBRdBuf.c
+++ b/nx-X11/lib/src/xkb/XKBRdBuf.c
diff --git a/nx-X11/lib/X11/XKBSetGeom.c b/nx-X11/lib/src/xkb/XKBSetGeom.c
index ee254e0dc..ee254e0dc 100644
--- a/nx-X11/lib/X11/XKBSetGeom.c
+++ b/nx-X11/lib/src/xkb/XKBSetGeom.c
diff --git a/nx-X11/lib/X11/XKBSetMap.c b/nx-X11/lib/src/xkb/XKBSetMap.c
index cb696105c..cb696105c 100644
--- a/nx-X11/lib/X11/XKBSetMap.c
+++ b/nx-X11/lib/src/xkb/XKBSetMap.c
diff --git a/nx-X11/lib/X11/XKBUse.c b/nx-X11/lib/src/xkb/XKBUse.c
index cf6497551..cf6497551 100644
--- a/nx-X11/lib/X11/XKBUse.c
+++ b/nx-X11/lib/src/xkb/XKBUse.c
diff --git a/nx-X11/lib/X11/XKBleds.c b/nx-X11/lib/src/xkb/XKBleds.c
index c098ee948..c098ee948 100644
--- a/nx-X11/lib/X11/XKBleds.c
+++ b/nx-X11/lib/src/xkb/XKBleds.c
diff --git a/nx-X11/lib/X11/XKBlibint.h b/nx-X11/lib/src/xkb/XKBlibint.h
index dad48b703..dad48b703 100644
--- a/nx-X11/lib/X11/XKBlibint.h
+++ b/nx-X11/lib/src/xkb/XKBlibint.h
diff --git a/nx-X11/lib/X11/ICWrap.c b/nx-X11/lib/src/xlibi18n/ICWrap.c
index 69f080d87..69f080d87 100644
--- a/nx-X11/lib/X11/ICWrap.c
+++ b/nx-X11/lib/src/xlibi18n/ICWrap.c
diff --git a/nx-X11/lib/X11/IMWrap.c b/nx-X11/lib/src/xlibi18n/IMWrap.c
index a7c1d98c1..a7c1d98c1 100644
--- a/nx-X11/lib/X11/IMWrap.c
+++ b/nx-X11/lib/src/xlibi18n/IMWrap.c
diff --git a/nx-X11/lib/src/xlibi18n/Makefile.am b/nx-X11/lib/src/xlibi18n/Makefile.am
new file mode 100644
index 000000000..a6f42baf4
--- /dev/null
+++ b/nx-X11/lib/src/xlibi18n/Makefile.am
@@ -0,0 +1,72 @@
+NULL =
+
+noinst_LTLIBRARIES = libi18n.la
+
+AM_CPPFLAGS =							\
+	-I$(top_srcdir)/include					\
+	-I$(top_srcdir)/include/X11				\
+	-I$(top_builddir)/include				\
+	-I$(top_builddir)/include/X11				\
+	-I$(top_srcdir)/src/xcms				\
+	-I$(top_srcdir)/src/xkb					\
+	-I$(top_srcdir)/src/xlibi18n				\
+	-I$(top_srcdir)/src					\
+	-I$(top_srcdir)/../exports/include			\
+	-D_GNU_SOURCE						\
+	$(NULL)
+
+AM_CFLAGS =							\
+	$(X11_CFLAGS)						\
+	$(BIGFONT_CFLAGS)					\
+	$(XMALLOC_ZERO_CFLAGS)					\
+	$(CWARNFLAGS)						\
+	$(NULL)
+
+IM_LIBS =							\
+	${top_builddir}/modules/im/ximcp/libximcp.la		\
+	$(NULL)
+
+LC_LIBS =							\
+	${top_builddir}/modules/lc/def/libxlcDef.la		\
+	${top_builddir}/modules/lc/gen/libxlibi18n.la		\
+	${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la	\
+	$(NULL)
+
+OM_LIBS =							\
+	${top_builddir}/modules/om/generic/libxomGeneric.la	\
+	$(NULL)
+
+libi18n_la_LIBADD =						\
+	$(IM_LIBS)						\
+	$(LC_LIBS)						\
+	$(OM_LIBS)						\
+	$(NULL)
+
+libi18n_la_SOURCES =						\
+	$(XI18N_DL_SOURCES)					\
+	xim_trans.c						\
+	ICWrap.c						\
+	IMWrap.c						\
+	imKStoUCS.c						\
+	lcCT.c							\
+	lcCharSet.c						\
+	lcConv.c						\
+	lcDB.c							\
+	lcFile.c						\
+	lcGeneric.c						\
+	lcInit.c						\
+	lcPrTxt.c						\
+	lcPubWrap.c						\
+	lcPublic.c						\
+	lcRM.c							\
+	lcStd.c							\
+	lcTxtPr.c						\
+	lcUTF8.c						\
+	lcUtil.c						\
+	lcWrap.c						\
+	mbWMProps.c						\
+	mbWrap.c						\
+	utf8WMProps.c						\
+	utf8Wrap.c						\
+	wcWrap.c						\
+	$(NULL)
diff --git a/nx-X11/lib/X11/XimImSw.h b/nx-X11/lib/src/xlibi18n/XimImSw.h
index e3a962552..e3a962552 100644
--- a/nx-X11/lib/X11/XimImSw.h
+++ b/nx-X11/lib/src/xlibi18n/XimImSw.h
diff --git a/nx-X11/lib/X11/XimProto.h b/nx-X11/lib/src/xlibi18n/XimProto.h
index 6b0096dd6..6b0096dd6 100644
--- a/nx-X11/lib/X11/XimProto.h
+++ b/nx-X11/lib/src/xlibi18n/XimProto.h
diff --git a/nx-X11/lib/X11/XimThai.h b/nx-X11/lib/src/xlibi18n/XimThai.h
index 7cc238311..7cc238311 100644
--- a/nx-X11/lib/X11/XimThai.h
+++ b/nx-X11/lib/src/xlibi18n/XimThai.h
diff --git a/nx-X11/lib/X11/XimTrInt.h b/nx-X11/lib/src/xlibi18n/XimTrInt.h
index bceab9886..bceab9886 100644
--- a/nx-X11/lib/X11/XimTrInt.h
+++ b/nx-X11/lib/src/xlibi18n/XimTrInt.h
diff --git a/nx-X11/lib/X11/XimTrX.h b/nx-X11/lib/src/xlibi18n/XimTrX.h
index 198d5fa5f..198d5fa5f 100644
--- a/nx-X11/lib/X11/XimTrX.h
+++ b/nx-X11/lib/src/xlibi18n/XimTrX.h
diff --git a/nx-X11/lib/X11/XimTrans.h b/nx-X11/lib/src/xlibi18n/XimTrans.h
index 8c3aa829a..8c3aa829a 100644
--- a/nx-X11/lib/X11/XimTrans.h
+++ b/nx-X11/lib/src/xlibi18n/XimTrans.h
diff --git a/nx-X11/lib/X11/Ximint.h b/nx-X11/lib/src/xlibi18n/Ximint.h
index 9550c6851..9550c6851 100644
--- a/nx-X11/lib/X11/Ximint.h
+++ b/nx-X11/lib/src/xlibi18n/Ximint.h
diff --git a/nx-X11/lib/X11/XimintL.h b/nx-X11/lib/src/xlibi18n/XimintL.h
index d2d92387f..d2d92387f 100644
--- a/nx-X11/lib/X11/XimintL.h
+++ b/nx-X11/lib/src/xlibi18n/XimintL.h
diff --git a/nx-X11/lib/X11/XimintP.h b/nx-X11/lib/src/xlibi18n/XimintP.h
index 14a7e6d5a..14a7e6d5a 100644
--- a/nx-X11/lib/X11/XimintP.h
+++ b/nx-X11/lib/src/xlibi18n/XimintP.h
diff --git a/nx-X11/lib/X11/XlcGeneric.h b/nx-X11/lib/src/xlibi18n/XlcGeneric.h
index 0c008fdaa..0c008fdaa 100644
--- a/nx-X11/lib/X11/XlcGeneric.h
+++ b/nx-X11/lib/src/xlibi18n/XlcGeneric.h
diff --git a/nx-X11/lib/X11/XlcPubI.h b/nx-X11/lib/src/xlibi18n/XlcPubI.h
index c454c7ddd..c454c7ddd 100644
--- a/nx-X11/lib/X11/XlcPubI.h
+++ b/nx-X11/lib/src/xlibi18n/XlcPubI.h
diff --git a/nx-X11/lib/X11/XlcPublic.h b/nx-X11/lib/src/xlibi18n/XlcPublic.h
index 3d94ef37d..3d94ef37d 100644
--- a/nx-X11/lib/X11/XlcPublic.h
+++ b/nx-X11/lib/src/xlibi18n/XlcPublic.h
diff --git a/nx-X11/lib/X11/Xlcint.h b/nx-X11/lib/src/xlibi18n/Xlcint.h
index 5a6205a1f..5a6205a1f 100644
--- a/nx-X11/lib/X11/Xlcint.h
+++ b/nx-X11/lib/src/xlibi18n/Xlcint.h
diff --git a/nx-X11/lib/X11/imKStoUCS.c b/nx-X11/lib/src/xlibi18n/imKStoUCS.c
index 640b3516a..640b3516a 100644
--- a/nx-X11/lib/X11/imKStoUCS.c
+++ b/nx-X11/lib/src/xlibi18n/imKStoUCS.c
diff --git a/nx-X11/lib/X11/lcCT.c b/nx-X11/lib/src/xlibi18n/lcCT.c
index 6e3f21e92..6e3f21e92 100644
--- a/nx-X11/lib/X11/lcCT.c
+++ b/nx-X11/lib/src/xlibi18n/lcCT.c
diff --git a/nx-X11/lib/X11/lcCharSet.c b/nx-X11/lib/src/xlibi18n/lcCharSet.c
index 0adf0adfc..0adf0adfc 100644
--- a/nx-X11/lib/X11/lcCharSet.c
+++ b/nx-X11/lib/src/xlibi18n/lcCharSet.c
diff --git a/nx-X11/lib/X11/lcConv.c b/nx-X11/lib/src/xlibi18n/lcConv.c
index 7d9a4738c..7d9a4738c 100644
--- a/nx-X11/lib/X11/lcConv.c
+++ b/nx-X11/lib/src/xlibi18n/lcConv.c
diff --git a/nx-X11/lib/X11/lcDB.c b/nx-X11/lib/src/xlibi18n/lcDB.c
index cc14bed72..cc14bed72 100644
--- a/nx-X11/lib/X11/lcDB.c
+++ b/nx-X11/lib/src/xlibi18n/lcDB.c
diff --git a/nx-X11/lib/X11/lcFile.c b/nx-X11/lib/src/xlibi18n/lcFile.c
index cf03a90a7..cf03a90a7 100644
--- a/nx-X11/lib/X11/lcFile.c
+++ b/nx-X11/lib/src/xlibi18n/lcFile.c
diff --git a/nx-X11/lib/X11/lcGeneric.c b/nx-X11/lib/src/xlibi18n/lcGeneric.c
index 58ee5d27c..58ee5d27c 100644
--- a/nx-X11/lib/X11/lcGeneric.c
+++ b/nx-X11/lib/src/xlibi18n/lcGeneric.c
diff --git a/nx-X11/lib/X11/lcInit.c b/nx-X11/lib/src/xlibi18n/lcInit.c
index e3092f77d..e3092f77d 100644
--- a/nx-X11/lib/X11/lcInit.c
+++ b/nx-X11/lib/src/xlibi18n/lcInit.c
diff --git a/nx-X11/lib/X11/lcPrTxt.c b/nx-X11/lib/src/xlibi18n/lcPrTxt.c
index e62e94e80..e62e94e80 100644
--- a/nx-X11/lib/X11/lcPrTxt.c
+++ b/nx-X11/lib/src/xlibi18n/lcPrTxt.c
diff --git a/nx-X11/lib/X11/lcPubWrap.c b/nx-X11/lib/src/xlibi18n/lcPubWrap.c
index 3119918c6..3119918c6 100644
--- a/nx-X11/lib/X11/lcPubWrap.c
+++ b/nx-X11/lib/src/xlibi18n/lcPubWrap.c
diff --git a/nx-X11/lib/X11/lcPublic.c b/nx-X11/lib/src/xlibi18n/lcPublic.c
index 98a7435fd..98a7435fd 100644
--- a/nx-X11/lib/X11/lcPublic.c
+++ b/nx-X11/lib/src/xlibi18n/lcPublic.c
diff --git a/nx-X11/lib/X11/lcRM.c b/nx-X11/lib/src/xlibi18n/lcRM.c
index bdc20f21d..bdc20f21d 100644
--- a/nx-X11/lib/X11/lcRM.c
+++ b/nx-X11/lib/src/xlibi18n/lcRM.c
diff --git a/nx-X11/lib/X11/lcStd.c b/nx-X11/lib/src/xlibi18n/lcStd.c
index 9d452bcae..9d452bcae 100644
--- a/nx-X11/lib/X11/lcStd.c
+++ b/nx-X11/lib/src/xlibi18n/lcStd.c
diff --git a/nx-X11/lib/X11/lcTxtPr.c b/nx-X11/lib/src/xlibi18n/lcTxtPr.c
index cf25e3d0e..cf25e3d0e 100644
--- a/nx-X11/lib/X11/lcTxtPr.c
+++ b/nx-X11/lib/src/xlibi18n/lcTxtPr.c
diff --git a/nx-X11/lib/X11/lcUTF8.c b/nx-X11/lib/src/xlibi18n/lcUTF8.c
index 5899338f1..5899338f1 100644
--- a/nx-X11/lib/X11/lcUTF8.c
+++ b/nx-X11/lib/src/xlibi18n/lcUTF8.c
diff --git a/nx-X11/lib/X11/lcUniConv/armscii_8.h b/nx-X11/lib/src/xlibi18n/lcUniConv/armscii_8.h
index 567bfeac2..567bfeac2 100644
--- a/nx-X11/lib/X11/lcUniConv/armscii_8.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/armscii_8.h
diff --git a/nx-X11/lib/X11/lcUniConv/big5.h b/nx-X11/lib/src/xlibi18n/lcUniConv/big5.h
index db439088b..db439088b 100644
--- a/nx-X11/lib/X11/lcUniConv/big5.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/big5.h
diff --git a/nx-X11/lib/X11/lcUniConv/big5_emacs.h b/nx-X11/lib/src/xlibi18n/lcUniConv/big5_emacs.h
index 246aebeb4..246aebeb4 100644
--- a/nx-X11/lib/X11/lcUniConv/big5_emacs.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/big5_emacs.h
diff --git a/nx-X11/lib/X11/lcUniConv/big5hkscs.h b/nx-X11/lib/src/xlibi18n/lcUniConv/big5hkscs.h
index 721d1228e..721d1228e 100644
--- a/nx-X11/lib/X11/lcUniConv/big5hkscs.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/big5hkscs.h
diff --git a/nx-X11/lib/X11/lcUniConv/cp1133.h b/nx-X11/lib/src/xlibi18n/lcUniConv/cp1133.h
index cf79b7aa1..cf79b7aa1 100644
--- a/nx-X11/lib/X11/lcUniConv/cp1133.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/cp1133.h
diff --git a/nx-X11/lib/X11/lcUniConv/cp1251.h b/nx-X11/lib/src/xlibi18n/lcUniConv/cp1251.h
index 8c0847a0c..8c0847a0c 100644
--- a/nx-X11/lib/X11/lcUniConv/cp1251.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/cp1251.h
diff --git a/nx-X11/lib/X11/lcUniConv/cp1255.h b/nx-X11/lib/src/xlibi18n/lcUniConv/cp1255.h
index 61b2b59d7..61b2b59d7 100644
--- a/nx-X11/lib/X11/lcUniConv/cp1255.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/cp1255.h
diff --git a/nx-X11/lib/X11/lcUniConv/cp1256.h b/nx-X11/lib/src/xlibi18n/lcUniConv/cp1256.h
index 72284f4c1..72284f4c1 100644
--- a/nx-X11/lib/X11/lcUniConv/cp1256.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/cp1256.h
diff --git a/nx-X11/lib/X11/lcUniConv/gb2312.h b/nx-X11/lib/src/xlibi18n/lcUniConv/gb2312.h
index 2eec308d2..2eec308d2 100644
--- a/nx-X11/lib/X11/lcUniConv/gb2312.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/gb2312.h
diff --git a/nx-X11/lib/X11/lcUniConv/gbk.h b/nx-X11/lib/src/xlibi18n/lcUniConv/gbk.h
index 09c2e63ee..09c2e63ee 100644
--- a/nx-X11/lib/X11/lcUniConv/gbk.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/gbk.h
diff --git a/nx-X11/lib/X11/lcUniConv/georgian_academy.h b/nx-X11/lib/src/xlibi18n/lcUniConv/georgian_academy.h
index 0e4350461..0e4350461 100644
--- a/nx-X11/lib/X11/lcUniConv/georgian_academy.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/georgian_academy.h
diff --git a/nx-X11/lib/X11/lcUniConv/georgian_ps.h b/nx-X11/lib/src/xlibi18n/lcUniConv/georgian_ps.h
index b96c491df..b96c491df 100644
--- a/nx-X11/lib/X11/lcUniConv/georgian_ps.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/georgian_ps.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_1.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_1.h
index fc302bb44..fc302bb44 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_1.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_1.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_10.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_10.h
index 508db5758..508db5758 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_10.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_10.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_11.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_11.h
index 5458da514..5458da514 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_11.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_11.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_13.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_13.h
index c041b154a..c041b154a 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_13.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_13.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_14.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_14.h
index f01581492..f01581492 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_14.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_14.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_15.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_15.h
index 631d9b5e2..631d9b5e2 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_15.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_15.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_16.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_16.h
index 99a54d98f..99a54d98f 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_16.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_16.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_2.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_2.h
index a63d00424..a63d00424 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_2.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_2.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_3.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_3.h
index 2282f19cf..2282f19cf 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_3.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_3.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_4.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_4.h
index 878a7e44a..878a7e44a 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_4.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_4.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_5.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_5.h
index cdd6c45db..cdd6c45db 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_5.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_5.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_6.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_6.h
index 4c80a64f5..4c80a64f5 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_6.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_6.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_7.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_7.h
index 9b500e4b3..9b500e4b3 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_7.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_7.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_8.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_8.h
index 152dc3cae..152dc3cae 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_8.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_8.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_9.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9.h
index b94ac9de6..b94ac9de6 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_9.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9.h
diff --git a/nx-X11/lib/X11/lcUniConv/iso8859_9e.h b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9e.h
index cbab5816c..cbab5816c 100644
--- a/nx-X11/lib/X11/lcUniConv/iso8859_9e.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9e.h
diff --git a/nx-X11/lib/X11/lcUniConv/jisx0201.h b/nx-X11/lib/src/xlibi18n/lcUniConv/jisx0201.h
index e4af9666f..e4af9666f 100644
--- a/nx-X11/lib/X11/lcUniConv/jisx0201.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/jisx0201.h
diff --git a/nx-X11/lib/X11/lcUniConv/jisx0208.h b/nx-X11/lib/src/xlibi18n/lcUniConv/jisx0208.h
index 5888f6f21..5888f6f21 100644
--- a/nx-X11/lib/X11/lcUniConv/jisx0208.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/jisx0208.h
diff --git a/nx-X11/lib/X11/lcUniConv/jisx0212.h b/nx-X11/lib/src/xlibi18n/lcUniConv/jisx0212.h
index 05cca5203..05cca5203 100644
--- a/nx-X11/lib/X11/lcUniConv/jisx0212.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/jisx0212.h
diff --git a/nx-X11/lib/X11/lcUniConv/koi8_c.h b/nx-X11/lib/src/xlibi18n/lcUniConv/koi8_c.h
index d870a01db..d870a01db 100644
--- a/nx-X11/lib/X11/lcUniConv/koi8_c.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/koi8_c.h
diff --git a/nx-X11/lib/X11/lcUniConv/koi8_r.h b/nx-X11/lib/src/xlibi18n/lcUniConv/koi8_r.h
index 37ca594f6..37ca594f6 100644
--- a/nx-X11/lib/X11/lcUniConv/koi8_r.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/koi8_r.h
diff --git a/nx-X11/lib/X11/lcUniConv/koi8_u.h b/nx-X11/lib/src/xlibi18n/lcUniConv/koi8_u.h
index e094419bc..e094419bc 100644
--- a/nx-X11/lib/X11/lcUniConv/koi8_u.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/koi8_u.h
diff --git a/nx-X11/lib/X11/lcUniConv/ksc5601.h b/nx-X11/lib/src/xlibi18n/lcUniConv/ksc5601.h
index 843dcff19..843dcff19 100644
--- a/nx-X11/lib/X11/lcUniConv/ksc5601.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/ksc5601.h
diff --git a/nx-X11/lib/X11/lcUniConv/mulelao.h b/nx-X11/lib/src/xlibi18n/lcUniConv/mulelao.h
index 5b8245762..5b8245762 100644
--- a/nx-X11/lib/X11/lcUniConv/mulelao.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/mulelao.h
diff --git a/nx-X11/lib/X11/lcUniConv/tatar_cyr.h b/nx-X11/lib/src/xlibi18n/lcUniConv/tatar_cyr.h
index 471e5a79a..471e5a79a 100644
--- a/nx-X11/lib/X11/lcUniConv/tatar_cyr.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/tatar_cyr.h
diff --git a/nx-X11/lib/X11/lcUniConv/tcvn.h b/nx-X11/lib/src/xlibi18n/lcUniConv/tcvn.h
index 4662683dc..4662683dc 100644
--- a/nx-X11/lib/X11/lcUniConv/tcvn.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/tcvn.h
diff --git a/nx-X11/lib/X11/lcUniConv/tis620.h b/nx-X11/lib/src/xlibi18n/lcUniConv/tis620.h
index 4fa96ec98..4fa96ec98 100644
--- a/nx-X11/lib/X11/lcUniConv/tis620.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/tis620.h
diff --git a/nx-X11/lib/X11/lcUniConv/ucs2be.h b/nx-X11/lib/src/xlibi18n/lcUniConv/ucs2be.h
index 20a8b27bd..20a8b27bd 100644
--- a/nx-X11/lib/X11/lcUniConv/ucs2be.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/ucs2be.h
diff --git a/nx-X11/lib/X11/lcUniConv/utf8.h b/nx-X11/lib/src/xlibi18n/lcUniConv/utf8.h
index d00995ca0..d00995ca0 100644
--- a/nx-X11/lib/X11/lcUniConv/utf8.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/utf8.h
diff --git a/nx-X11/lib/X11/lcUniConv/viscii.h b/nx-X11/lib/src/xlibi18n/lcUniConv/viscii.h
index d5147e81e..d5147e81e 100644
--- a/nx-X11/lib/X11/lcUniConv/viscii.h
+++ b/nx-X11/lib/src/xlibi18n/lcUniConv/viscii.h
diff --git a/nx-X11/lib/X11/lcUtil.c b/nx-X11/lib/src/xlibi18n/lcUtil.c
index 52a16daea..52a16daea 100644
--- a/nx-X11/lib/X11/lcUtil.c
+++ b/nx-X11/lib/src/xlibi18n/lcUtil.c
diff --git a/nx-X11/lib/X11/lcWrap.c b/nx-X11/lib/src/xlibi18n/lcWrap.c
index 067c501ba..067c501ba 100644
--- a/nx-X11/lib/X11/lcWrap.c
+++ b/nx-X11/lib/src/xlibi18n/lcWrap.c
diff --git a/nx-X11/lib/X11/mbWMProps.c b/nx-X11/lib/src/xlibi18n/mbWMProps.c
index 9fb57faca..9fb57faca 100644
--- a/nx-X11/lib/X11/mbWMProps.c
+++ b/nx-X11/lib/src/xlibi18n/mbWMProps.c
diff --git a/nx-X11/lib/X11/mbWrap.c b/nx-X11/lib/src/xlibi18n/mbWrap.c
index 766b8da01..766b8da01 100644
--- a/nx-X11/lib/X11/mbWrap.c
+++ b/nx-X11/lib/src/xlibi18n/mbWrap.c
diff --git a/nx-X11/lib/X11/utf8WMProps.c b/nx-X11/lib/src/xlibi18n/utf8WMProps.c
index 09d643377..09d643377 100644
--- a/nx-X11/lib/X11/utf8WMProps.c
+++ b/nx-X11/lib/src/xlibi18n/utf8WMProps.c
diff --git a/nx-X11/lib/X11/utf8Wrap.c b/nx-X11/lib/src/xlibi18n/utf8Wrap.c
index 24cb4494c..24cb4494c 100644
--- a/nx-X11/lib/X11/utf8Wrap.c
+++ b/nx-X11/lib/src/xlibi18n/utf8Wrap.c
diff --git a/nx-X11/lib/X11/wcWrap.c b/nx-X11/lib/src/xlibi18n/wcWrap.c
index cc3b33f7d..cc3b33f7d 100644
--- a/nx-X11/lib/X11/wcWrap.c
+++ b/nx-X11/lib/src/xlibi18n/wcWrap.c
diff --git a/nx-X11/lib/X11/xim_trans.c b/nx-X11/lib/src/xlibi18n/xim_trans.c
index 928038ae2..928038ae2 100644
--- a/nx-X11/lib/X11/xim_trans.c
+++ b/nx-X11/lib/src/xlibi18n/xim_trans.c
diff --git a/nx-X11/lib/xtrans/Imakefile b/nx-X11/lib/xtrans/Imakefile
deleted file mode 100644
index 70716bb90..000000000
--- a/nx-X11/lib/xtrans/Imakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#define IncSubdir nx-X11
-
-all::
-
-DEFINES = $(FAILDEFINES)
-
-# Since xtrans source is #include'd into software that uses it, we install
-# the .c files as if they were headers.
-HEADERS = \
-	Xtrans.h \
-	Xtrans.c \
-	Xtransint.h \
-	Xtranslcl.c \
-	Xtranssock.c \
-	Xtransutil.c \
-	transport.c
-
-DependTarget()
-BuildIncludes($(HEADERS),IncSubdir/Xtrans,../..)