fixes include headers
rename functions