Fixed some includes to work with latest version of sparrow