diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c
index 2debae7..f87b5ef 100644
--- a/src/xkbcomp/action.c
+++ b/src/xkbcomp/action.c
@@ -26,7 +26,6 @@
 
 #include "xkbcomp.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 
 #include "keycodes.h"
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 7a66281..9b268e6 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -28,7 +28,6 @@
 #include "xkbcomp.h"
 #include "xkballoc.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "vmod.h"
 #include "misc.h"
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index 929548a..13f8745 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -26,7 +26,6 @@
 
 #include "xkbcomp.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "vmod.h"
 
diff --git a/src/xkbcomp/geometry.c b/src/xkbcomp/geometry.c
index 41e0ab0..8e425a1 100644
--- a/src/xkbcomp/geometry.c
+++ b/src/xkbcomp/geometry.c
@@ -28,7 +28,6 @@
 #include "xkballoc.h"
 #include "xkbgeom.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "vmod.h"
 #include "misc.h"
diff --git a/src/xkbcomp/indicators.c b/src/xkbcomp/indicators.c
index 34d6a64..09baaaf 100644
--- a/src/xkbcomp/indicators.c
+++ b/src/xkbcomp/indicators.c
@@ -28,7 +28,6 @@
 #include "xkballoc.h"
 #include "xkbmisc.h"
 #include "misc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "vmod.h"
 #include "indicators.h"
diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 8457245..906aa5f 100644
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -27,7 +27,6 @@
 #include "xkbcomp.h"
 #include "xkballoc.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "keycodes.h"
 #include "misc.h"
diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c
index 874bf8e..2c2420d 100644
--- a/src/xkbcomp/keymap.c
+++ b/src/xkbcomp/keymap.c
@@ -26,7 +26,6 @@
 
 #include "xkbcomp.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "vmod.h"
 #include "action.h"
diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index 57164d2..71f6075 100644
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -27,7 +27,6 @@
 #include "xkbcomp.h"
 #include "xkballoc.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "vmod.h"
 #include "action.h"
diff --git a/src/xkbcomp/listing.c b/src/xkbcomp/listing.c
index 479af3f..dbedca6 100644
--- a/src/xkbcomp/listing.c
+++ b/src/xkbcomp/listing.c
@@ -120,7 +120,6 @@ SOFTWARE.
 #include "xkbpath.h"
 #include "parseutils.h"
 #include "misc.h"
-#include "tokens.h"
 
 #ifndef DFLT_XKB_CONFIG_ROOT
 #define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb"
diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index e538bab..35f947c 100644
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -28,7 +28,6 @@
 #include "xkballoc.h"
 #include "xkbmisc.h"
 #include "xkbpath.h"
-#include "tokens.h"
 #include "keycodes.h"
 #include "misc.h"
 #include <X11/keysym.h>
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index f646e76..d82ec2e 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -27,7 +27,6 @@
 #include "xkbcomp.h"
 #include "xkballoc.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "parseutils.h"
 
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 4ea022a..d4f243b 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -29,7 +29,6 @@
 #include "xkbcomp.h"
 #include "xkballoc.h"
 #include "xkbmisc.h"
-#include "tokens.h"
 #include "expr.h"
 #include "misc.h"