Fix include and require handling