Remove all size.incs
Remove Common directory
Move more files to @Resources