Merge changes Ia3732dc4,I47cad3c2

* changes:
  Check and normalize defines during import
  Remove ripemd