Move RequestContext definitions to source files