More stabs at getting #includes right, and moving off of deprecated functions.
5 files changed