Solved the issues with containers! :D

Turned out to be a circular reference in the headers, solved it by using
forward declarations.