Also changed references within source files that referred to
header files whose names had changed.
Signed-off-by: NMike Marshall <hubcap@omnibond.com>