Should we have a #ifndef/#define here to ensure it's only included once?  (Maybe it doesn't matter.)