Simplified CFILES and CPPFILES
Merge