Moving utility functions include to config to avoid warnings, be consistent