Fixed relative path in include and improved clean-up