upstream pull
Fixed includes for different base types