Moved things around and updated xml_extract.h so that everything compiles again.  Other than NIF_Blocks.h/cpp which will be removed in the future, of course.