use explicit data types
fixing include order