Revert "Include the main directory when compiling tests - so we can include "private" header files"

This reverts commit 01bf1f81fd9513a790e73997625ea88be85e5c3f.