tweak include order
Merge pull request #2002 from tduehr/include_order

tweak include order