fix some RMF include issues