diff --git a/lib/helpers.bash b/lib/helpers.bash
index 59b5d58a..dbd6aab0 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -3,11 +3,11 @@
 # A collection of reusable functions.
 
 # Avoid duplicate inclusion
-if [[ -n "${__bash_it_lib_helpers:-}" ]]
+if [[ "${__bash_it_lib_loaded[*]:-}" == *"${BASH_SOURCE#*/}"* ]]
 then
     return 0
 fi
-__bash_it_lib_helpers="loaded"
+__bash_it_lib_loaded=( "${BASH_SOURCE#*/}" "${__bash_it_lib_loaded[@]:-}" )
 
 BASH_IT_LOAD_PRIORITY_DEFAULT_ALIAS=${BASH_IT_LOAD_PRIORITY_DEFAULT_ALIAS:-150}
 BASH_IT_LOAD_PRIORITY_DEFAULT_PLUGIN=${BASH_IT_LOAD_PRIORITY_DEFAULT_PLUGIN:-250}
diff --git a/lib/log.bash b/lib/log.bash
index f9769d60..9b9ff475 100644
--- a/lib/log.bash
+++ b/lib/log.bash
@@ -3,11 +3,11 @@
 # A collection of logging functions.
 
 # Avoid duplicate inclusion
-if [[ -n "${__bash_it_lib_log:-}" ]]
+if [[ "${__bash_it_lib_loaded[*]:-}" == *"${BASH_SOURCE#*/}"* ]]
 then
     return 0
 fi
-__bash_it_lib_log="loaded"
+__bash_it_lib_loaded=( "${BASH_SOURCE#*/}" "${__bash_it_lib_loaded[@]:-}" )
 
 export BASH_IT_LOG_LEVEL_ERROR=1
 export BASH_IT_LOG_LEVEL_WARNING=2
diff --git a/lib/search.bash b/lib/search.bash
index 0d9f677b..d55e5af5 100755
--- a/lib/search.bash
+++ b/lib/search.bash
@@ -3,11 +3,12 @@
 # Search by Konstantin Gredeskoul «github.com/kigster»
 
 # Avoid duplicate inclusion
-if [[ -n "${__bash_it_lib_search:-}" ]]
+if [[ "${__bash_it_lib_loaded[*]:-}" == *"${BASH_SOURCE#*/}"* ]]
 then
     return 0
 fi
-__bash_it_lib_search="loaded"
+__bash_it_lib_loaded=( "${BASH_SOURCE#*/}" "${__bash_it_lib_loaded[@]:-}" )
+
 #———————————————————————————————————————————————————————————————————————————————
 # This function returns list of aliases, plugins and completions in bash-it,
 # whose name or description matches one of the search terms provided as arguments.
diff --git a/lib/utilities.bash b/lib/utilities.bash
index 33e7aa8b..96fbb752 100644
--- a/lib/utilities.bash
+++ b/lib/utilities.bash
@@ -3,11 +3,11 @@
 # A collection of reusable functions.
 
 # Avoid duplicate inclusion
-if [[ -n "${__bash_it_lib_utilities:-}" ]]
+if [[ "${__bash_it_lib_loaded[*]:-}" == *"${BASH_SOURCE#*/}"* ]]
 then
     return 0
 fi
-__bash_it_lib_utilities="loaded"
+__bash_it_lib_loaded=( "${BASH_SOURCE#*/}" "${__bash_it_lib_loaded[@]:-}" )
 
 ###########################################################################
 # Generic utilies