Make exception for body common control
Add masterfiles/lib to include directories.

Can now include snippets from library files. Don't have the version
in any config variable, so include macros need to specify version
explicitly for now.