Get Borland C++ build working yet again