diff --git a/src/xkbcomp/alias.c b/src/xkbcomp/alias.c
index 3b88d72..2635c68 100644
--- a/src/xkbcomp/alias.c
+++ b/src/xkbcomp/alias.c
@@ -162,7 +162,7 @@ ApplyAliases(XkbcDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
     XkbKeyAliasPtr old, a;
     AliasInfo *info;
     int nNew, nOld;
-    Status status;
+    int status;
 
     if (*info_in == NULL)
         return True;
diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index 4b9445c..116de6f 100644
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -374,10 +374,10 @@ static KeyNameDesc dfltKeys[] = {
     {NoSymbol, NoSymbol, "\0\0\0\0"}
 };
 
-Status
+int
 ComputeKbdDefaults(XkbcDescPtr xkb)
 {
-    Status rtrn;
+    int rtrn;
     register int i, tmp, nUnknown;
     KeyNameDesc *name;
     KeySym *syms;
diff --git a/src/xkbcomp/misc.h b/src/xkbcomp/misc.h
index ae47987..a440c7c 100644
--- a/src/xkbcomp/misc.h
+++ b/src/xkbcomp/misc.h
@@ -92,7 +92,7 @@ extern Bool ProcessIncludeFile(IncludeStmt * /* stmt */ ,
                                unsigned *       /* merge_rtrn */
     );
 
-extern Status ComputeKbdDefaults(XkbcDescPtr     /* xkb */
+extern int ComputeKbdDefaults(XkbcDescPtr     /* xkb */
     );
 
 extern Bool FindNamedKey(XkbcDescPtr /* xkb */ ,