Updated includes and SConstruct to improve build and includes.