...so remove these remnants from a time when developers got away with ignoring
warnings and tools/solar.h was considered the center of the universe

Change-Id: I526c6b44fafb98e8400f2ab122dbb7e2bfbb3480