Got rid of main.h.

9 files changed