reorder includes to avoid warning.
fixes rest of bug #62
2 files changed