some fixes in module includes