Add /masterfiles and /core/tests to include directories.  Remove /masterfiles/lib