Adding back .c files in Headers, which are needed by headers