Revert "Correct bitmap define to ovoid compile warnings"

This reverts commit c03e75793e9bfdbadef6bed216aed3b9e4ecb0ba.