Fix missing include and remove unused headers