Moved some handle declarations to the right headers.

3 files changed