bump RMF to get enum stuff tested
remove bad #include
remove now-unnecessary declare_ headers
clean up left over restrainer stuff