Adding missing headers and source files