Merge superfluous header files into .c files