Eliminated "redefined struct" warning