Renamed required include files to reflect the namespace they are in.