Fixing include in .cpp file and moving forward defs to inside namespace