PRE: fixed cpp definitions, so that we can build octave wrappers