Index: util/sconfig/config.g
===================================================================
--- util/sconfig/config.g	(revision 5361)
+++ util/sconfig/config.g	(working copy)
@@ -419,8 +419,8 @@
 					self.chipinfo_name))
 				if (self.registercode):
 					file.write("\t= {\n")
-					for f, v in self.registercode.items():
-						file.write( "\t.%s = %s,\n" % (f, v))
+					for f in sorted(self.registercode.keys()):
+						file.write( "\t.%s = %s,\n" % (f, self.registercode[f]))
 					file.write("};\n")
 				else:
 					file.write(";")
@@ -433,17 +433,17 @@
 				file.write("\t.ops = &default_dev_ops_root,\n")
 				file.write("\t.bus = &dev_root.link[0],\n")
 				file.write("\t.path = { .type = DEVICE_PATH_ROOT },\n")
-				file.write("\t.enabled = 1,\n\t.links = 1,\n")
+				file.write("\t.enabled = 1,\n")
 				file.write("\t.on_mainboard = 1,\n")
 				file.write("\t.link = {\n\t\t[0] = {\n")
-				file.write("\t\t\t.dev=&dev_root,\n\t\t\t.link = 0,\n")
+				file.write("\t\t\t.link = 0,\n\t\t\t.dev = &dev_root,\n")
 				file.write("\t\t\t.children = &%s,\n" % self.firstchilddevice().instance_name)
 				file.write("\t\t},\n")
-				file.write("\t},\n")
+				file.write("\t},\n\t.links = 1,\n")
 				if (self.chipconfig):
 					file.write("\t.chip_ops = &%s_ops,\n" % self.type_name)
 					file.write("\t.chip_info = &%s_info_%s,\n" % (self.type_name, self.instance))
-				file.write("\t.next = &%s,\n" % self.firstchilddevice().instance_name)
+				file.write("\t.next=&%s\n" % self.firstchilddevice().instance_name)
 				file.write("};\n")
 			return
 
@@ -890,8 +890,15 @@
 	file = safe_open(filename, 'w+')
 	file.write("#include <device/device.h>\n")
 	file.write("#include <device/pci.h>\n")
-	for path in image.getconfigincludes().values():
+	root_complex_hack = ""
+	for path in sorted(image.getconfigincludes().values()):
+		if "root_complex" in path:
+			root_complex_hack = path
+			continue
 		file.write("#include \"%s\"\n" % path)
+		if not root_complex_hack == "":
+			file.write("#include \"%s\"\n" % root_complex_hack)
+			root_complex_hack = ""
 	file.write("\n/* pass 0 */\n")
 	gencode(image.getroot(), file, 0)
 	file.write("\n/* pass 1 */\n")