Another compile fix.
Need to reorder includes due to HANDLE definition conflict.
Merge pull request #2267 from ey6es/visagefix

Two more Visage compilation fixes.