Changed headers to take const char* where possible