Less Preprocessor integration done.

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>