Move duplicated header files from inc/ back into src/