141125-iss002: remove includes