Move javadoc comments to .h where possible