Fixed a bug with scissor box "inheritance"
Fixed a missing header.
Merge pull request #276 from CIB/windows-compilefix

Two small fixes