master
Replace forward references with includes of Fwd.h files
make two parameters configurable instead of being hard-coded
code checks and format
first round of dependency cleanups