Renamed patch.hpp to patch.h again.