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

This reverts commit cd511158e5d791053ddfe2a5708bd7d5d6601b73.