Adjust module inclusion order