Fix 2 include file bugs (related to previous update)