util: fix apparent statetrace bug

In the process of trying to eliminate boolean comparisons,
I ran across this statement that appears to be a bug
(should have been an assignment).

includes: sort all includes

Statetrace: Accomodate cross compiling statetrace with scons.