Fixed a bug where a few class forward declarations
weren't in the proper namespace.