Janitor: ansification, make distcheck, compiler warnings.

  Only convert to use "ansi prototypes" the functions warned from
compilation with "./autogen.sh --prefix=/usr", on a Linux computer.

  Also, only address "trivial" compiler warning fixes in this commit.

  The new .gitignore is the output of a command like:
% find . -name .gitignore -exec cat {} \; | sort | uniq
and only the toplevel .gitignore file was kept.

108 files changed, 149 insertions, 684 deletions

diff --git a/.gitignore b/.gitignore
index c9511699..539bd4d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,61 @@
+*~
+*.3*
+*.a
 aclocal.m4
 autom4te.cache
+build*
 ChangeLog
 compile
+Compose
+compose.dir
+compose.dir.l1
+compose.dir.l2
 config.guess
+config.h
+config.h.in
 config.log
 config.status
 config.sub
 configure
 configure.lineno
+cscope*
 depcomp
+.deps
 doltcompile
 doltlibtool
+force
 install-sh
+ks_tables.h
+*.la
+.libs
 libtool
+libX11-*
+*.lo
+local
+locale.alias
+locale.alias.l1
+locale.alias.l2
+locale.dir
+locale.dir.l1
+locale.dir.l2
 ltmain.sh
 Makefile
 Makefile.in
+makekeys
 MakeOut
 missing
 mkinstalldirs
-x11.pc
-x11-xcb.pc
-*~
-libX11-*
-local
-TAGS
-tags
-.deps
-.libs
+*.mode1v3
 .msg
-*.lo
-*.la
-*.a
 *.o
-*~
-.*sw?
-*.pbxuser
-*.mode1v3
 obj*
-build*
-cscope*
+*.pbxuser
+stamp-h1
+stamp-h2
+.*sw?
+tags
+TAGS
+x11.pc
+x11-xcb.pc
+XLC_LOCALE
+XlibConf.h
diff --git a/Makefile.am b/Makefile.am
index 5baa6c80..4fcad1c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ if XCB
 pkgconfig_DATA += x11-xcb.pc
 endif
 
-EXTRA_DIST=x11.pc.in x11-xcb.pc.in ChangeLog autogen.sh
+EXTRA_DIST=x11.pc.in x11-xcb.pc.in ChangeLog
 
 MAINTAINERCLEANFILES=ChangeLog
 DISTCLEANFILES = doltcompile doltlibtool
@@ -19,7 +19,7 @@ DISTCLEANFILES = doltcompile doltlibtool
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
 
diff --git a/configure.ac b/configure.ac
index a90e384b..bbc394ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,14 +14,15 @@ AM_MAINTAINER_MODE
 AM_CONFIG_HEADER([src/config.h])
 AC_CONFIG_HEADER([include/X11/XlibConf.h])
 
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 
 # Checks for programs.
 AC_PROG_LIBTOOL
 DOLT
 AC_PROG_CC
+XORG_CWARNFLAGS
 
 if test x"$CC_FOR_BUILD" = x; then
 	if test x"$cross_compiling" = xyes; then
@@ -380,8 +381,7 @@ X11_LIBDIR="${libdir}/X11"
 AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
 AC_SUBST(X11_LIBDIR)
 
-X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS"
-
+X11_CFLAGS="$CWARNFLAGS $X11_CFLAGS $XPROTO_CFLAGS"
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
@@ -414,6 +414,7 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
 
 XORG_CHECK_MALLOC_ZERO
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            include/Makefile
diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/include/X11/.gitignore b/include/X11/.gitignore
deleted file mode 100644
index 7b5ed54c..00000000
--- a/include/X11/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-stamp-h2
-XlibConf.h
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 38b14ab5..00000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.3*
-Makefile
-Makefile.in
diff --git a/modules/.gitignore b/modules/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/modules/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/modules/im/.gitignore b/modules/im/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/modules/im/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/modules/im/ximcp/.gitignore b/modules/im/ximcp/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/modules/im/ximcp/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index 7909e937..33c431a1 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -893,13 +893,8 @@ _Ximctsconvert(
 }
 
 Public int
-_Ximctstombs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    char	*to;
-    int		 to_len;
-    Status	*state;
+_Ximctstombs(XIM xim, char *from, int from_len,
+	     char *to, int to_len, Status *state)
 {
     return _Ximctsconvert(((Xim)xim)->private.proto.ctom_conv,
 			  from, from_len, to, to_len, state);
diff --git a/modules/im/ximcp/imDispch.c b/modules/im/ximcp/imDispch.c
index b79df4ad..6b877880 100644
--- a/modules/im/ximcp/imDispch.c
+++ b/modules/im/ximcp/imDispch.c
@@ -63,8 +63,7 @@ _XimRegProtoIntrCallback(
 }
 
 Public void
-_XimFreeProtoIntrCallback(im)
-    Xim		im;
+_XimFreeProtoIntrCallback(Xim im)
 {
     register XimProtoIntrRec *rec, *next;
 
@@ -99,8 +98,7 @@ _XimTransportIntr(
 }
 
 Public Bool
-_XimDispatchInit(im)
-    Xim		 im;
+_XimDispatchInit(Xim im)
 {
     if (_XimRegisterDispatcher(im, _XimTransportIntr, (XPointer)im))
 	return True;
diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c
index ac39f9df..3f384f45 100644
--- a/modules/im/ximcp/imInsClbk.c
+++ b/modules/im/ximcp/imInsClbk.c
@@ -271,8 +271,7 @@ _XimUnRegisterIMInstantiateCallback(
 
 
 Public void
-_XimResetIMInstantiateCallback( xim )
-    Xim		xim;
+_XimResetIMInstantiateCallback(Xim xim)
 {
     char		 locale[XIM_MAXLCNAMELEN];
     XimInstCallback	 icb;
diff --git a/modules/im/ximcp/imInt.c b/modules/im/ximcp/imInt.c
index c4b177b2..6ca7a1c8 100644
--- a/modules/im/ximcp/imInt.c
+++ b/modules/im/ximcp/imInt.c
@@ -75,8 +75,7 @@ _XimSetIMStructureList(
 }
 
 Public void
-_XimDestroyIMStructureList(im)
-    Xim		  im;
+_XimDestroyIMStructureList(Xim im)
 {
     register int  i;
 
@@ -90,8 +89,7 @@ _XimDestroyIMStructureList(im)
 }
 
 Public void
-_XimServerDestroy(im_2_destroy)
-    Xim		  im_2_destroy;
+_XimServerDestroy(Xim im_2_destroy)
 {
     register int  i;
     Xim		  im;
@@ -125,7 +123,7 @@ _XimServerDestroy(im_2_destroy)
 
 #ifdef XIM_CONNECTABLE
 Public void
-_XimServerReconectableDestroy()
+_XimServerReconectableDestroy(void)
 {
     register int  i;
     Xim		  im;
@@ -259,8 +257,7 @@ Error1:
 }
 
 Public Bool
-_XInitIM(lcd)
-    XLCd	 lcd;
+_XInitIM(XLCd lcd)
 {
     if(lcd == (XLCd)NULL)
 	return False;
diff --git a/modules/im/ximcp/imLcFlt.c b/modules/im/ximcp/imLcFlt.c
index 6c051638..04f5b430 100644
--- a/modules/im/ximcp/imLcFlt.c
+++ b/modules/im/ximcp/imLcFlt.c
@@ -40,11 +40,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Ximint.h"
 
 Bool
-_XimLocalFilter(d, w, ev, client_data)
-    Display	*d;
-    Window	 w;
-    XEvent	*ev;
-    XPointer	 client_data;
+_XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
 {
     Xic		 ic = (Xic)client_data;
     KeySym	 keysym;
diff --git a/modules/im/ximcp/imLcGIc.c b/modules/im/ximcp/imLcGIc.c
index 59ea833f..b90a0704 100644
--- a/modules/im/ximcp/imLcGIc.c
+++ b/modules/im/ximcp/imLcGIc.c
@@ -36,9 +36,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Ximint.h"
 
 Public char *
-_XimLocalGetICValues(xic, values)
-    XIC			 xic;
-    XIMArg		*values;
+_XimLocalGetICValues(XIC xic, XIMArg *values)
 {
     Xic			 ic = (Xic)xic;
     XimDefICValues	 ic_values;
diff --git a/modules/im/ximcp/imLcIm.c b/modules/im/ximcp/imLcIm.c
index 3744e7ea..5af08c09 100644
--- a/modules/im/ximcp/imLcIm.c
+++ b/modules/im/ximcp/imLcIm.c
@@ -96,8 +96,7 @@ Private int     _XimCachedDefaultTreeRefcount = 0;
 
 
 Public Bool
-_XimCheckIfLocalProcessing(im)
-    Xim          im;
+_XimCheckIfLocalProcessing(Xim im)
 {
     FILE        *fp;
     char        *name;
diff --git a/modules/im/ximcp/imLcLkup.c b/modules/im/ximcp/imLcLkup.c
index e952b5b5..b4ecdc31 100644
--- a/modules/im/ximcp/imLcLkup.c
+++ b/modules/im/ximcp/imLcLkup.c
@@ -46,13 +46,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Ximint.h"
 
 Public int
-_XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
-    XIC		 xic;
-    XKeyEvent	*ev;
-    char	*buffer;
-    int		 bytes;
-    KeySym	 *keysym;
-    Status	 *status;
+_XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
+			KeySym *keysym, Status *status)
 {
     Xic		 ic = (Xic)xic;
     int		 ret;
@@ -125,13 +120,8 @@ _XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
 }
 
 Public int
-_XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
-    XIC		  xic;
-    XKeyEvent	 *ev;
-    wchar_t	 *buffer;
-    int		  wlen;
-    KeySym	 *keysym;
-    Status	 *status;
+_XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen,
+			KeySym *keysym, Status *status)
 {
     Xic		 ic = (Xic)xic;
     int		 ret;
@@ -202,13 +192,8 @@ _XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
 }
 
 Public int
-_XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
-    XIC		  xic;
-    XKeyEvent	 *ev;
-    char	 *buffer;
-    int		  bytes;
-    KeySym	 *keysym;
-    Status	 *status;
+_XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
+			  KeySym *keysym, Status *status)
 {
     Xic		 ic = (Xic)xic;
     int		 ret;
@@ -341,26 +326,16 @@ _XimLcctsconvert(
 }
 
 Public int
-_XimLcctstombs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    char	*to;
-    int		 to_len;
-    Status	*state;
+_XimLcctstombs(XIM xim, char *from, int from_len,
+	       char *to, int to_len, Status *state)
 {
     return _XimLcctsconvert(((Xim)xim)->private.local.ctom_conv,
 			    from, from_len, to, to_len, state);
 }
 
 Public int
-_XimLcctstowcs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    wchar_t	*to;
-    int		 to_len;
-    Status	*state;
+_XimLcctstowcs(XIM xim, char *from, int from_len,
+	       wchar_t *to, int to_len, Status *state)
 {
     Xim		 im = (Xim)xim;
     XlcConv	 conv = im->private.local.ctow_conv;
@@ -422,13 +397,8 @@ _XimLcctstowcs(xim, from, from_len, to, to_len, state)
 }
 
 Public int
-_XimLcctstoutf8(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    char	*to;
-    int		 to_len;
-    Status	*state;
+_XimLcctstoutf8(XIM xim, char *from, int from_len,
+		char *to, int to_len, Status *state)
 {
     return _XimLcctsconvert(((Xim)xim)->private.local.ctoutf8_conv,
 			    from, from_len, to, to_len, state);
diff --git a/modules/im/ximcp/imLcSIc.c b/modules/im/ximcp/imLcSIc.c
index 6a7a0be8..f91eb6d7 100644
--- a/modules/im/ximcp/imLcSIc.c
+++ b/modules/im/ximcp/imLcSIc.c
@@ -39,9 +39,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Ximint.h"
 
 Public char *
-_XimLocalSetICValues(xic, values)
-    XIC			 xic;
-    XIMArg		*values;
+_XimLocalSetICValues(XIC xic, XIMArg *values)
 {
     XimDefICValues	 ic_values;
     Xic			 ic = (Xic)xic;
diff --git a/modules/im/ximcp/imRm.c b/modules/im/ximcp/imRm.c
index e6ca30fa..73f60206 100644
--- a/modules/im/ximcp/imRm.c
+++ b/modules/im/ximcp/imRm.c
@@ -2380,10 +2380,7 @@ Public int
 }
 
 Public void
-_XimSetICMode(res_list, list_num, style)
-    XIMResourceList	res_list;
-    unsigned int	list_num;
-    XIMStyle		style;
+_XimSetICMode(XIMResourceList res_list, unsigned int list_num, XIMStyle style)
 {
     XIMResourceList	res;
     unsigned int	n = XIMNumber(ic_mode);
@@ -3018,13 +3015,8 @@ _XimDecodeLocalICAttr(
 }
 
 Public char *
-_XimGetICValueData(ic, top, res_list, list_num, values, mode)
-    Xic			 ic;
-    XPointer		 top;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-    XIMArg		*values;
-    unsigned long	 mode;
+_XimGetICValueData(Xic ic, XPointer top, XIMResourceList res_list,
+		   unsigned int	 list_num, XIMArg *values, unsigned long mode)
 {
     register  XIMArg	*p;
     XIMResourceList	 res;
@@ -3072,9 +3064,7 @@ _XimGetICValueData(ic, top, res_list, list_num, values, mode)
 }
 
 Public void
-_XimGetCurrentIMValues(im, im_values)
-    Xim			 im;
-    XimDefIMValues	*im_values;
+_XimGetCurrentIMValues(Xim im, XimDefIMValues *im_values)
 {
     bzero((char *)im_values, sizeof(XimDefIMValues));
 
@@ -3088,9 +3078,7 @@ _XimGetCurrentIMValues(im, im_values)
 }
 
 Public void
-_XimSetCurrentIMValues(im, im_values)
-    Xim			 im;
-    XimDefIMValues	*im_values;
+_XimSetCurrentIMValues(Xim im, XimDefIMValues *im_values)
 {
     im->core.styles		= im_values->styles;
     im->core.im_values_list	= im_values->im_values_list;
@@ -3102,9 +3090,7 @@ _XimSetCurrentIMValues(im, im_values)
 }
 
 Public void
-_XimGetCurrentICValues(ic, ic_values)
-    Xic			 ic;
-    XimDefICValues	*ic_values;
+_XimGetCurrentICValues(Xic ic, XimDefICValues *ic_values)
 {
     bzero((char *)ic_values, sizeof(XimDefICValues));
 
diff --git a/modules/im/ximcp/imThaiFlt.c b/modules/im/ximcp/imThaiFlt.c
index 77da54ed..368ea5cc 100644
--- a/modules/im/ximcp/imThaiFlt.c
+++ b/modules/im/ximcp/imThaiFlt.c
@@ -1240,11 +1240,7 @@ ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol)
  * Filter function for TACTIS
  */
 Bool
-_XimThaiFilter(d, w, ev, client_data)
-Display		*d;
-Window		w;
-XEvent		*ev;
-XPointer	client_data;
+_XimThaiFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
 {
     Xic		    ic = (Xic)client_data;
     KeySym 	    symbol;
diff --git a/modules/im/ximcp/imThaiIm.c b/modules/im/ximcp/imThaiIm.c
index a80a02a6..61b53373 100644
--- a/modules/im/ximcp/imThaiIm.c
+++ b/modules/im/ximcp/imThaiIm.c
@@ -61,8 +61,7 @@ Private XIMMethodsRec      Xim_im_thai_methods = {
 #define THAI_LANGUAGE_NAME 	"th"
 
 Bool
-_XimCheckIfThaiProcessing(im)
-    Xim          im;
+_XimCheckIfThaiProcessing(Xim im)
 {
     char *language;
 
@@ -80,8 +79,7 @@ _XimCheckIfThaiProcessing(im)
 }
 
 Public Bool
-_XimThaiOpenIM(im)
-    Xim		 im;
+_XimThaiOpenIM(Xim im)
 {
     XLCd		 lcd = im->core.lcd;
     XlcConv		 conv;
@@ -150,8 +148,7 @@ Open_Error :
 }
 
 Public void
-_XimThaiIMFree(im)
-    Xim		im;
+_XimThaiIMFree(Xim im)
 {
     if(im->core.im_resources) {
 	Xfree(im->core.im_resources);
@@ -221,8 +218,7 @@ _XimThaiIMFree(im)
 }
 
 Public Status
-_XimThaiCloseIM(xim)
-    XIM		xim;
+_XimThaiCloseIM(XIM xim)
 {
     Xim		im = (Xim)xim;
     XIC		ic;
diff --git a/modules/im/ximcp/imTrX.c b/modules/im/ximcp/imTrX.c
index c5e50a40..2b085964 100644
--- a/modules/im/ximcp/imTrX.c
+++ b/modules/im/ximcp/imTrX.c
@@ -465,9 +465,7 @@ _XimXFlush(Xim im)
 }
 
 Public Bool
-_XimXConf(im, address)
-    Xim		 im;
-    char	*address;
+_XimXConf(Xim im, char *address)
 {
     XSpecRec	*spec;
 
diff --git a/modules/im/ximcp/imTransR.c b/modules/im/ximcp/imTransR.c
index 44d043fa..54663dcc 100644
--- a/modules/im/ximcp/imTransR.c
+++ b/modules/im/ximcp/imTransR.c
@@ -57,15 +57,13 @@ Public TransportSW _XimTransportRec[] = {
 };
 
 Public Bool
-_XimConnect(im)
-    Xim		 im;
+_XimConnect(Xim im)
 {
     return im->private.proto.connect(im);
 }
 
 Public Bool
-_XimShutdown(im)
-    Xim		 im;
+_XimShutdown(Xim im)
 {
     return im->private.proto.shutdown(im);
 }
@@ -214,15 +212,8 @@ _XimCallDispatcher(
 }
 
 Public int
-_XimRead(im, len, buf, buf_size, predicate, arg)
-    Xim		 im;
-    INT16	*len;
-    XPointer	 buf;
-    int		 buf_size;
-    Bool	 (*predicate)(
-			      Xim, INT16, XPointer, XPointer
-			      );
-    XPointer	 arg;
+_XimRead(Xim im, INT16 *len, XPointer buf, int buf_size,
+	 Bool (*predicate)(Xim, INT16, XPointer, XPointer), XPointer arg)
 {
     INT16	 read_len;
     int		 ret_code;
@@ -254,16 +245,14 @@ _XimRegisterDispatcher(
 }
 
 Public void
-_XimFlush(im)
-    Xim		 im;
+_XimFlush(Xim im)
 {
     im->private.proto.flush(im);
     return;
 }
 
 Public Bool
-_XimFilterWaitEvent(im)
-    Xim		 im;
+_XimFilterWaitEvent(Xim im)
 {
     INT16	 read_len;
     CARD32	 reply32[BUFSIZE/4];
diff --git a/modules/lc/.gitignore b/modules/lc/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/modules/lc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/modules/lc/Utf8/.gitignore b/modules/lc/Utf8/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/modules/lc/Utf8/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/modules/lc/def/.gitignore b/modules/lc/def/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/modules/lc/def/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/modules/lc/gen/.gitignore b/modules/lc/gen/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/modules/lc/gen/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/modules/lc/xlocale/.gitignore b/modules/lc/xlocale/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/modules/lc/xlocale/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/modules/om/.gitignore b/modules/om/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/modules/om/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/modules/om/generic/.gitignore b/modules/om/generic/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/modules/om/generic/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/nls/.gitignore b/nls/.gitignore
deleted file mode 100644
index 1b161927..00000000
--- a/nls/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-compose.dir
-compose.dir.l1
-compose.dir.l2
-locale.alias
-locale.alias.l1
-locale.alias.l2
-locale.dir
-locale.dir.l1
-locale.dir.l2
-Makefile
-Makefile.in
diff --git a/nls/C/.gitignore b/nls/C/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/C/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/am_ET.UTF-8/.gitignore b/nls/am_ET.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/am_ET.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/armscii-8/.gitignore b/nls/armscii-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/armscii-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/el_GR.UTF-8/.gitignore b/nls/el_GR.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/el_GR.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/en_US.UTF-8/.gitignore b/nls/en_US.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/en_US.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/georgian-academy/.gitignore b/nls/georgian-academy/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/georgian-academy/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/georgian-ps/.gitignore b/nls/georgian-ps/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/georgian-ps/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ibm-cp1133/.gitignore b/nls/ibm-cp1133/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ibm-cp1133/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iscii-dev/.gitignore b/nls/iscii-dev/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iscii-dev/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/isiri-3342/.gitignore b/nls/isiri-3342/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/isiri-3342/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-1/.gitignore b/nls/iso8859-1/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-1/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-10/.gitignore b/nls/iso8859-10/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-10/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-11/.gitignore b/nls/iso8859-11/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-11/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-13/.gitignore b/nls/iso8859-13/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-13/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-14/.gitignore b/nls/iso8859-14/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-14/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-15/.gitignore b/nls/iso8859-15/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-15/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-2/.gitignore b/nls/iso8859-2/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-2/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-3/.gitignore b/nls/iso8859-3/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-3/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-4/.gitignore b/nls/iso8859-4/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-4/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-5/.gitignore b/nls/iso8859-5/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-5/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-6/.gitignore b/nls/iso8859-6/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-6/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-7/.gitignore b/nls/iso8859-7/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-7/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-8/.gitignore b/nls/iso8859-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-9/.gitignore b/nls/iso8859-9/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-9/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/iso8859-9e/.gitignore b/nls/iso8859-9e/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/iso8859-9e/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ja.JIS/.gitignore b/nls/ja.JIS/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ja.JIS/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ja.S90/.gitignore b/nls/ja.S90/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ja.S90/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ja.SJIS/.gitignore b/nls/ja.SJIS/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ja.SJIS/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ja.U90/.gitignore b/nls/ja.U90/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ja.U90/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ja/.gitignore b/nls/ja/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ja/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ja_JP.UTF-8/.gitignore b/nls/ja_JP.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ja_JP.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ko/.gitignore b/nls/ko/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ko/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/ko_KR.UTF-8/.gitignore b/nls/ko_KR.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/ko_KR.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/koi8-c/.gitignore b/nls/koi8-c/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/koi8-c/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/koi8-r/.gitignore b/nls/koi8-r/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/koi8-r/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/koi8-u/.gitignore b/nls/koi8-u/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/koi8-u/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/microsoft-cp1251/.gitignore b/nls/microsoft-cp1251/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/microsoft-cp1251/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/microsoft-cp1255/.gitignore b/nls/microsoft-cp1255/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/microsoft-cp1255/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/microsoft-cp1256/.gitignore b/nls/microsoft-cp1256/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/microsoft-cp1256/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/mulelao-1/.gitignore b/nls/mulelao-1/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/mulelao-1/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/nokhchi-1/.gitignore b/nls/nokhchi-1/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/nokhchi-1/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/pt_BR.UTF-8/.gitignore b/nls/pt_BR.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/pt_BR.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/tatar-cyr/.gitignore b/nls/tatar-cyr/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/tatar-cyr/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/th_TH.UTF-8/.gitignore b/nls/th_TH.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/th_TH.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/th_TH/.gitignore b/nls/th_TH/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/th_TH/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/tscii-0/.gitignore b/nls/tscii-0/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/tscii-0/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/vi_VN.tcvn/.gitignore b/nls/vi_VN.tcvn/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/vi_VN.tcvn/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/vi_VN.viscii/.gitignore b/nls/vi_VN.viscii/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/vi_VN.viscii/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_CN.UTF-8/.gitignore b/nls/zh_CN.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_CN.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_CN.gb18030/.gitignore b/nls/zh_CN.gb18030/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_CN.gb18030/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_CN.gbk/.gitignore b/nls/zh_CN.gbk/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_CN.gbk/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_CN/.gitignore b/nls/zh_CN/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_CN/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_HK.UTF-8/.gitignore b/nls/zh_HK.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_HK.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_HK.big5/.gitignore b/nls/zh_HK.big5/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_HK.big5/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_HK.big5hkscs/.gitignore b/nls/zh_HK.big5hkscs/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_HK.big5hkscs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_TW.UTF-8/.gitignore b/nls/zh_TW.UTF-8/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_TW.UTF-8/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_TW.big5/.gitignore b/nls/zh_TW.big5/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_TW.big5/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/nls/zh_TW/.gitignore b/nls/zh_TW/.gitignore
deleted file mode 100644
index f7b23e46..00000000
--- a/nls/zh_TW/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Compose
-Makefile
-Makefile.in
-XLC_LOCALE
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 4295eca2..00000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-config.h
-config.h.in
-.deps
-force
-ks_tables.h
-*.la
-.libs
-*.lo
-*.o
-Makefile
-Makefile.in
-stamp-h1
diff --git a/src/Context.c b/src/Context.c
index 0020a605..4c547d7f 100644
--- a/src/Context.c
+++ b/src/Context.c
@@ -235,11 +235,7 @@ int XSaveContext(
    if an error has occured, 0 otherwise.  Possible errors are Entry-not-found.
 */
 
-int XFindContext(display, rid, context, data)
-    Display *display;
-    register XID rid;
-    register XContext context;
-    XPointer *data;		/* RETURN */
+int XFindContext(Display *display, XID rid, XContext context, XPointer *data)
 {
     register DB db;
     register TableEntry entry;
@@ -274,10 +270,7 @@ int XFindContext(display, rid, context, data)
    with the same arguments.
 */
 
-int XDeleteContext(display, rid, context)
-    Display *display;
-    register XID rid;
-    register XContext context;
+int XDeleteContext(Display *display, XID rid, XContext context)
 {
     register DB db;
     register TableEntry entry, *prev;
diff --git a/src/OpenDis.c b/src/OpenDis.c
index aa2541fa..2d61be12 100644
--- a/src/OpenDis.c
+++ b/src/OpenDis.c
@@ -788,8 +788,7 @@ _XBigReqHandler(
  * before the first possible call on this.
  */
 
-void _XFreeDisplayStructure(dpy)
-	register Display *dpy;
+void _XFreeDisplayStructure(Display *dpy)
 {
 	while (dpy->ext_procs) {
 	    _XExtension *ext = dpy->ext_procs;
@@ -914,9 +913,7 @@ void _XFreeDisplayStructure(dpy)
 /* OutOfMemory is called if malloc fails.  XOpenDisplay returns NULL
    after this returns. */
 
-static void OutOfMemory (dpy, setup)
-    Display *dpy;
-    char *setup;
+static void OutOfMemory(Display *dpy, char *setup)
 {
 #if USE_XCB
     if(dpy->xcb->connection)
diff --git a/src/XlibInt.c b/src/XlibInt.c
index 7947fafb..5edf7896 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -2881,10 +2881,7 @@ int _XDefaultError(
 }
 
 /*ARGSUSED*/
-Bool _XDefaultWireError(display, he, we)
-    Display     *display;
-    XErrorEvent *he;
-    xError      *we;
+Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we)
 {
     return True;
 }
@@ -3280,9 +3277,7 @@ int _XGetHostname (
  * _XScreenOfWindow - get the Screen of a given window
  */
 
-Screen *_XScreenOfWindow (dpy, w)
-    Display *dpy;
-    Window w;
+Screen *_XScreenOfWindow(Display *dpy, Window w)
 {
     register int i;
     Window root;
diff --git a/src/Xrm.c b/src/Xrm.c
index 00612f50..4f683605 100644
--- a/src/Xrm.c
+++ b/src/Xrm.c
@@ -2573,12 +2573,8 @@ Bool XrmQGetResource(
 }
 
 Bool
-XrmGetResource(db, name_str, class_str, pType_str, pValue)
-    XrmDatabase         db;
-    _Xconst char	*name_str;
-    _Xconst char	*class_str;
-    XrmString		*pType_str;  /* RETURN */
-    XrmValuePtr		pValue;      /* RETURN */
+XrmGetResource(XrmDatabase db, _Xconst char *name_str, _Xconst char *class_str,
+	       XrmString *pType_str, XrmValuePtr pValue)
 {
     XrmName		names[MAXDBDEPTH+1];
     XrmClass		classes[MAXDBDEPTH+1];
diff --git a/src/locking.c b/src/locking.c
index 533a7a1a..c421e0cb 100644
--- a/src/locking.c
+++ b/src/locking.c
@@ -597,7 +597,7 @@ xthread_t (*_x11_thr_self)() = __x11_thr_self;
 #endif
 
 
-Status XInitThreads()
+Status XInitThreads(void)
 {
     if (_Xglobal_lock)
 	return 1;
diff --git a/src/util/.gitignore b/src/util/.gitignore
deleted file mode 100644
index 416021a0..00000000
--- a/src/util/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.deps
-Makefile
-Makefile.in
-makekeys
diff --git a/src/xcms/.gitignore b/src/xcms/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/src/xcms/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/src/xkb/.gitignore b/src/xkb/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/src/xkb/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c
index df333c9b..3205b808 100644
--- a/src/xkb/XKBMisc.c
+++ b/src/xkb/XKBMisc.c
@@ -669,7 +669,7 @@ register int	i;
 int		width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
 
     if ((!xkb) || (!XkbKeycodeInRange(xkb,key)) || (!xkb->map) ||
-	(!xkb->map->types)||(!newTypes)||((groups&XkbAllGroupsMask)==0)||
+	(!xkb->map->types)||((groups&XkbAllGroupsMask)==0)||
 	(nGroups>XkbNumKbdGroups)) {
 	return BadMatch;
     }
diff --git a/src/xlibi18n/.gitignore b/src/xlibi18n/.gitignore
deleted file mode 100644
index 288d1a0c..00000000
--- a/src/xlibi18n/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c
index 5cc99d04..3708229b 100644
--- a/src/xlibi18n/ICWrap.c
+++ b/src/xlibi18n/ICWrap.c
@@ -263,8 +263,7 @@ XCreateIC(XIM im, ...)
  * Free the input context.
  */
 void
-XDestroyIC(ic)
-    XIC ic;
+XDestroyIC(XIC ic)
 {
     XIM im = ic->core.im;
     XIC *prev;
@@ -346,8 +345,7 @@ XSetICValues(XIC ic, ...)
  * argument.
  */
 void
-XSetICFocus(ic)
-    XIC ic;
+XSetICFocus(XIC ic)
 {
   if (ic && ic->core.im)
       (*ic->methods->set_focus) (ic);
@@ -358,8 +356,7 @@ XSetICFocus(ic)
  * argument.
  */
 void
-XUnsetICFocus(ic)
-    XIC ic;
+XUnsetICFocus(XIC ic)
 {
   if (ic->core.im)
       (*ic->methods->unset_focus) (ic);
@@ -369,15 +366,13 @@ XUnsetICFocus(ic)
  * Return the XIM associated with the input context.
  */
 XIM
-XIMOfIC(ic)
-    XIC ic;
+XIMOfIC(XIC ic)
 {
     return ic->core.im;
 }
 
 char *
-XmbResetIC(ic)
-    XIC ic;
+XmbResetIC(XIC ic)
 {
     if (ic->core.im)
 	return (*ic->methods->mb_reset)(ic);
@@ -385,8 +380,7 @@ XmbResetIC(ic)
 }
 
 wchar_t *
-XwcResetIC(ic)
-    XIC ic;
+XwcResetIC(XIC ic)
 {
     if (ic->core.im)
 	return (*ic->methods->wc_reset)(ic);
@@ -394,8 +388,7 @@ XwcResetIC(ic)
 }
 
 char *
-Xutf8ResetIC(ic)
-    XIC ic;
+Xutf8ResetIC(XIC ic)
 {
     if (ic->core.im) {
 	if (ic->methods->utf8_reset)
@@ -407,13 +400,8 @@ Xutf8ResetIC(ic)
 }
 
 int
-XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    char *buffer;
-    int nbytes;
-    KeySym *keysym;
-    Status *status;
+XmbLookupString(XIC ic, XKeyEvent *ev, char *buffer, int nbytes,
+		KeySym *keysym, Status *status)
 {
     if (ic->core.im)
 	return (*ic->methods->mb_lookup_string) (ic, ev, buffer, nbytes,
@@ -422,13 +410,8 @@ XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
 }
 
 int
-XwcLookupString(ic, ev, buffer, nchars, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    wchar_t *buffer;
-    int nchars;
-    KeySym *keysym;
-    Status *status;
+XwcLookupString(XIC ic, XKeyEvent *ev, wchar_t *buffer, int nchars,
+		KeySym *keysym, Status *status)
 {
     if (ic->core.im)
 	return (*ic->methods->wc_lookup_string) (ic, ev, buffer, nchars,
@@ -437,13 +420,8 @@ XwcLookupString(ic, ev, buffer, nchars, keysym, status)
 }
 
 int
-Xutf8LookupString(ic, ev, buffer, nbytes, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    char *buffer;
-    int nbytes;
-    KeySym *keysym;
-    Status *status;
+Xutf8LookupString(XIC ic, XKeyEvent *ev, char *buffer, int nbytes,
+		  KeySym *keysym, Status *status)
 {
     if (ic->core.im) {
 	if (ic->methods->utf8_lookup_string)
diff --git a/src/xlibi18n/IMWrap.c b/src/xlibi18n/IMWrap.c
index f8cdedc3..1e5b8f0b 100644
--- a/src/xlibi18n/IMWrap.c
+++ b/src/xlibi18n/IMWrap.c
@@ -69,9 +69,7 @@ from The Open Group.
  * Compile the resource name. (resource_name ---> xrm_name)
  */
 void
-_XIMCompileResourceList(res, num_res)
-    register XIMResourceList res;
-    unsigned int num_res;
+_XIMCompileResourceList(XIMResourceList res, unsigned int num_res)
 {
     register unsigned int count;
 
@@ -81,10 +79,7 @@ _XIMCompileResourceList(res, num_res)
 }
 
 void
-_XCopyToArg(src, dst, size)
-    XPointer src;
-    XPointer *dst;
-    register unsigned int size;
+_XCopyToArg(XPointer src, XPointer *dst, unsigned int size)
 {
     if (!*dst) {
 	union {
@@ -122,11 +117,7 @@ _XCopyToArg(src, dst, size)
  */
 
 XIM
-XOpenIM( display, rdb, res_name, res_class )
-    Display	*display;
-    XrmDatabase	 rdb;
-    char	*res_name;
-    char	*res_class;
+XOpenIM(Display *display, XrmDatabase rdb, char *res_name, char *res_class)
 {
     XLCd	lcd = _XOpenLC( (char *)NULL );
 
@@ -139,8 +130,7 @@ XOpenIM( display, rdb, res_name, res_class )
  * Close the connection to the input manager, and free the XIM structure
  */
 Status
-XCloseIM(im)
-    XIM im;
+XCloseIM(XIM im)
 {
     Status s;
     XIC ic;
@@ -158,8 +148,7 @@ XCloseIM(im)
  * Return the Display associated with the input method.
  */
 Display *
-XDisplayOfIM(im)
-    XIM im;
+XDisplayOfIM(XIM im)
 {
     return im->core.display;
 }
@@ -168,8 +157,7 @@ XDisplayOfIM(im)
  * Return the Locale associated with the input method.
  */
 char *
-XLocaleOfIM(im)
-    XIM im;
+XLocaleOfIM(XIM im)
 {
     return im->core.lcd->core->name;
 }
diff --git a/src/xlibi18n/lcCT.c b/src/xlibi18n/lcCT.c
index 8caab560..4eee21dc 100644
--- a/src/xlibi18n/lcCT.c
+++ b/src/xlibi18n/lcCT.c
@@ -1264,7 +1264,7 @@ open_cstostr(
 /* =========================== Initialization =========================== */
 
 Bool
-_XlcInitCTInfo()
+_XlcInitCTInfo(void)
 {
     if (ct_list == NULL) {
         const CTDataRec *ct_data;
diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
index 5e6f1f53..e12dcbac 100644
--- a/src/xlibi18n/lcFile.c
+++ b/src/xlibi18n/lcFile.c
@@ -511,8 +511,7 @@ _XlcFileName(
 	char buf[PATH_MAX], *name;
 
 	name = NULL;
-	if ((5 + (args[i] ? strlen (args[i]) : 0) +
-	    (cat ? strlen (cat) : 0)) < PATH_MAX) {
+	if ((5 + (args[i] ? strlen (args[i]) : 0) + strlen(cat)) < PATH_MAX) {
 	    sprintf(buf, "%s/%s.dir", args[i], cat);
 	    name = resolve_name(siname, buf, RtoL);
 	}
@@ -628,9 +627,7 @@ _XlcResolveLocaleName(
 
 /************************************************************************/
 int
-_XlcResolveI18NPath(buf, buf_len)
-    char *buf;
-    int buf_len;
+_XlcResolveI18NPath(char *buf, int buf_len)
 {
     if (buf != NULL) {
 	xlocaledir(buf, buf_len);
@@ -639,10 +636,7 @@ _XlcResolveI18NPath(buf, buf_len)
 }
 
 char *
-_XlcLocaleDirName(dir_name, dir_len, lc_name)
-     char *dir_name;
-     size_t dir_len;
-     char *lc_name;
+_XlcLocaleDirName(char *dir_name, size_t dir_len, char *lc_name)
 {
     char dir[PATH_MAX], buf[PATH_MAX], *name = NULL;
     int i, n;
@@ -742,10 +736,7 @@ _XlcLocaleDirName(dir_name, dir_len, lc_name)
 }
 
 char *
-_XlcLocaleLibDirName(dir_name, dir_len, lc_name)
-     char *dir_name;
-     size_t dir_len;
-     char *lc_name;
+_XlcLocaleLibDirName(char *dir_name, size_t dir_len, char *lc_name)
 {
     char dir[PATH_MAX], buf[PATH_MAX], *name = NULL;
     int i, n;
diff --git a/src/xlibi18n/lcGeneric.c b/src/xlibi18n/lcGeneric.c
index 00fd1df4..5cb8c523 100644
--- a/src/xlibi18n/lcGeneric.c
+++ b/src/xlibi18n/lcGeneric.c
@@ -1007,8 +1007,7 @@ initialize_core(
 #endif
 
 static Bool
-initialize(lcd)
-    XLCd lcd;
+initialize(XLCd lcd)
 {
     XLCdPublicMethods superclass = (XLCdPublicMethods) _XlcPublicMethods;
 
diff --git a/src/xlibi18n/lcInit.c b/src/xlibi18n/lcInit.c
index eda24c82..db774a92 100644
--- a/src/xlibi18n/lcInit.c
+++ b/src/xlibi18n/lcInit.c
@@ -103,7 +103,7 @@ Sun Microsystems, Inc. or its licensors is granted.
  */
 
 void
-_XlcInitLoader()
+_XlcInitLoader(void)
 {
 
 #ifdef USE_DYNAMIC_LC
@@ -142,7 +142,7 @@ _XlcInitLoader()
 }
 
 void
-_XlcDeInitLoader()
+_XlcDeInitLoader(void)
 {
 
 #ifdef USE_DYNAMIC_LC
diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c
index 9961b5b0..95c68ad7 100644
--- a/src/xlibi18n/lcUTF8.c
+++ b/src/xlibi18n/lcUTF8.c
@@ -1820,14 +1820,8 @@ open_utf8tofcs(
 /* from XlcNCharSet to XlcNMultiByte */
 
 static int
-iconv_cstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
+iconv_cstombs(XlcConv conv, XPointer *from, int *from_left,
+	      XPointer *to, int *to_left, XPointer *args, int num_args)
 {
     XlcCharSet charset;
     char *name;
@@ -1903,25 +1897,15 @@ static XlcConvMethodsRec iconv_cstombs_methods = {
 };
 
 static XlcConv
-open_iconv_cstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
+open_iconv_cstombs(XLCd from_lcd, char *from_type, XLCd to_lcd, char *to_type)
 {
     lazy_init_all_charsets();
     return create_conv(from_lcd, &iconv_cstombs_methods);
 }
 
 static int
-iconv_mbstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
+iconv_mbstocs(XlcConv conv, XPointer *from, int *from_left,
+	      XPointer *to, int *to_left, XPointer *args, int num_args)
 {
     Utf8Conv *preferred_charsets;
     XlcCharSet last_charset = NULL;
@@ -2008,11 +1992,7 @@ static XlcConvMethodsRec iconv_mbstocs_methods = {
 };
 
 static XlcConv
-open_iconv_mbstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
+open_iconv_mbstocs(XLCd from_lcd, char *from_type, XLCd to_lcd, char *to_type)
 {
     return create_tocs_conv(from_lcd, &iconv_mbstocs_methods);
 }
@@ -2020,14 +2000,8 @@ open_iconv_mbstocs(from_lcd, from_type, to_lcd, to_type)
 /* from XlcNMultiByte to XlcNChar */
 
 static int
-iconv_mbtocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
+iconv_mbtocs(XlcConv conv, XPointer *from, int *from_left,
+	     XPointer *to, int *to_left, XPointer *args, int num_args)
 {
     Utf8Conv *preferred_charsets;
     XlcCharSet last_charset = NULL;
@@ -2113,11 +2087,7 @@ static XlcConvMethodsRec iconv_mbtocs_methods = {
 };
 
 static XlcConv
-open_iconv_mbtocs (from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
+open_iconv_mbtocs(XLCd from_lcd, char *from_type, XLCd to_lcd, char *to_type)
 {
     return create_tocs_conv(from_lcd, &iconv_mbtocs_methods );
 }
@@ -2125,14 +2095,8 @@ open_iconv_mbtocs (from_lcd, from_type, to_lcd, to_type)
 /* from XlcNMultiByte to XlcNString */
 
 static int
-iconv_mbstostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
+iconv_mbstostr(XlcConv conv, XPointer *from, int *from_left,
+	       XPointer *to, int *to_left, XPointer *args, int num_args)
 {
     unsigned char const *src;
     unsigned char const *srcend;
@@ -2191,25 +2155,15 @@ static XlcConvMethodsRec iconv_mbstostr_methods = {
 };
 
 static XlcConv
-open_iconv_mbstostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
+open_iconv_mbstostr(XLCd from_lcd, char *from_type, XLCd to_lcd, char *to_type)
 {
     return create_conv(from_lcd, &iconv_mbstostr_methods);
 }
 
 /* from XlcNString to XlcNMultiByte */
 static int
-iconv_strtombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
+iconv_strtombs(XlcConv conv, XPointer *from, int *from_left,
+	       XPointer *to, int *to_left, XPointer *args, int num_args)
 {
     unsigned char const *src;
     unsigned char const *srcend;
@@ -2247,11 +2201,7 @@ static XlcConvMethodsRec iconv_strtombs_methods= {
 };
 
 static XlcConv
-open_iconv_strtombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
+open_iconv_strtombs(XLCd from_lcd, char *from_type, XLCd to_lcd, char *to_type)
 {
     return create_conv(from_lcd, &iconv_strtombs_methods);
 }
@@ -2264,14 +2214,8 @@ open_iconv_strtombs(from_lcd, from_type, to_lcd, to_type)
 
 /* from XlcNMultiByte to XlcNWideChar */
 static int
-iconv_mbstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
+iconv_mbstowcs(XlcConv conv, XPointer *from, int *from_left,
+	       XPointer *to, int *to_left, XPointer *args,  int num_args)
 {
     char *src = *((char **) from);
     wchar_t *dst = *((wchar_t **) to);
@@ -2318,24 +2262,14 @@ static XlcConvMethodsRec iconv_mbstowcs_methods = {
 } ;
 
 static XlcConv
-open_iconv_mbstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
+open_iconv_mbstowcs(XLCd from_lcd, char *from_type, XLCd to_lcd, char *to_type)
 {
     return create_conv(from_lcd, &iconv_mbstowcs_methods);
 }
 
 static int
-iconv_wcstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
+iconv_wcstombs(XlcConv conv, XPointer *from, int *from_left,
+	       XPointer *to, int *to_left, XPointer *args, int num_args)
 {
     wchar_t *src = *((wchar_t **) from);
     char *dst = *((char **) to);
@@ -2375,11 +2309,7 @@ static XlcConvMethodsRec iconv_wcstombs_methods = {
 } ;
 
 static XlcConv
-open_iconv_wcstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
+open_iconv_wcstombs(XLCd from_lcd, char *from_type, XLCd to_lcd, char *to_type)
 {
     return create_conv(from_lcd, &iconv_wcstombs_methods);
 }
diff --git a/src/xlibi18n/lcWrap.c b/src/xlibi18n/lcWrap.c
index 6ddad050..fc6e9556 100644
--- a/src/xlibi18n/lcWrap.c
+++ b/src/xlibi18n/lcWrap.c
@@ -96,7 +96,7 @@ XSetLocaleModifiers(
 }
 
 Bool
-XSupportsLocale()
+XSupportsLocale(void)
 {
     return _XlcCurrentLC() != (XLCd)NULL;
 }
@@ -349,7 +349,7 @@ _XCloseLC(
  */
 
 XLCd
-_XlcCurrentLC()
+_XlcCurrentLC(void)
 {
     XLCd lcd;
     static XLCd last_lcd = NULL;
@@ -488,7 +488,7 @@ XwcFreeStringList(
 }
 
 const char *
-XDefaultString()
+XDefaultString(void)
 {
     XLCd lcd = _XlcCurrentLC();