diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 087ddce97..981992d88 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -22,7 +22,7 @@ less_termcap[ue]="${reset_color}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
 # Absolute path to this file's directory.
-typeset __colored_man_pages_dir="${0:A:h}"
+typeset -g __colored_man_pages_dir="${0:A:h}"
 
 function colored() {
   local -a environment
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 77c2125d2..6c12bae13 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -32,7 +32,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `deno`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _deno
   _comps[deno]=_deno
 fi
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index e22588792..044e16a04 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -18,7 +18,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `fnm`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _fnm
   _comps[fnm]=_fnm
 fi
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 17995e1cf..9263220ca 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -19,7 +19,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `gh`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _gh
   _comps[gh]=_gh
 fi
diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index 472c1c9dd..c6b91693a 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -14,7 +14,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `helm`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _helm
   _comps[helm]=_helm
 fi
diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
index 3825be7a6..56683ad06 100644
--- a/plugins/rbw/rbw.plugin.zsh
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `rbw`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _rbw
   _comps[rbw]=_rbw
 fi
diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
index 014c73b3b..465b701b0 100644
--- a/plugins/rust/rust.plugin.zsh
+++ b/plugins/rust/rust.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # bind it to `cargo`. Otherwise, compinit will have already done that
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_cargo" ]]; then
   autoload -Uz _cargo
-  declare -A _comps
+  typeset -g -A _comps
   _comps[cargo]=_cargo
 fi
 
@@ -19,7 +19,7 @@ fi
 # bind it to `rustup`. Otherwise, compinit will have already done that
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then
   autoload -Uz _rustup
-  declare -A _comps
+  typeset -g -A _comps
   _comps[rustup]=_rustup
 fi
 
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 4ba885563..864389ba8 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,7 +1,7 @@
 # Completion
 fpath+=("${rvm_path}/scripts/zsh/Completion")
 
-declare -A _comps
+typeset -g -A _comps
 autoload -Uz _rvm
 _comps[rvm]=_rvm
 
diff --git a/plugins/volta/volta.plugin.zsh b/plugins/volta/volta.plugin.zsh
index 756dc84b3..79319394c 100644
--- a/plugins/volta/volta.plugin.zsh
+++ b/plugins/volta/volta.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `deno`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_volta" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _volta
   _comps[volta]=_volta
 fi
diff --git a/themes/dieter.zsh-theme b/themes/dieter.zsh-theme
index 58d9f88a9..83f2dcc7c 100644
--- a/themes/dieter.zsh-theme
+++ b/themes/dieter.zsh-theme
@@ -6,7 +6,7 @@
 # The exit code visual cues will only display once.
 # (i.e. they will be reset, even if you hit enter a few times on empty command prompts)
 
-typeset -A host_repr
+typeset -g -A host_repr
 
 # translate hostnames into shortened, colorcoded strings
 host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 11d799a84..e8c490884 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -66,7 +66,7 @@ if [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
   PR_LRCORNER="┘"
   PR_URCORNER="┐"
 else
-  typeset -A altchar
+  typeset -g -A altchar
   set -A altchar ${(s..)terminfo[acsc]}
   # Some stuff to help us draw nice lines
   PR_SET_CHARSET="%{$terminfo[enacs]%}"