Almost done Delphi headers. Some fixes in c++ headers