Source functions in the order needed.

README.md

@@ -27,8 +27,8 @@ minimum recommended version is 4.3.9.
 ### Problems?
 
 If you are not able to find certain commands after switching to *Oh My ZSH*, you need
-to modify `PATH` in `~/.zshrc`, or better yet, in `~/functions/environment.zsh` (may
-be subject to merge conflicts).
+to modify `PATH` in `~/.zshrc`, or better yet, in `~/functions/02.environment.zsh`
+(may be subject to merge conflicts).
 
 ## Usage
 

functions/init.zsh

@@ -0,0 +1,12 @@
+# Source function files (the order matters).
+source "${0:h}/helper.zsh"
+source "${0:h}/environment.zsh"
+source "${0:h}/terminal.zsh"
+source "${0:h}/keyboard.zsh"
+source "${0:h}/completion.zsh"
+source "${0:h}/history.zsh"
+source "${0:h}/directory.zsh"
+source "${0:h}/alias.zsh"
+source "${0:h}/spectrum.zsh"
+source "${0:h}/utility.zsh"
+

oh-my-zsh.zsh

@@ -11,10 +11,8 @@ fpath=($OMZ/themes/*(/) $OMZ/plugins/${^plugins} $OMZ/functions $fpath)
 # Load and initialize the completion system.
 autoload -Uz compinit && compinit -i
 
-# Load all files in $OMZ/oh-my-zsh/lib/ that end in .zsh.
-for function_file in $OMZ/functions/*.zsh; do
-  source "$function_file"
-done
+# Source function files.
+source "$OMZ/functions/init.zsh"
 
 # Load all plugins defined in ~/.zshrc.
 for plugin in $plugins; do