Change the way includes are done (Fixes #19)