Merge from metze of libreplace header changes