diff --git a/src/context.c b/src/context.c
index 18a8222..814223b 100644
--- a/src/context.c
+++ b/src/context.c
@@ -202,7 +202,7 @@ priority_to_prefix(int priority)
     case LOG_EMERG:
         return "Internal error:";
     default:
-        return "";
+        return NULL;
     }
 }
 
@@ -316,11 +316,7 @@ xkb_log(struct xkb_context *ctx, int priority, const char *fmt, ...)
     va_list args;
 
     va_start(args, fmt);
-    /* NOTE: This test will be removed in a few commits. */
-    if (ctx)
-        ctx->log_fn(ctx, priority, fmt, args);
-    else
-        default_log_fn(ctx, priority, fmt, args);
+    ctx->log_fn(ctx, priority, fmt, args);
     va_end(args);
 }
 
diff --git a/src/utils.h b/src/utils.h
index 5e4000a..89e2c13 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -68,10 +68,4 @@
 #define ATTR_MALLOC
 #endif
 
-#define INFO(...) xkb_log(NULL, LOG_INFO, __VA_ARGS__)
-#define WARN(...) xkb_log(NULL, LOG_WARNING, __VA_ARGS__)
-#define ERROR(...) xkb_log(NULL, LOG_ERR, __VA_ARGS__)
-#define WSGO(...) xkb_log(NULL, LOG_CRIT, __VA_ARGS__)
-#define ACTION(...) xkb_log(NULL, -1, __VA_ARGS__)
-
 #endif /* UTILS_H */
diff --git a/src/xkbcomp/xkbcomp.c b/src/xkbcomp/xkbcomp.c
index cb9eb20..7b1b198 100644
--- a/src/xkbcomp/xkbcomp.c
+++ b/src/xkbcomp/xkbcomp.c
@@ -28,9 +28,6 @@
 #include "rules.h"
 #include "parseutils.h"
 
-/* Global warning level */
-unsigned int warningLevel = 0;
-
 #define ISEMPTY(str) (!(str) || (strlen(str) == 0))
 
 static XkbFile *
diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index 23cc6fb..e7ee15b 100644
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -87,8 +87,6 @@ enum merge_mode {
 #define AutoKeyNames (1L << 0)
 #define CreateKeyNames(x) ((x)->flags & AutoKeyNames)
 
-extern unsigned warningLevel;
-
 typedef struct _IncludeStmt {
     ParseCommon common;
     enum merge_mode merge;