moved header files back in place from forward_decl_BAD
move even more header files back (and had to correct many files).
Now forward_decl_BAD is "correct" in being incorrect.