Modify location of header includes.
Fix incorrect boolean expression.