Fixing errors in includes