Ah, right. Good call.
In particular I'll note that I had to move constants around because of the conflict between the Windows GDI BITMAP type and the Allegro BITMAP type. The Windows headers are included in NativeMethods.cpp while the Allegro headers are included in the GUI headers. I was thinking it would be best to keep changes minimal, but you make a perfectly valid point.
