Move more structs around to allow compile on *nix