I don't know what the hell happened, but I had to synchronize my entire project's tree against GZDoom's tree by hand, file-by-file, line-by-line, because no matter how many times I tried to Pull from upstream (GZDoom), it won't seem to update my project properly.