[MOD] Adapted RESTXQ to refactorings in main project.
Merge pull request #76 from LeoWoerteler/static-decls

[MOD] Adapted RESTXQ to refactorings in main project.