Fix build

Change-Id: Ibeba9f22ccb4d5a4cc47919121ed4782182e34f0
Update settings headers to be more like upstream Slim

Change-Id: Ie21dfa19fe333831b953ea8208bee9cefc800a5a