Xxxajk

This fixes a linking issue when you #define DEBUG

Don't remove the one in message.cpp or you get the error.

I also turned debug on as the default for mass storage, and removed some silly includes that are redundant.