fix includes
another windows patc for RMF