API interface fixes

David Schäferrequested to merge
interface into develop

Changes return types, fixes constant import and whitespaces.

Merge request reports