First round of #include cleanups, ConstraintEngine module