Fixed up relative include paths to make this work.
- also cleaned up some warnings to do with CATCH_NULL
(and fixed up missing includes they uncovered)