fixed name clash in constraint checking code; also changed braces to double quote in #includes

17 files changed