This is a follow-on to b799af91d5. Remove _func function suffix and unneeded #includes.
b799af91d5
Get most of these working with scons.