[PATCH v2 4/7] pmem, x86: clean up conditional pmem includes