   "\\_<C: +\\(\\w+\\) +\\(\\w+\\)\\( .*\\)?$")
 
 (defconst factor-typedef-regex
-  "\\_<TYPEDEF: +\\(\\w+\\) +\\(\\w+\\)\\( .*\\)?$")
+  (format "\\_<TYPEDEF: +%s %s\\( .*\\)?$" symbol symbol))
 
 (defconst factor-c-global-regex
   "\\_<C-GLOBAL: +\\(\\w+\\) +\\(\\w+\\)\\( .*\\)?$")
 
 (defconst factor-c-type-regex
-  "\\_<C-TYPE: +\\(\\w+\\)\\( .*\\)?$")
+  (format "\\_<C-TYPE: +%s\\( .*\\)?$" symbol))
 
 (defconst factor-rename-regex
   "\\_<RENAME: +\\(\\w+\\) +\\(\\w+\\) +=> +\\(\\w+\\)\\( .*\\)?$")

(defconst factor-sub-vocab-regex "^<\\([^ \n]+\\) *$")

(defconst factor-alien-function-regex
  "\\_<FUNCTION: +\\(\\w+\\)[\n ]+\\(\\w+\\)")

(defconst factor-alien-function-alias-regex
  "\\_<FUNCTION-ALIAS: +\\(\\w+\\)[\n ]+\\(\\w+\\)[\n ]+\\(\\w+\\)")


;;; Regexps galore:

;; Utility regexp used by other regexps to match a Factor symbol name
(setq-local symbol "\\(\\(?:\\sw\\|\\s_\\)+\\)")

;; Excludes parsing words that are handled by other regexps
(defconst factor-parsing-words
