+ aligning preprocessor lines
+ CEH: improvements in include-expr
+ CEH: added insert-include-expr