Correcting source files to avoid linkage fail