- Adjust whitespaces/include order to make FS source look as close to V/dev as possible. - Include source in V/dev that's not in FS and comment it out with an annotation.