Fixed function declarations to work with header.