This reverts commit 3afea91088. This was actually not the issue, even though it seemed to trigger the issue.
3afea91088
This reverts commit 593b7cd6a1. This causes breakage on MSVC. I am not sure sure why, but this is not that important, so just back it out.
593b7cd6a1
Also: * Init wx image handlers for qa_common * Break out COLOR4D test predicates * Fix some bitmap_base.h headers/forwards