TEMPORARY FORK TO FIX ISSUES WITH INCLUDES