Added includes
Added empty string fallback for missing files