Include env.h, new top-level index, and show defines in #if's