Move non-external API header files back to src dir