Added includes and fixed preprocessor macros so that main-stats and
wiz-stats compile.
Merge pull request #316 from myshkin/restruct_stats_includes

Make --enable-stats build.