diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 0b1c482b20..edfb254f64 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2,93 +2,95 @@
 # General private symbols. Add symbols here, and see Makefile.am for
 # more details.
 #
+# Keep this file sorted by header name, then by symbols with each header.
+#
 
 # authhelper.h
-virRequestUsername;
 virRequestPassword;
+virRequestUsername;
 
 
 # bitmap.h
 virBitmapAlloc;
-virBitmapFree;
-virBitmapSetBit;
 virBitmapClearBit;
+virBitmapFree;
 virBitmapGetBit;
+virBitmapSetBit;
 
 
 # buf.h
-virBufferVSprintf;
-virBufferEscapeString;
 virBufferAdd;
 virBufferAddChar;
 virBufferContentAndReset;
 virBufferError;
-virBufferURIEncodeString;
+virBufferEscapeString;
 virBufferFreeAndReset;
-virBufferUse;
 virBufferStrcat;
+virBufferURIEncodeString;
+virBufferUse;
+virBufferVSprintf;
 
 
 # caps.h
 virCapabilitiesAddGuest;
 virCapabilitiesAddGuestDomain;
 virCapabilitiesAddGuestFeature;
+virCapabilitiesAddHostFeature;
 virCapabilitiesAddHostMigrateTransport;
 virCapabilitiesAddHostNUMACell;
-virCapabilitiesAddHostFeature;
+virCapabilitiesAllocMachines;
 virCapabilitiesDefaultGuestArch;
 virCapabilitiesDefaultGuestEmulator;
 virCapabilitiesDefaultGuestMachine;
 virCapabilitiesFormatXML;
 virCapabilitiesFree;
-virCapabilitiesFreeNUMAInfo;
-virCapabilitiesNew;
-virCapabilitiesSetMacPrefix;
-virCapabilitiesGenerateMac;
-virCapabilitiesSetEmulatorRequired;
-virCapabilitiesIsEmulatorRequired;
-virCapabilitiesAllocMachines;
 virCapabilitiesFreeMachines;
+virCapabilitiesFreeNUMAInfo;
+virCapabilitiesGenerateMac;
+virCapabilitiesIsEmulatorRequired;
+virCapabilitiesNew;
+virCapabilitiesSetEmulatorRequired;
 virCapabilitiesSetHostCPU;
-
-
-# conf.h
-virConfNew;
-virConfReadFile;
-virConfReadMem;
-virConfFree;
-virConfFreeValue;
-virConfGetValue;
-virConfSetValue;
-virConfWriteFile;
-virConfWriteMem;
+virCapabilitiesSetMacPrefix;
 
 
 # cgroup.h
+virCgroupAddTask;
+virCgroupAllowDeviceMajor;
+virCgroupAllowDevicePath;
+virCgroupControllerTypeFromString;
+virCgroupControllerTypeToString;
+virCgroupDenyAllDevices;
+virCgroupDenyDevicePath;
 virCgroupForDomain;
 virCgroupForDriver;
-virCgroupRemove;
 virCgroupFree;
-virCgroupAddTask;
-virCgroupSetMemory;
-virCgroupGetMemoryUsage;
-virCgroupSetCpuShares;
 virCgroupGetCpuShares;
-virCgroupDenyDevicePath;
-virCgroupAllowDevicePath;
-virCgroupDenyAllDevices;
-virCgroupAllowDeviceMajor;
-virCgroupControllerTypeToString;
-virCgroupControllerTypeFromString;
 virCgroupGetCpuacctUsage;
 virCgroupGetFreezerState;
-virCgroupSetFreezerState;
-virCgroupSetMemoryHardLimit;
 virCgroupGetMemoryHardLimit;
-virCgroupSetMemorySoftLimit;
 virCgroupGetMemorySoftLimit;
-virCgroupSetSwapHardLimit;
+virCgroupGetMemoryUsage;
 virCgroupGetSwapHardLimit;
+virCgroupRemove;
+virCgroupSetCpuShares;
+virCgroupSetFreezerState;
+virCgroupSetMemory;
+virCgroupSetMemoryHardLimit;
+virCgroupSetMemorySoftLimit;
+virCgroupSetSwapHardLimit;
+
+
+# conf.h
+virConfFree;
+virConfFreeValue;
+virConfGetValue;
+virConfNew;
+virConfReadFile;
+virConfReadMem;
+virConfSetValue;
+virConfWriteFile;
+virConfWriteMem;
 
 
 # cpu.h
@@ -100,204 +102,214 @@ cpuDataFree;
 cpuDecode;
 cpuEncode;
 cpuGuestData;
+cpuHasFeature;
 cpuNodeData;
 cpuUpdate;
-cpuHasFeature;
 
 
 # cpu_conf.h
-virCPUDefFree;
-virCPUDefParseXML;
-virCPUDefFormat;
-virCPUDefFormatBuf;
 virCPUDefAddFeature;
 virCPUDefCopy;
+virCPUDefFormat;
+virCPUDefFormatBuf;
+virCPUDefFree;
+virCPUDefParseXML;
 
 
 # datatypes.h
 virGetDomain;
+virGetDomainSnapshot;
 virGetInterface;
+virGetNWFilter;
 virGetNetwork;
+virGetNodeDevice;
+virGetSecret;
 virGetStoragePool;
 virGetStorageVol;
-virGetSecret;
-virUnrefStorageVol;
-virGetNodeDevice;
-virUnrefDomain;
-virUnrefConnect;
-virUnrefSecret;
 virGetStream;
-virUnrefStream;
-virGetNWFilter;
+virUnrefConnect;
+virUnrefDomain;
 virUnrefNWFilter;
-virGetDomainSnapshot;
+virUnrefSecret;
+virUnrefStorageVol;
+virUnrefStream;
+
+
+# dnsmasq.h
+dnsmasqAddDhcpHost;
+dnsmasqContextFree;
+dnsmasqContextNew;
+dnsmasqDelete;
+dnsmasqReload;
+dnsmasqSave;
 
 
 # domain_conf.h
 virDiskNameToBusDeviceIndex;
 virDiskNameToIndex;
 virDomainAssignDef;
-virDomainConfigFile;
-virDomainCpuSetFormat;
-virDomainCpuSetParse;
+virDomainChrConsoleTargetTypeFromString;
+virDomainChrConsoleTargetTypeToString;
+virDomainChrDefForeach;
 virDomainChrDefFree;
+virDomainChrTcpProtocolTypeFromString;
+virDomainChrTcpProtocolTypeToString;
 virDomainChrTypeFromString;
 virDomainChrTypeToString;
+virDomainClockOffsetTypeFromString;
+virDomainClockOffsetTypeToString;
+virDomainConfigFile;
+virDomainControllerDefFree;
+virDomainControllerInsert;
+virDomainControllerInsertPreAlloced;
+virDomainControllerModelTypeFromString;
+virDomainControllerModelTypeToString;
+virDomainControllerTypeToString;
+virDomainCpuSetFormat;
+virDomainCpuSetParse;
+virDomainDefAddImplicitControllers;
+virDomainDefClearDeviceAliases;
+virDomainDefClearPCIAddresses;
 virDomainDefFormat;
 virDomainDefFree;
 virDomainDefParseFile;
 virDomainDefParseNode;
 virDomainDefParseString;
 virDomainDeleteConfig;
+virDomainDeviceAddressIsValid;
+virDomainDeviceAddressTypeToString;
 virDomainDeviceDefFree;
 virDomainDeviceDefParse;
+virDomainDeviceInfoIsSet;
+virDomainDeviceInfoIterate;
+virDomainDevicePCIAddressIsValid;
 virDomainDeviceTypeToString;
 virDomainDiskBusTypeToString;
+virDomainDiskCacheTypeFromString;
+virDomainDiskCacheTypeToString;
+virDomainDiskDefAssignAddress;
+virDomainDiskDefForeachPath;
 virDomainDiskDefFree;
 virDomainDiskDeviceTypeToString;
+virDomainDiskErrorPolicyTypeToString;
 virDomainDiskInsert;
 virDomainDiskInsertPreAlloced;
 virDomainDiskRemove;
-virDomainDiskDefAssignAddress;
-virDomainDiskTypeToString;
 virDomainDiskTypeFromString;
-virDomainControllerInsert;
-virDomainControllerInsertPreAlloced;
-virDomainControllerModelTypeFromString;
-virDomainControllerModelTypeToString;
+virDomainDiskTypeToString;
+virDomainFSDefFree;
 virDomainFindByID;
 virDomainFindByName;
 virDomainFindByUUID;
 virDomainGetRootFilesystem;
+virDomainGraphicsDefFree;
 virDomainGraphicsTypeFromString;
 virDomainGraphicsTypeToString;
-virDomainGraphicsDefFree;
 virDomainHostdevDefFree;
 virDomainHostdevModeTypeToString;
 virDomainHostdevSubsysTypeToString;
 virDomainInputDefFree;
-virDomainLifecycleTypeFromString;
-virDomainLifecycleTypeToString;
 virDomainLifecycleCrashTypeFromString;
 virDomainLifecycleCrashTypeToString;
+virDomainLifecycleTypeFromString;
+virDomainLifecycleTypeToString;
 virDomainLoadAllConfigs;
+virDomainMemballoonModelTypeFromString;
+virDomainMemballoonModelTypeToString;
 virDomainNetDefFree;
 virDomainNetTypeToString;
+virDomainObjAssignDef;
+virDomainObjIsDuplicate;
+virDomainObjListDeinit;
+virDomainObjListGetActiveIDs;
+virDomainObjListGetInactiveNames;
+virDomainObjListInit;
+virDomainObjListNumOfDomains;
+virDomainObjLock;
+virDomainObjRef;
+virDomainObjUnlock;
+virDomainObjUnref;
 virDomainRemoveInactive;
-virDomainSaveXML;
 virDomainSaveConfig;
 virDomainSaveStatus;
+virDomainSaveXML;
+virDomainSnapshotAssignDef;
+virDomainSnapshotDefFormat;
+virDomainSnapshotDefFree;
+virDomainSnapshotDefParseString;
+virDomainSnapshotFindByName;
+virDomainSnapshotHasChildren;
+virDomainSnapshotObjListGetNames;
+virDomainSnapshotObjListNum;
+virDomainSnapshotObjListRemove;
+virDomainSnapshotObjUnref;
 virDomainSoundDefFree;
 virDomainSoundModelTypeFromString;
 virDomainSoundModelTypeToString;
-virDomainMemballoonModelTypeFromString;
-virDomainMemballoonModelTypeToString;
-virDomainWatchdogModelTypeFromString;
-virDomainWatchdogModelTypeToString;
-virDomainWatchdogActionTypeFromString;
-virDomainWatchdogActionTypeToString;
+virDomainStateTypeFromString;
+virDomainStateTypeToString;
+virDomainTimerModeTypeFromString;
+virDomainTimerModeTypeToString;
+virDomainTimerNameTypeFromString;
+virDomainTimerNameTypeToString;
+virDomainTimerTickpolicyTypeFromString;
+virDomainTimerTickpolicyTypeToString;
+virDomainTimerTrackTypeFromString;
+virDomainTimerTrackTypeToString;
 virDomainVideoDefFree;
-virDomainVideoTypeToString;
-virDomainVideoTypeFromString;
 virDomainVideoDefaultRAM;
 virDomainVideoDefaultType;
+virDomainVideoTypeFromString;
+virDomainVideoTypeToString;
 virDomainVirtTypeToString;
-virDomainFSDefFree;
-virDomainObjLock;
-virDomainObjUnlock;
-virDomainStateTypeToString;
-virDomainStateTypeFromString;
-virDomainObjIsDuplicate;
-virDomainObjListGetInactiveNames;
-virDomainObjListGetActiveIDs;
-virDomainObjListNumOfDomains;
-virDomainObjListInit;
-virDomainObjListDeinit;
-virDomainObjRef;
-virDomainObjUnref;
-virDomainDeviceAddressIsValid;
-virDomainDevicePCIAddressIsValid;
-virDomainDeviceInfoIsSet;
-virDomainControllerTypeToString;
-virDomainControllerDefFree;
-virDomainDeviceAddressTypeToString;
-virDomainDefAddImplicitControllers;
-virDomainDefClearPCIAddresses;
-virDomainDefClearDeviceAliases;
-virDomainDeviceInfoIterate;
-virDomainClockOffsetTypeToString;
-virDomainClockOffsetTypeFromString;
-virDomainDiskErrorPolicyTypeToString;
-virDomainTimerNameTypeToString;
-virDomainTimerNameTypeFromString;
-virDomainTimerTrackTypeToString;
-virDomainTimerTrackTypeFromString;
-virDomainTimerTickpolicyTypeToString;
-virDomainTimerTickpolicyTypeFromString;
-virDomainTimerModeTypeToString;
-virDomainTimerModeTypeFromString;
-virDomainSnapshotObjListGetNames;
-virDomainSnapshotObjListNum;
-virDomainSnapshotFindByName;
-virDomainSnapshotObjListRemove;
-virDomainSnapshotHasChildren;
-virDomainSnapshotObjUnref;
-virDomainSnapshotDefParseString;
-virDomainSnapshotDefFormat;
-virDomainSnapshotDefFree;
-virDomainSnapshotAssignDef;
-virDomainObjAssignDef;
-virDomainChrDefForeach;
-virDomainDiskDefForeachPath;
-virDomainChrConsoleTargetTypeToString;
-virDomainChrConsoleTargetTypeFromString;
-virDomainChrTcpProtocolTypeToString;
-virDomainChrTcpProtocolTypeFromString;
-virDomainDiskCacheTypeToString;
-virDomainDiskCacheTypeFromString;
+virDomainWatchdogActionTypeFromString;
+virDomainWatchdogActionTypeToString;
+virDomainWatchdogModelTypeFromString;
+virDomainWatchdogModelTypeToString;
 
 
 # domain_event.h
 virDomainEventCallbackListAdd;
 virDomainEventCallbackListAddID;
-virDomainEventCallbackListFree;
-virDomainEventCallbackListRemove;
-virDomainEventCallbackListRemoveID;
-virDomainEventCallbackListRemoveConn;
-virDomainEventCallbackListMarkDelete;
-virDomainEventCallbackListMarkDeleteID;
-virDomainEventCallbackListPurgeMarked;
 virDomainEventCallbackListCount;
 virDomainEventCallbackListCountID;
 virDomainEventCallbackListEventID;
-virDomainEventQueueNew;
-virDomainEventQueueFree;
-virDomainEventQueuePop;
-virDomainEventQueuePush;
-virDomainEventNew;
-virDomainEventNewFromDom;
-virDomainEventNewFromObj;
-virDomainEventNewFromDef;
-virDomainEventRebootNewFromDom;
-virDomainEventRebootNewFromObj;
-virDomainEventRTCChangeNewFromDom;
-virDomainEventRTCChangeNewFromObj;
-virDomainEventWatchdogNewFromDom;
-virDomainEventWatchdogNewFromObj;
+virDomainEventCallbackListFree;
+virDomainEventCallbackListMarkDelete;
+virDomainEventCallbackListMarkDeleteID;
+virDomainEventCallbackListPurgeMarked;
+virDomainEventCallbackListRemove;
+virDomainEventCallbackListRemoveConn;
+virDomainEventCallbackListRemoveID;
+virDomainEventDispatch;
+virDomainEventDispatchDefaultFunc;
+virDomainEventFree;
+virDomainEventGraphicsNewFromDom;
+virDomainEventGraphicsNewFromObj;
 virDomainEventIOErrorNewFromDom;
 virDomainEventIOErrorNewFromObj;
 virDomainEventIOErrorReasonNewFromDom;
 virDomainEventIOErrorReasonNewFromObj;
-virDomainEventGraphicsNewFromDom;
-virDomainEventGraphicsNewFromObj;
-virDomainEventFree;
-virDomainEventDispatchDefaultFunc;
-virDomainEventDispatch;
+virDomainEventNew;
+virDomainEventNewFromDef;
+virDomainEventNewFromDom;
+virDomainEventNewFromObj;
 virDomainEventQueueDispatch;
+virDomainEventQueueFree;
+virDomainEventQueueNew;
+virDomainEventQueuePop;
+virDomainEventQueuePush;
+virDomainEventRTCChangeNewFromDom;
+virDomainEventRTCChangeNewFromObj;
+virDomainEventRebootNewFromDom;
+virDomainEventRebootNewFromObj;
+virDomainEventWatchdogNewFromDom;
+virDomainEventWatchdogNewFromObj;
+
 
 # domain_nwfilter.h
-virDomainConfNWFilterRegister;
 virDomainConfNWFilterInstantiate;
+virDomainConfNWFilterRegister;
 virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
 
@@ -322,6 +334,10 @@ virEventUpdateHandle;
 virEventUpdateTimeout;
 
 
+# files.h
+virClose;
+
+
 # hash.h
 virHashAddEntry;
 virHashCreate;
@@ -340,19 +356,28 @@ virHookInitialize;
 virHookPresent;
 
 
+# interface.h
+ifaceCheck;
+ifaceCtrl;
+ifaceGetFlags;
+ifaceGetIndex;
+ifaceGetVlanID;
+ifaceIsUp;
+
+
 # interface_conf.h
-virInterfaceDefFormat;
-virInterfaceDefParseFile;
-virInterfaceDefParseString;
-virInterfaceDefParseNode;
-virInterfaceDefFree;
-virInterfaceFindByName;
-virInterfaceFindByMACString;
 virInterfaceAssignDef;
-virInterfaceRemove;
+virInterfaceDefFormat;
+virInterfaceDefFree;
+virInterfaceDefParseFile;
+virInterfaceDefParseNode;
+virInterfaceDefParseString;
+virInterfaceFindByMACString;
+virInterfaceFindByName;
+virInterfaceObjListFree;
 virInterfaceObjLock;
 virInterfaceObjUnlock;
-virInterfaceObjListFree;
+virInterfaceRemove;
 
 
 # iptables.h
@@ -380,105 +405,96 @@ iptablesRemoveTcpInput;
 iptablesRemoveUdpInput;
 
 
-# dnsmasq.h
-dnsmasqContextNew;
-dnsmasqContextFree;
-dnsmasqAddDhcpHost;
-dnsmasqSave;
-dnsmasqDelete;
-dnsmasqReload;
-
-
-# libvirt_internal.h
-virDrvSupportsFeature;
-virDomainMigratePrepare;
-virDomainMigratePerform;
-virDomainMigrateFinish;
-virDomainMigratePrepare2;
-virDomainMigrateFinish2;
-virDomainMigratePrepareTunnel;
-virRegisterDriver;
-virRegisterInterfaceDriver;
-virRegisterNetworkDriver;
-virRegisterStorageDriver;
-virRegisterDeviceMonitor;
-virRegisterSecretDriver;
-virRegisterNWFilterDriver;
-
-
 # json.h
+virJSONValueArrayAppend;
+virJSONValueArrayGet;
+virJSONValueArraySize;
 virJSONValueFree;
-virJSONValueNewString;
-virJSONValueNewStringLen;
-virJSONValueNewNumberInt;
-virJSONValueNewNumberUint;
-virJSONValueNewNumberLong;
-virJSONValueNewNumberUlong;
-virJSONValueNewNumberDouble;
+virJSONValueFromString;
+virJSONValueGetBoolean;
+virJSONValueGetNumberDouble;
+virJSONValueGetNumberInt;
+virJSONValueGetNumberLong;
+virJSONValueGetNumberUint;
+virJSONValueGetNumberUlong;
+virJSONValueGetString;
+virJSONValueIsNull;
+virJSONValueNewArray;
 virJSONValueNewBoolean;
 virJSONValueNewNull;
-virJSONValueNewArray;
+virJSONValueNewNumberDouble;
+virJSONValueNewNumberInt;
+virJSONValueNewNumberLong;
+virJSONValueNewNumberUint;
+virJSONValueNewNumberUlong;
 virJSONValueNewObject;
+virJSONValueNewString;
+virJSONValueNewStringLen;
 virJSONValueObjectAppend;
-virJSONValueObjectAppendString;
-virJSONValueObjectAppendNumberInt;
-virJSONValueObjectAppendNumberUint;
-virJSONValueObjectAppendNumberLong;
-virJSONValueObjectAppendNumberUlong;
-virJSONValueObjectAppendNumberDouble;
 virJSONValueObjectAppendBoolean;
 virJSONValueObjectAppendNull;
-virJSONValueArrayAppend;
-virJSONValueObjectHasKey;
+virJSONValueObjectAppendNumberDouble;
+virJSONValueObjectAppendNumberInt;
+virJSONValueObjectAppendNumberLong;
+virJSONValueObjectAppendNumberUint;
+virJSONValueObjectAppendNumberUlong;
+virJSONValueObjectAppendString;
 virJSONValueObjectGet;
-virJSONValueArraySize;
-virJSONValueArrayGet;
-virJSONValueGetString;
-virJSONValueGetNumberInt;
-virJSONValueGetNumberUint;
-virJSONValueGetNumberLong;
-virJSONValueGetNumberUlong;
-virJSONValueGetNumberDouble;
-virJSONValueGetBoolean;
-virJSONValueIsNull;
-virJSONValueObjectGetString;
-virJSONValueObjectGetNumberInt;
-virJSONValueObjectGetNumberUint;
-virJSONValueObjectGetNumberLong;
-virJSONValueObjectGetNumberUlong;
-virJSONValueObjectGetNumberDouble;
 virJSONValueObjectGetBoolean;
+virJSONValueObjectGetNumberDouble;
+virJSONValueObjectGetNumberInt;
+virJSONValueObjectGetNumberLong;
+virJSONValueObjectGetNumberUint;
+virJSONValueObjectGetNumberUlong;
+virJSONValueObjectGetString;
+virJSONValueObjectHasKey;
 virJSONValueObjectIsNull;
-virJSONValueFromString;
 virJSONValueToString;
 
 
+# libvirt_internal.h
+virDomainMigrateFinish2;
+virDomainMigrateFinish;
+virDomainMigratePerform;
+virDomainMigratePrepare2;
+virDomainMigratePrepare;
+virDomainMigratePrepareTunnel;
+virDrvSupportsFeature;
+virRegisterDeviceMonitor;
+virRegisterDriver;
+virRegisterInterfaceDriver;
+virRegisterNWFilterDriver;
+virRegisterNetworkDriver;
+virRegisterSecretDriver;
+virRegisterStorageDriver;
+
+
 # logging.h
-virLogMessage;
-virLogGetNbFilters;
-virLogGetNbOutputs;
-virLogGetFilters;
-virLogGetOutputs;
-virLogGetDefaultPriority;
-virLogSetDefaultPriority;
-virLogSetFromEnv;
 virLogDefineFilter;
 virLogDefineOutput;
+virLogGetDefaultPriority;
+virLogGetFilters;
+virLogGetNbFilters;
+virLogGetNbOutputs;
+virLogGetOutputs;
+virLogLock;
+virLogMessage;
 virLogParseDefaultPriority;
 virLogParseFilters;
 virLogParseOutputs;
-virLogStartup;
-virLogShutdown;
 virLogReset;
-virLogLock;
+virLogSetDefaultPriority;
+virLogSetFromEnv;
+virLogShutdown;
+virLogStartup;
 virLogUnlock;
 
 
 # memory.h
 virAlloc;
 virAllocN;
-virReallocN;
 virFree;
+virReallocN;
 
 
 # network.h
@@ -505,70 +521,69 @@ virNetworkDeleteConfig;
 virNetworkFindByName;
 virNetworkFindByUUID;
 virNetworkLoadAllConfigs;
+virNetworkObjIsDuplicate;
 virNetworkObjListFree;
-virNetworkDefParseNode;
+virNetworkObjLock;
+virNetworkObjUnlock;
 virNetworkRemoveInactive;
 virNetworkSaveConfig;
 virNetworkSetBridgeName;
-virNetworkObjLock;
-virNetworkObjUnlock;
-virNetworkObjIsDuplicate;
-
-
-# nodeinfo.h
-nodeGetInfo;
-nodeCapsInitNUMA;
-nodeGetCellsFreeMemory;
-nodeGetFreeMemory;
 
 
 # node_device_conf.h
-virNodeDeviceHasCap;
-virNodeDeviceObjRemove;
 virNodeDevCapTypeToString;
+virNodeDevCapsDefFree;
+virNodeDeviceAssignDef;
+virNodeDeviceDefFormat;
+virNodeDeviceDefFree;
+virNodeDeviceDefParseFile;
+virNodeDeviceDefParseNode;
+virNodeDeviceDefParseString;
 virNodeDeviceFindByName;
 virNodeDeviceFindBySysfsPath;
-virNodeDeviceObjListFree;
-virNodeDeviceDefFree;
-virNodeDevCapsDefFree;
-virNodeDeviceDefFormat;
-virNodeDeviceDefParseString;
-virNodeDeviceDefParseNode;
-virNodeDeviceDefParseFile;
-virNodeDeviceObjLock;
-virNodeDeviceObjUnlock;
-virNodeDeviceAssignDef;
-virNodeDeviceGetWWNs;
 virNodeDeviceGetParentHost;
+virNodeDeviceGetWWNs;
+virNodeDeviceHasCap;
+virNodeDeviceObjListFree;
+virNodeDeviceObjLock;
+virNodeDeviceObjRemove;
+virNodeDeviceObjUnlock;
+
+
+# nodeinfo.h
+nodeCapsInitNUMA;
+nodeGetCellsFreeMemory;
+nodeGetFreeMemory;
+nodeGetInfo;
 
 
 # nwfilter_conf.h
-virNWFilterPoolLoadAllConfigs;
-virNWFilterPoolObjAssignDef;
-virNWFilterPoolObjSaveDef;
-virNWFilterPoolObjFindByName;
-virNWFilterPoolObjFindByUUID;
-virNWFilterPoolObjLock;
-virNWFilterPoolObjUnlock;
-virNWFilterPoolObjRemove;
-virNWFilterDefFree;
-virNWFilterDefParseString;
-virNWFilterPoolObjDeleteDef;
-virNWFilterPoolObjListFree;
-virNWFilterDefFormat;
-virNWFilterChainSuffixTypeToString;
-virNWFilterRuleActionTypeToString;
-virNWFilterRuleProtocolTypeToString;
-virNWFilterJumpTargetTypeToString;
-virNWFilterRegisterCallbackDriver;
-virNWFilterTestUnassignDef;
-virNWFilterConfLayerInit;
-virNWFilterConfLayerShutdown;
-virNWFilterLockFilterUpdates;
-virNWFilterUnlockFilterUpdates;
-virNWFilterPrintStateMatchFlags;
 virNWFilterCallbackDriversLock;
 virNWFilterCallbackDriversUnlock;
+virNWFilterChainSuffixTypeToString;
+virNWFilterConfLayerInit;
+virNWFilterConfLayerShutdown;
+virNWFilterDefFormat;
+virNWFilterDefFree;
+virNWFilterDefParseString;
+virNWFilterJumpTargetTypeToString;
+virNWFilterLockFilterUpdates;
+virNWFilterPoolLoadAllConfigs;
+virNWFilterPoolObjAssignDef;
+virNWFilterPoolObjDeleteDef;
+virNWFilterPoolObjFindByName;
+virNWFilterPoolObjFindByUUID;
+virNWFilterPoolObjListFree;
+virNWFilterPoolObjLock;
+virNWFilterPoolObjRemove;
+virNWFilterPoolObjSaveDef;
+virNWFilterPoolObjUnlock;
+virNWFilterPrintStateMatchFlags;
+virNWFilterRegisterCallbackDriver;
+virNWFilterRuleActionTypeToString;
+virNWFilterRuleProtocolTypeToString;
+virNWFilterTestUnassignDef;
+virNWFilterUnlockFilterUpdates;
 
 
 # nwfilter_params.h
@@ -580,205 +595,201 @@ virNWFilterHashTableRemoveEntry;
 
 
 # pci.h
-pciGetDevice;
-pciFreeDevice;
 pciDettachDevice;
-pciReAttachDevice;
-pciWaitForDeviceCleanup;
-pciResetDevice;
-pciDeviceSetManaged;
-pciDeviceGetManaged;
-pciDeviceListNew;
-pciDeviceListFree;
-pciDeviceListAdd;
-pciDeviceListDel;
 pciDeviceFileIterate;
-pciDeviceListCount;
-pciDeviceListGet;
-pciDeviceListSteal;
+pciDeviceGetManaged;
 pciDeviceIsAssignable;
+pciDeviceListAdd;
+pciDeviceListCount;
+pciDeviceListDel;
+pciDeviceListFree;
+pciDeviceListGet;
+pciDeviceListNew;
+pciDeviceListSteal;
+pciDeviceSetManaged;
+pciFreeDevice;
+pciGetDevice;
+pciReAttachDevice;
+pciResetDevice;
+pciWaitForDeviceCleanup;
 
 
 # processinfo.h
-virProcessInfoSetAffinity;
 virProcessInfoGetAffinity;
+virProcessInfoSetAffinity;
 
 
 # qparams.h
+free_qparam_set;
 qparam_get_query;
 qparam_query_parse;
-free_qparam_set;
+
 
 # secret_conf.h
-virSecretDefFree;
-virSecretDefParseString;
-virSecretDefParseFile;
 virSecretDefFormat;
+virSecretDefFree;
+virSecretDefParseFile;
+virSecretDefParseString;
 
 
 # security.h
-virSecurityDriverVerify;
-virSecurityDriverStartup;
-virSecurityDriverInit;
-virSecurityDriverSetDOI;
 virSecurityDriverGetDOI;
 virSecurityDriverGetModel;
+virSecurityDriverInit;
+virSecurityDriverSetDOI;
+virSecurityDriverStartup;
+virSecurityDriverVerify;
 
 
 # storage_conf.h
+virStoragePartedFsTypeTypeToString;
 virStoragePoolDefFormat;
 virStoragePoolDefFree;
-virStoragePoolDefParseString;
 virStoragePoolDefParseFile;
 virStoragePoolDefParseNode;
+virStoragePoolDefParseSourceString;
+virStoragePoolDefParseString;
+virStoragePoolFormatDiskTypeToString;
+virStoragePoolFormatFileSystemNetTypeToString;
+virStoragePoolFormatFileSystemTypeToString;
 virStoragePoolLoadAllConfigs;
 virStoragePoolObjAssignDef;
 virStoragePoolObjClearVols;
 virStoragePoolObjDeleteDef;
 virStoragePoolObjFindByName;
 virStoragePoolObjFindByUUID;
+virStoragePoolObjIsDuplicate;
 virStoragePoolObjListFree;
+virStoragePoolObjLock;
 virStoragePoolObjRemove;
 virStoragePoolObjSaveDef;
+virStoragePoolObjUnlock;
 virStoragePoolSourceFree;
-virStoragePoolDefParseSourceString;
-virStoragePoolSourceListNewSource;
 virStoragePoolSourceListFormat;
+virStoragePoolSourceListNewSource;
+virStoragePoolTypeFromString;
 virStorageVolDefFindByKey;
 virStorageVolDefFindByName;
 virStorageVolDefFindByPath;
 virStorageVolDefFormat;
 virStorageVolDefFree;
 virStorageVolDefParseFile;
-virStorageVolDefParseString;
 virStorageVolDefParseNode;
-virStoragePoolFormatDiskTypeToString;
-virStoragePoolFormatFileSystemTypeToString;
-virStoragePoolFormatFileSystemNetTypeToString;
-virStoragePoolTypeFromString;
-virStoragePartedFsTypeTypeToString;
-virStoragePoolObjLock;
-virStoragePoolObjUnlock;
-virStoragePoolObjIsDuplicate;
+virStorageVolDefParseString;
+
 
 # storage_encryption_conf.h
+virStorageEncryptionFormat;
 virStorageEncryptionFree;
 virStorageEncryptionParseNode;
-virStorageEncryptionFormat;
 virStorageGenerateQcowPassphrase;
 
+
 # storage_file.h
-virStorageFileFormatTypeToString;
 virStorageFileFormatTypeFromString;
-virStorageFileProbeFormat;
-virStorageFileProbeFormatFromFD;
+virStorageFileFormatTypeToString;
 virStorageFileGetMetadata;
 virStorageFileGetMetadataFromFD;
 virStorageFileIsSharedFS;
+virStorageFileProbeFormat;
+virStorageFileProbeFormatFromFD;
+
 
 # threads.h
+virCondBroadcast;
+virCondDestroy;
+virCondInit;
+virCondSignal;
+virCondWait;
+virCondWaitUntil;
+virMutexDestroy;
 virMutexInit;
 virMutexInitRecursive;
-virMutexDestroy;
 virMutexLock;
 virMutexUnlock;
 
-virCondInit;
-virCondDestroy;
-virCondWait;
-virCondWaitUntil;
-virCondSignal;
-virCondBroadcast;
+
+# usb.h
+usbDeviceFileIterate;
+usbDeviceGetBus;
+usbDeviceGetDevno;
+usbFindDevice;
+usbFreeDevice;
+usbGetDevice;
+
 
 # util.h
-virFileReadAll;
-virFileWriteStr;
-virStrToLong_i;
-virStrToLong_ll;
-virStrToLong_ull;
-virStrToLong_ui;
-virStrToDouble;
-virFileLinkPointsTo;
-virFileResolveLink;
 saferead;
 safewrite;
 safezero;
-virHexToBin;
-virMacAddrCompare;
+virArgvToString;
+virAsprintf;
+virBuildPathInternal;
+virDirCreate;
 virEnumFromString;
 virEnumToString;
 virEventAddHandle;
 virEventRemoveHandle;
 virExec;
 virExecDaemonize;
-virSetCloseExec;
-virSetNonBlock;
-virFormatMacAddr;
-virGetHostname;
-virParseMacAddr;
+virFileAbsPath;
 virFileDeletePid;
-virFindFileInPath;
 virFileExists;
+virFileFindMountPoint;
 virFileHasSuffix;
 virFileLinkPointsTo;
 virFileMakePath;
-virFileAbsPath;
+virFileMatchesNameSuffix;
 virFileOpenTty;
-virFileReadLimFD;
+virFileOperation;
 virFilePid;
+virFileReadAll;
+virFileReadLimFD;
 virFileReadPid;
-virFileLinkPointsTo;
+virFileResolveLink;
 virFileSanitizePath;
+virFileStripSuffix;
+virFileWaitForDevices;
+virFileWriteStr;
+virFindFileInPath;
+virFork;
+virFormatMacAddr;
+virGetGroupID;
+virGetHostname;
+virGetUserDirectory;
+virGetUserID;
+virGetUserName;
+virHexToBin;
+virIndexToDiskName;
+virKillProcess;
+virMacAddrCompare;
+virParseMacAddr;
 virParseNumber;
 virParseVersionString;
 virPipeReadUntilEOF;
-virAsprintf;
-virRun;
-virRunWithHook;
-virSkipSpaces;
-virKillProcess;
-virGetUserDirectory;
-virGetUserName;
-virGetUserID;
-virGetGroupID;
-virFileFindMountPoint;
-virFileWaitForDevices;
-virFileMatchesNameSuffix;
-virArgvToString;
-virStrcpy;
-virStrncpy;
-virBuildPathInternal;
-virFileStripSuffix;
-virFileOperation;
-virFork;
 virRandom;
 virRandomInitialize;
-virDirCreate;
-virIndexToDiskName;
+virRun;
+virRunWithHook;
+virSetCloseExec;
+virSetNonBlock;
+virSkipSpaces;
+virStrToDouble;
+virStrToLong_i;
+virStrToLong_ll;
+virStrToLong_ui;
+virStrToLong_ull;
+virStrcpy;
+virStrncpy;
 
 
-# interface.h
-ifaceCtrl;
-ifaceCheck;
-ifaceGetIndex;
-ifaceGetFlags;
-ifaceIsUp;
-ifaceGetVlanID;
-
-# usb.h
-usbGetDevice;
-usbFindDevice;
-usbFreeDevice;
-usbDeviceGetBus;
-usbDeviceGetDevno;
-usbDeviceFileIterate;
-
 # uuid.h
+virGetHostUUID;
+virSetHostUUIDStr;
 virUUIDFormat;
 virUUIDGenerate;
 virUUIDParse;
-virSetHostUUIDStr;
-virGetHostUUID;
+
 
 # virtaudit.h
 virAuditClose;
@@ -788,31 +799,27 @@ virAuditSend;
 
 
 # virterror_internal.h
-virReportErrorHelper;
+virDispatchError;
 virErrorMsg;
 virRaiseErrorFull;
-virReportSystemErrorFull;
+virReportErrorHelper;
 virReportOOMErrorFull;
-virStrerror;
+virReportSystemErrorFull;
 virSetError;
-virDispatchError;
+virStrerror;
 
 
 # xml.h
+virXMLPropString;
 virXPathBoolean;
 virXPathLong;
+virXPathLongHex;
+virXPathLongLong;
 virXPathNode;
 virXPathNodeSet;
-virXPathString;
-virXMLPropString;
-virXPathStringLimit;
-virXPathBoolean;
 virXPathNumber;
+virXPathString;
+virXPathStringLimit;
 virXPathULong;
-virXPathLongLong;
-virXPathULongLong;
-virXPathLongHex;
 virXPathULongHex;
-
-# files.h
-virClose;
+virXPathULongLong;