Some cleanup on includes and function signatures.