Moritz Nadler - 2013-03-25

Also the
defined(BETHE)
preprocesser commands should be replaced with something more transparent