Switched to un-typedef'd struct declarations (like in the linux kernel), to make resolving complex header relationships simpler