moving a few items into the same ifdef statement so they are more easily located...