Removed unnecessary include dir in compiler flags
Better header handling

Better handling of conditional include of mkl specific header.
Removed duplicated header.