See #1: Fix relative paths to headers. Add necessary includes