Fixed bad typedefing and forwarding delcaring