Added missing include
Removed unused typedef