master: patch folsom include directives