any chance you could indent the #ifdefs? I don't mind doing it but if you have conflicts in the future this may not be the best...