kc3-lang/libxkbcommon

diff --git a/src/Makefile.am b/src/Makefile.am
index ef66913..2aed33d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,8 @@ libxkbcommon_la_SOURCES = \
 	misc.c \
 	state.c \
 	text.c \
+	utils.c \
+	utils.h \
 	xkb.c \
 	xkballoc.h \
 	xkbmisc.h \
diff --git a/src/utils.c b/src/utils.c
new file mode 100644
index 0000000..0ba389b
--- /dev/null
+++ b/src/utils.c
@@ -0,0 +1,252 @@
+
+  /*\
+   *
+   *                          COPYRIGHT 1990
+   *                    DIGITAL EQUIPMENT CORPORATION
+   *                       MAYNARD, MASSACHUSETTS
+   *                        ALL RIGHTS RESERVED.
+   *
+   * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
+   * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
+   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
+   * WARRANTY.
+   *
+   * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
+   * RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN
+   * ADDITION TO THAT SET FORTH ABOVE.
+   *
+   * Permission to use, copy, modify, and distribute this software and its
+   * documentation for any purpose and without fee is hereby granted, 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 Digital Equipment Corporation not be
+   * used in advertising or publicity pertaining to distribution of the
+   * software without specific, written prior permission.
+   \*/
+
+#include 	"utils.h"
+#include	<ctype.h>
+#include	<stdlib.h>
+#include	<stdarg.h>
+
+void *
+recalloc(void * old, unsigned nOld, unsigned nNew, unsigned itemSize)
+{
+    char *rtrn;
+
+    if (old == NULL)
+        rtrn = calloc(nNew, itemSize);
+    else
+    {
+        rtrn = realloc(old, nNew * itemSize);
+        if ((rtrn) && (nNew > nOld))
+        {
+            memset(&rtrn[nOld * itemSize], 0, (nNew - nOld) * itemSize);
+        }
+    }
+    return rtrn;
+}
+
+static FILE *errorFile = NULL;
+static int outCount = 0;
+static char *preMsg = NULL;
+static char *prefix = NULL;
+
+Boolean
+uSetErrorFile(char *name)
+{
+    if ((errorFile != NULL) && (errorFile != stderr))
+    {
+        fprintf(errorFile, "switching to %s\n", name ? name : "stderr");
+        fclose(errorFile);
+    }
+    if (name != NullString)
+        errorFile = fopen(name, "w");
+    else
+        errorFile = stderr;
+    if (errorFile == NULL)
+    {
+        errorFile = stderr;
+        return (False);
+    }
+    return (True);
+}
+
+void
+uInformation(const char *s, ...)
+{
+    va_list args;
+
+    if (!errorFile)
+        errorFile = stderr;
+
+    va_start(args, s);
+    vfprintf(errorFile, s, args);
+    va_end(args);
+    fflush(errorFile);
+}
+
+/***====================================================================***/
+
+void
+uAction(const char *s, ...)
+{
+    va_list args;
+
+    if (!errorFile)
+        errorFile = stderr;
+
+    if (prefix != NULL)
+        fprintf(errorFile, "%s", prefix);
+    fprintf(errorFile, "                  ");
+    va_start(args, s);
+    vfprintf(errorFile, s, args);
+    va_end(args);
+    fflush(errorFile);
+}
+
+/***====================================================================***/
+
+void
+uWarning(const char *s, ...)
+{
+    va_list args;
+
+    if (!errorFile)
+        errorFile = stderr;
+
+    if ((outCount == 0) && (preMsg != NULL))
+        fprintf(errorFile, "%s\n", preMsg);
+    if (prefix != NULL)
+        fprintf(errorFile, "%s", prefix);
+    fprintf(errorFile, "Warning:          ");
+    va_start(args, s);
+    vfprintf(errorFile, s, args);
+    va_end(args);
+    fflush(errorFile);
+    outCount++;
+}
+
+/***====================================================================***/
+
+void
+uError(const char *s, ...)
+{
+    va_list args;
+
+    if (!errorFile)
+        errorFile = stderr;
+
+    if ((outCount == 0) && (preMsg != NULL))
+        fprintf(errorFile, "%s\n", preMsg);
+    if (prefix != NULL)
+        fprintf(errorFile, "%s", prefix);
+    fprintf(errorFile, "Error:            ");
+    va_start(args, s);
+    vfprintf(errorFile, s, args);
+    va_end(args);
+    fflush(errorFile);
+    outCount++;
+}
+
+/***====================================================================***/
+
+void
+uFatalError(const char *s, ...)
+{
+    va_list args;
+
+    if (!errorFile)
+        errorFile = stderr;
+
+    if ((outCount == 0) && (preMsg != NULL))
+        fprintf(errorFile, "%s\n", preMsg);
+    if (prefix != NULL)
+        fprintf(errorFile, "%s", prefix);
+    fprintf(errorFile, "Fatal Error:      ");
+    va_start(args, s);
+    vfprintf(errorFile, s, args);
+    va_end(args);
+    fprintf(errorFile, "                  Exiting\n");
+    fflush(errorFile);
+    outCount++;
+    exit(1);
+    /* NOTREACHED */
+}
+
+/***====================================================================***/
+
+void
+uInternalError(const char *s, ...)
+{
+    va_list args;
+
+    if (!errorFile)
+        errorFile = stderr;
+
+    if ((outCount == 0) && (preMsg != NULL))
+        fprintf(errorFile, "%s\n", preMsg);
+    if (prefix != NULL)
+        fprintf(errorFile, "%s", prefix);
+    fprintf(errorFile, "Internal error:   ");
+    va_start(args, s);
+    vfprintf(errorFile, s, args);
+    va_end(args);
+    fflush(errorFile);
+    outCount++;
+}
+
+/***====================================================================***/
+
+#ifndef HAVE_STRCASECMP
+int
+uStrCaseCmp(const char *str1, const char *str2)
+{
+    char buf1[512], buf2[512];
+    char c, *s;
+    int n;
+
+    for (n = 0, s = buf1; (c = *str1++); n++)
+    {
+        if (isupper(c))
+            c = tolower(c);
+        if (n > 510)
+            break;
+        *s++ = c;
+    }
+    *s = '\0';
+    for (n = 0, s = buf2; (c = *str2++); n++)
+    {
+        if (isupper(c))
+            c = tolower(c);
+        if (n > 510)
+            break;
+        *s++ = c;
+    }
+    *s = '\0';
+    return (strcmp(buf1, buf2));
+}
+
+int
+uStrCasePrefix(const char *my_prefix, char *str)
+{
+    char c1;
+    char c2;
+    while (((c1 = *my_prefix) != '\0') && ((c2 = *str) != '\0'))
+    {
+        if (isupper(c1))
+            c1 = tolower(c1);
+        if (isupper(c2))
+            c2 = tolower(c2);
+        if (c1 != c2)
+            return 0;
+        my_prefix++;
+        str++;
+    }
+    if (c1 != '\0')
+        return 0;
+    return 1;
+}
+
+#endif
diff --git a/src/utils.h b/src/utils.h
new file mode 100644
index 0000000..020ed75
--- /dev/null
+++ b/src/utils.h
@@ -0,0 +1,163 @@
+#ifndef UTILS_H
+#define	UTILS_H 1
+
+  /*\
+   *
+   *                          COPYRIGHT 1990
+   *                    DIGITAL EQUIPMENT CORPORATION
+   *                       MAYNARD, MASSACHUSETTS
+   *                        ALL RIGHTS RESERVED.
+   *
+   * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
+   * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
+   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
+   * WARRANTY.
+   *
+   * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
+   * RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN
+   * ADDITION TO THAT SET FORTH ABOVE.
+   *
+   * Permission to use, copy, modify, and distribute this software and its
+   * documentation for any purpose and without fee is hereby granted, 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 Digital Equipment Corporation not be
+   * used in advertising or publicity pertaining to distribution of the
+   * software without specific, written prior permission.
+   \*/
+
+/***====================================================================***/
+
+#include 	<stdio.h>
+#include	<X11/Xos.h>
+#include	<X11/Xfuncproto.h>
+#include	<X11/Xfuncs.h>
+
+#include <stddef.h>
+#include "config.h"
+
+#ifndef NUL
+#define	NUL	'\0'
+#endif
+
+/***====================================================================***/
+
+#ifndef BOOLEAN_DEFINED
+typedef char Boolean;
+#endif
+
+#ifndef True
+#define	True	((Boolean)1)
+#define	False	((Boolean)0)
+#endif /* ndef True */
+#define	booleanText(b)	((b)?"True":"False")
+
+#ifndef COMPARISON_DEFINED
+typedef int Comparison;
+
+#define	Greater		((Comparison)1)
+#define	Equal		((Comparison)0)
+#define	Less		((Comparison)-1)
+#define	CannotCompare	((Comparison)-37)
+#define	comparisonText(c)	((c)?((c)<0?"Less":"Greater"):"Equal")
+#endif
+
+/***====================================================================***/
+
+extern void *
+recalloc(void * old, unsigned nOld, unsigned nNew, unsigned newSize);
+
+#define	uTypedAlloc(t)		((t *)malloc((unsigned)sizeof(t)))
+#define	uTypedCalloc(n,t)	((t *)calloc((unsigned)n,(unsigned)sizeof(t)))
+#define	uTypedRealloc(pO,n,t)	((t *)realloc(pO,((unsigned)n)*sizeof(t)))
+#define	uTypedRecalloc(pO,o,n,t) ((t *)recalloc(pO,((unsigned)o),((unsigned)n),sizeof(t)))
+#if (defined mdHasAlloca) && (mdHasAlloca)
+#define	uTmpAlloc(n)	alloca((unsigned)n)
+#define	uTmpFree(p)
+#else
+#define	uTmpAlloc(n)	malloc(n)
+#define	uTmpFree(p)	free(p)
+#endif
+
+/***====================================================================***/
+
+extern Boolean
+uSetErrorFile(char *name);
+
+#if defined(__GNUC__) && \
+    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6)))
+#define __ATTR_PRINTF(i, f) __attribute__ ((format(printf, (i), (f))))
+#else
+#define __ATTR_PRINTF(i, f)
+#endif
+
+#define INFO 			uInformation
+
+extern __ATTR_PRINTF(1, 2) void
+uInformation(const char *s, ...);
+
+#define ACTION			uAction
+
+extern __ATTR_PRINTF(1, 2) void
+uAction(const char *s, ...);
+
+#define WARN			uWarning
+
+extern __ATTR_PRINTF(1, 2) void
+uWarning(const char *s, ...);
+
+#define ERROR			uError
+
+extern __ATTR_PRINTF(1, 2) void
+uError(const char *s, ...);
+
+#define FATAL			uFatalError
+
+extern __ATTR_PRINTF(1, 2) _X_NORETURN void
+uFatalError(const char *s, ...);
+
+/* WSGO stands for "Weird Stuff Going On" (wtf???) */
+#define WSGO			uInternalError
+
+extern __ATTR_PRINTF(1, 2) void
+uInternalError(const char *s, ...);
+
+/***====================================================================***/
+
+#define	NullString	((char *)NULL)
+
+#define	uStringText(s)		((s)==NullString?"<NullString>":(s))
+#define	uStringEqual(s1,s2)	(uStringCompare(s1,s2)==Equal)
+#define	uStringPrefix(p,s)	(strncmp(p,s,strlen(p))==0)
+#define	uStringCompare(s1,s2)	(((s1)==NullString||(s2)==NullString)?\
+                                 (s1)!=(s2):strcmp(s1,s2))
+#define	uStrCaseEqual(s1,s2)	(uStrCaseCmp(s1,s2)==0)
+#ifdef HAVE_STRCASECMP
+#define	uStrCaseCmp(s1,s2)	(strcasecmp(s1,s2))
+#define	uStrCasePrefix(p,s)	(strncasecmp(p,s,strlen(p))==0)
+#else
+extern int
+uStrCaseCmp(const char *s1, const char *s2);
+extern int
+uStrCasePrefix(const char *p, char *str);
+#endif
+
+/***====================================================================***/
+
+#ifdef	ASSERTIONS_ON
+#define	uASSERT(where,why) \
+	{if (!(why)) uFatalError("assertion botched in %s ( why )\n",where);}
+#else
+#define	uASSERT(where,why)
+#endif
+
+/***====================================================================***/
+
+#ifndef DEBUG_VAR
+#define	DEBUG_VAR	debugFlags
+#endif
+
+extern unsigned int DEBUG_VAR;
+
+#endif /* UTILS_H */
diff --git a/src/xkbcomp/Makefile.am b/src/xkbcomp/Makefile.am
index 0866208..473f94d 100644
--- a/src/xkbcomp/Makefile.am
+++ b/src/xkbcomp/Makefile.am
@@ -23,8 +23,6 @@ libxkbcomp_la_SOURCES = \
 	parseutils.c \
 	parseutils.h \
 	symbols.c \
-	utils.c \
-	utils.h \
 	vmod.c \
 	vmod.h \
 	xkbcomp.c \
diff --git a/src/xkbcomp/utils.c b/src/xkbcomp/utils.c
deleted file mode 100644
index 0ba389b..0000000
--- a/src/xkbcomp/utils.c
+++ /dev/null
@@ -1,252 +0,0 @@
-
-  /*\
-   *
-   *                          COPYRIGHT 1990
-   *                    DIGITAL EQUIPMENT CORPORATION
-   *                       MAYNARD, MASSACHUSETTS
-   *                        ALL RIGHTS RESERVED.
-   *
-   * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
-   * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
-   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
-   * WARRANTY.
-   *
-   * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
-   * RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN
-   * ADDITION TO THAT SET FORTH ABOVE.
-   *
-   * Permission to use, copy, modify, and distribute this software and its
-   * documentation for any purpose and without fee is hereby granted, 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 Digital Equipment Corporation not be
-   * used in advertising or publicity pertaining to distribution of the
-   * software without specific, written prior permission.
-   \*/
-
-#include 	"utils.h"
-#include	<ctype.h>
-#include	<stdlib.h>
-#include	<stdarg.h>
-
-void *
-recalloc(void * old, unsigned nOld, unsigned nNew, unsigned itemSize)
-{
-    char *rtrn;
-
-    if (old == NULL)
-        rtrn = calloc(nNew, itemSize);
-    else
-    {
-        rtrn = realloc(old, nNew * itemSize);
-        if ((rtrn) && (nNew > nOld))
-        {
-            memset(&rtrn[nOld * itemSize], 0, (nNew - nOld) * itemSize);
-        }
-    }
-    return rtrn;
-}
-
-static FILE *errorFile = NULL;
-static int outCount = 0;
-static char *preMsg = NULL;
-static char *prefix = NULL;
-
-Boolean
-uSetErrorFile(char *name)
-{
-    if ((errorFile != NULL) && (errorFile != stderr))
-    {
-        fprintf(errorFile, "switching to %s\n", name ? name : "stderr");
-        fclose(errorFile);
-    }
-    if (name != NullString)
-        errorFile = fopen(name, "w");
-    else
-        errorFile = stderr;
-    if (errorFile == NULL)
-    {
-        errorFile = stderr;
-        return (False);
-    }
-    return (True);
-}
-
-void
-uInformation(const char *s, ...)
-{
-    va_list args;
-
-    if (!errorFile)
-        errorFile = stderr;
-
-    va_start(args, s);
-    vfprintf(errorFile, s, args);
-    va_end(args);
-    fflush(errorFile);
-}
-
-/***====================================================================***/
-
-void
-uAction(const char *s, ...)
-{
-    va_list args;
-
-    if (!errorFile)
-        errorFile = stderr;
-
-    if (prefix != NULL)
-        fprintf(errorFile, "%s", prefix);
-    fprintf(errorFile, "                  ");
-    va_start(args, s);
-    vfprintf(errorFile, s, args);
-    va_end(args);
-    fflush(errorFile);
-}
-
-/***====================================================================***/
-
-void
-uWarning(const char *s, ...)
-{
-    va_list args;
-
-    if (!errorFile)
-        errorFile = stderr;
-
-    if ((outCount == 0) && (preMsg != NULL))
-        fprintf(errorFile, "%s\n", preMsg);
-    if (prefix != NULL)
-        fprintf(errorFile, "%s", prefix);
-    fprintf(errorFile, "Warning:          ");
-    va_start(args, s);
-    vfprintf(errorFile, s, args);
-    va_end(args);
-    fflush(errorFile);
-    outCount++;
-}
-
-/***====================================================================***/
-
-void
-uError(const char *s, ...)
-{
-    va_list args;
-
-    if (!errorFile)
-        errorFile = stderr;
-
-    if ((outCount == 0) && (preMsg != NULL))
-        fprintf(errorFile, "%s\n", preMsg);
-    if (prefix != NULL)
-        fprintf(errorFile, "%s", prefix);
-    fprintf(errorFile, "Error:            ");
-    va_start(args, s);
-    vfprintf(errorFile, s, args);
-    va_end(args);
-    fflush(errorFile);
-    outCount++;
-}
-
-/***====================================================================***/
-
-void
-uFatalError(const char *s, ...)
-{
-    va_list args;
-
-    if (!errorFile)
-        errorFile = stderr;
-
-    if ((outCount == 0) && (preMsg != NULL))
-        fprintf(errorFile, "%s\n", preMsg);
-    if (prefix != NULL)
-        fprintf(errorFile, "%s", prefix);
-    fprintf(errorFile, "Fatal Error:      ");
-    va_start(args, s);
-    vfprintf(errorFile, s, args);
-    va_end(args);
-    fprintf(errorFile, "                  Exiting\n");
-    fflush(errorFile);
-    outCount++;
-    exit(1);
-    /* NOTREACHED */
-}
-
-/***====================================================================***/
-
-void
-uInternalError(const char *s, ...)
-{
-    va_list args;
-
-    if (!errorFile)
-        errorFile = stderr;
-
-    if ((outCount == 0) && (preMsg != NULL))
-        fprintf(errorFile, "%s\n", preMsg);
-    if (prefix != NULL)
-        fprintf(errorFile, "%s", prefix);
-    fprintf(errorFile, "Internal error:   ");
-    va_start(args, s);
-    vfprintf(errorFile, s, args);
-    va_end(args);
-    fflush(errorFile);
-    outCount++;
-}
-
-/***====================================================================***/
-
-#ifndef HAVE_STRCASECMP
-int
-uStrCaseCmp(const char *str1, const char *str2)
-{
-    char buf1[512], buf2[512];
-    char c, *s;
-    int n;
-
-    for (n = 0, s = buf1; (c = *str1++); n++)
-    {
-        if (isupper(c))
-            c = tolower(c);
-        if (n > 510)
-            break;
-        *s++ = c;
-    }
-    *s = '\0';
-    for (n = 0, s = buf2; (c = *str2++); n++)
-    {
-        if (isupper(c))
-            c = tolower(c);
-        if (n > 510)
-            break;
-        *s++ = c;
-    }
-    *s = '\0';
-    return (strcmp(buf1, buf2));
-}
-
-int
-uStrCasePrefix(const char *my_prefix, char *str)
-{
-    char c1;
-    char c2;
-    while (((c1 = *my_prefix) != '\0') && ((c2 = *str) != '\0'))
-    {
-        if (isupper(c1))
-            c1 = tolower(c1);
-        if (isupper(c2))
-            c2 = tolower(c2);
-        if (c1 != c2)
-            return 0;
-        my_prefix++;
-        str++;
-    }
-    if (c1 != '\0')
-        return 0;
-    return 1;
-}
-
-#endif
diff --git a/src/xkbcomp/utils.h b/src/xkbcomp/utils.h
deleted file mode 100644
index 020ed75..0000000
--- a/src/xkbcomp/utils.h
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef UTILS_H
-#define	UTILS_H 1
-
-  /*\
-   *
-   *                          COPYRIGHT 1990
-   *                    DIGITAL EQUIPMENT CORPORATION
-   *                       MAYNARD, MASSACHUSETTS
-   *                        ALL RIGHTS RESERVED.
-   *
-   * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
-   * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
-   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
-   * WARRANTY.
-   *
-   * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
-   * RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN
-   * ADDITION TO THAT SET FORTH ABOVE.
-   *
-   * Permission to use, copy, modify, and distribute this software and its
-   * documentation for any purpose and without fee is hereby granted, 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 Digital Equipment Corporation not be
-   * used in advertising or publicity pertaining to distribution of the
-   * software without specific, written prior permission.
-   \*/
-
-/***====================================================================***/
-
-#include 	<stdio.h>
-#include	<X11/Xos.h>
-#include	<X11/Xfuncproto.h>
-#include	<X11/Xfuncs.h>
-
-#include <stddef.h>
-#include "config.h"
-
-#ifndef NUL
-#define	NUL	'\0'
-#endif
-
-/***====================================================================***/
-
-#ifndef BOOLEAN_DEFINED
-typedef char Boolean;
-#endif
-
-#ifndef True
-#define	True	((Boolean)1)
-#define	False	((Boolean)0)
-#endif /* ndef True */
-#define	booleanText(b)	((b)?"True":"False")
-
-#ifndef COMPARISON_DEFINED
-typedef int Comparison;
-
-#define	Greater		((Comparison)1)
-#define	Equal		((Comparison)0)
-#define	Less		((Comparison)-1)
-#define	CannotCompare	((Comparison)-37)
-#define	comparisonText(c)	((c)?((c)<0?"Less":"Greater"):"Equal")
-#endif
-
-/***====================================================================***/
-
-extern void *
-recalloc(void * old, unsigned nOld, unsigned nNew, unsigned newSize);
-
-#define	uTypedAlloc(t)		((t *)malloc((unsigned)sizeof(t)))
-#define	uTypedCalloc(n,t)	((t *)calloc((unsigned)n,(unsigned)sizeof(t)))
-#define	uTypedRealloc(pO,n,t)	((t *)realloc(pO,((unsigned)n)*sizeof(t)))
-#define	uTypedRecalloc(pO,o,n,t) ((t *)recalloc(pO,((unsigned)o),((unsigned)n),sizeof(t)))
-#if (defined mdHasAlloca) && (mdHasAlloca)
-#define	uTmpAlloc(n)	alloca((unsigned)n)
-#define	uTmpFree(p)
-#else
-#define	uTmpAlloc(n)	malloc(n)
-#define	uTmpFree(p)	free(p)
-#endif
-
-/***====================================================================***/
-
-extern Boolean
-uSetErrorFile(char *name);
-
-#if defined(__GNUC__) && \
-    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6)))
-#define __ATTR_PRINTF(i, f) __attribute__ ((format(printf, (i), (f))))
-#else
-#define __ATTR_PRINTF(i, f)
-#endif
-
-#define INFO 			uInformation
-
-extern __ATTR_PRINTF(1, 2) void
-uInformation(const char *s, ...);
-
-#define ACTION			uAction
-
-extern __ATTR_PRINTF(1, 2) void
-uAction(const char *s, ...);
-
-#define WARN			uWarning
-
-extern __ATTR_PRINTF(1, 2) void
-uWarning(const char *s, ...);
-
-#define ERROR			uError
-
-extern __ATTR_PRINTF(1, 2) void
-uError(const char *s, ...);
-
-#define FATAL			uFatalError
-
-extern __ATTR_PRINTF(1, 2) _X_NORETURN void
-uFatalError(const char *s, ...);
-
-/* WSGO stands for "Weird Stuff Going On" (wtf???) */
-#define WSGO			uInternalError
-
-extern __ATTR_PRINTF(1, 2) void
-uInternalError(const char *s, ...);
-
-/***====================================================================***/
-
-#define	NullString	((char *)NULL)
-
-#define	uStringText(s)		((s)==NullString?"<NullString>":(s))
-#define	uStringEqual(s1,s2)	(uStringCompare(s1,s2)==Equal)
-#define	uStringPrefix(p,s)	(strncmp(p,s,strlen(p))==0)
-#define	uStringCompare(s1,s2)	(((s1)==NullString||(s2)==NullString)?\
-                                 (s1)!=(s2):strcmp(s1,s2))
-#define	uStrCaseEqual(s1,s2)	(uStrCaseCmp(s1,s2)==0)
-#ifdef HAVE_STRCASECMP
-#define	uStrCaseCmp(s1,s2)	(strcasecmp(s1,s2))
-#define	uStrCasePrefix(p,s)	(strncasecmp(p,s,strlen(p))==0)
-#else
-extern int
-uStrCaseCmp(const char *s1, const char *s2);
-extern int
-uStrCasePrefix(const char *p, char *str);
-#endif
-
-/***====================================================================***/
-
-#ifdef	ASSERTIONS_ON
-#define	uASSERT(where,why) \
-	{if (!(why)) uFatalError("assertion botched in %s ( why )\n",where);}
-#else
-#define	uASSERT(where,why)
-#endif
-
-/***====================================================================***/
-
-#ifndef DEBUG_VAR
-#define	DEBUG_VAR	debugFlags
-#endif
-
-extern unsigned int DEBUG_VAR;
-
-#endif /* UTILS_H */
diff --git a/test/filecomp.c b/test/filecomp.c
index facc02f..94c1bc1 100644
--- a/test/filecomp.c
+++ b/test/filecomp.c
@@ -31,7 +31,7 @@ authorization from the authors.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include "xkbcommon/xkbcommon.h"
-#include "xkbcomp/utils.h"
+#include "utils.h"
 
 static char buffer[8192];
 
diff --git a/test/namescomp.c b/test/namescomp.c
index b98ac7a..95dcecc 100644
--- a/test/namescomp.c
+++ b/test/namescomp.c
@@ -29,7 +29,7 @@ authorization from the authors.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include "xkbcommon/xkbcommon.h"
-#include "xkbcomp/utils.h"
+#include "utils.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/test/rulescomp.c b/test/rulescomp.c
index fa0890a..0a84c94 100644
--- a/test/rulescomp.c
+++ b/test/rulescomp.c
@@ -29,7 +29,7 @@ authorization from the authors.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include "xkbcommon/xkbcommon.h"
-#include "xkbcomp/utils.h"
+#include "utils.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/test/state.c b/test/state.c
index bc02148..476ee18 100644
--- a/test/state.c
+++ b/test/state.c
@@ -31,7 +31,7 @@
 #include <X11/keysym.h>
 #include <linux/input.h>
 #include "xkbcommon/xkbcommon.h"
-#include "xkbcomp/utils.h"
+#include "utils.h"
 #include "XKBcommonint.h"
 
 /* Offset between evdev keycodes (where KEY_ESCAPE is 1), and the evdev XKB