new source commit 30686a75ed9a146d1d4568c0ec2235f6cabc0c19
    Temporary fix for #86
    Corrected badly formed includes. Fix for #81