Move headers to source code