diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index d897c67..77914b0 100755
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -67,7 +67,7 @@ _zsh_highlight_main_highlighter()
 {
   emulate -L zsh
   setopt localoptions extendedglob bareglobqual
-  local start_pos=0 end_pos highlight_glob=true new_expression=true arg style lsstyle sudo=false sudo_arg=false
+  local start_pos=0 end_pos highlight_glob=true new_expression=true arg style lsstyle start_file_pos end_file_pos sudo=false sudo_arg=false
   typeset -a ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR
   typeset -a ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS
   typeset -a ZSH_HIGHLIGHT_TOKENS_FOLLOWED_BY_COMMANDS
diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh
index 77b1a8b..b7afae0 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -35,7 +35,6 @@
 
 # Array declaring active highlighters names.
 typeset -ga ZSH_HIGHLIGHT_HIGHLIGHTERS
-typeset -gA ZSH_HIGHLIGHT_FILES
 
 # Update ZLE buffer syntax highlighting.
 #
@@ -107,6 +106,7 @@ _zsh_highlight()
 
 # Array used by highlighters to declare user overridable styles.
 typeset -gA ZSH_HIGHLIGHT_STYLES
+typeset -gA ZSH_HIGHLIGHT_FILES
 
 # Whether the command line buffer has been modified or not.
 #