diff --git a/setup/extensions.py b/setup/extensions.py
index c3a7fe4550..8050fce363 100644
--- a/setup/extensions.py
+++ b/setup/extensions.py
@@ -179,12 +179,12 @@ extensions = [
     ),
 
     Extension('matcher',
-        ['calibre/gui2/tweak_book/matcher.c'],
+        ['calibre/utils/matcher.c'],
         headers=['calibre/utils/icu_calibre_utils.h'],
         libraries=icu_libs,
         lib_dirs=icu_lib_dirs,
         cflags=icu_cflags,
-        inc_dirs=icu_inc_dirs  + ['calibre/utils']
+        inc_dirs=icu_inc_dirs
     ),
 
     Extension('podofo',
diff --git a/src/calibre/gui2/tweak_book/matcher.c b/src/calibre/utils/matcher.c
similarity index 100%
rename from src/calibre/gui2/tweak_book/matcher.c
rename to src/calibre/utils/matcher.c
diff --git a/src/calibre/gui2/tweak_book/matcher.py b/src/calibre/utils/matcher.py
similarity index 100%
rename from src/calibre/gui2/tweak_book/matcher.py
rename to src/calibre/utils/matcher.py