GitLab

* Kill duplicate code
* Kill useless forwarding function
* Regroup some declarations
* Replace include by declaration

Change-Id: I54656e4e97b1fbdf7cf2f4a87d17955128f3825e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>