Common header and source files added