reorder a few declarations to get rid of -Wreorder warnings