:qSome cleanup on includes and function signatures.