get in sync with master branch - commit 2013-12-18 Axel NaumannFix headers to be usable standalone