Namespace removal;
Adding some missing include files