Removed hard-coded paths from includes