Fix compilation with standard javac

Not quite sure what caused this - but the order types are imported seems
to make a difference.
Merge pull request #4 from jberkel/fix-javac-compilation

Fix compilation with standard javac.