diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 96c330d6ec116bd0769f18ccfc27a9514ccfbbfd..d8a5daf219d4d553e4bf392238d558cc63222487 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -560,50 +560,74 @@ struct domUpdateCBStruct {
 };
 
 
-void virNWFilterRuleDefFree(virNWFilterRuleDefPtr def);
+void
+virNWFilterRuleDefFree(virNWFilterRuleDefPtr def);
 
-void virNWFilterDefFree(virNWFilterDefPtr def);
+void
+virNWFilterDefFree(virNWFilterDefPtr def);
 
-int virNWFilterTriggerVMFilterRebuild(void);
+int
+virNWFilterTriggerVMFilterRebuild(void);
 
-int virNWFilterSaveDef(const char *configDir,
-                       virNWFilterDefPtr def);
+int
+virNWFilterSaveDef(const char *configDir,
+                   virNWFilterDefPtr def);
 
-int virNWFilterDeleteDef(const char *configDir,
-                         virNWFilterDefPtr def);
+int
+virNWFilterDeleteDef(const char *configDir,
+                     virNWFilterDefPtr def);
 
-virNWFilterDefPtr virNWFilterDefParseNode(xmlDocPtr xml,
-                                          xmlNodePtr root);
+virNWFilterDefPtr
+virNWFilterDefParseNode(xmlDocPtr xml,
+                        xmlNodePtr root);
 
-char *virNWFilterDefFormat(const virNWFilterDef *def);
+char *
+virNWFilterDefFormat(const virNWFilterDef *def);
 
-int virNWFilterSaveXML(const char *configDir,
-                       virNWFilterDefPtr def,
-                       const char *xml);
+int
+virNWFilterSaveXML(const char *configDir,
+                   virNWFilterDefPtr def,
+                   const char *xml);
 
-int virNWFilterSaveConfig(const char *configDir,
-                          virNWFilterDefPtr def);
+int
+virNWFilterSaveConfig(const char *configDir,
+                      virNWFilterDefPtr def);
 
-char *virNWFilterConfigFile(const char *dir,
-                            const char *name);
+char *
+virNWFilterConfigFile(const char *dir,
+                      const char *name);
 
-virNWFilterDefPtr virNWFilterDefParseString(const char *xml);
-virNWFilterDefPtr virNWFilterDefParseFile(const char *filename);
+virNWFilterDefPtr
+virNWFilterDefParseString(const char *xml);
 
-void virNWFilterWriteLockFilterUpdates(void);
-void virNWFilterReadLockFilterUpdates(void);
-void virNWFilterUnlockFilterUpdates(void);
+virNWFilterDefPtr
+virNWFilterDefParseFile(const char *filename);
 
-int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB, void *opaque);
-void virNWFilterConfLayerShutdown(void);
+void
+virNWFilterWriteLockFilterUpdates(void);
 
-int virNWFilterInstFiltersOnAllVMs(void);
+void
+virNWFilterReadLockFilterUpdates(void);
 
+void
+virNWFilterUnlockFilterUpdates(void);
 
-typedef int (*virNWFilterRebuild)(virDomainObjListIterator domUpdateCB,
-                                  void *data);
-typedef void (*virNWFilterVoidCall)(void);
+int
+virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB,
+                         void *opaque);
 
+void
+virNWFilterConfLayerShutdown(void);
+
+int
+virNWFilterInstFiltersOnAllVMs(void);
+
+typedef int
+(*virNWFilterRebuild)(virDomainObjListIterator domUpdateCB,
+                      void *data);
+
+typedef void
+(*virNWFilterVoidCall)(void);
 
 typedef struct _virNWFilterCallbackDriver virNWFilterCallbackDriver;
 typedef virNWFilterCallbackDriver *virNWFilterCallbackDriverPtr;
@@ -615,18 +639,29 @@ struct _virNWFilterCallbackDriver {
     virNWFilterVoidCall vmDriverUnlock;
 };
 
-void virNWFilterRegisterCallbackDriver(virNWFilterCallbackDriverPtr);
-void virNWFilterUnRegisterCallbackDriver(virNWFilterCallbackDriverPtr);
-void virNWFilterCallbackDriversLock(void);
-void virNWFilterCallbackDriversUnlock(void);
+void
+virNWFilterRegisterCallbackDriver(virNWFilterCallbackDriverPtr);
+
+void
+virNWFilterUnRegisterCallbackDriver(virNWFilterCallbackDriverPtr);
+
+void
+virNWFilterCallbackDriversLock(void);
+
+void
+virNWFilterCallbackDriversUnlock(void);
 
+char *
+virNWFilterPrintTCPFlags(uint8_t flags);
 
-char *virNWFilterPrintTCPFlags(uint8_t flags);
+bool
+virNWFilterRuleIsProtocolIPv4(virNWFilterRuleDefPtr rule);
 
+bool
+virNWFilterRuleIsProtocolIPv6(virNWFilterRuleDefPtr rule);
 
-bool virNWFilterRuleIsProtocolIPv4(virNWFilterRuleDefPtr rule);
-bool virNWFilterRuleIsProtocolIPv6(virNWFilterRuleDefPtr rule);
-bool virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule);
+bool
+virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule);
 
 VIR_ENUM_DECL(virNWFilterRuleAction);
 VIR_ENUM_DECL(virNWFilterRuleDirection);
diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h
index 00b8d0a92a5c6328a0892bf4c927206648c03c1e..593f4269fe7bbe209abe8654cc802173723f100c 100644
--- a/src/conf/virnwfilterobj.h
+++ b/src/conf/virnwfilterobj.h
@@ -57,29 +57,38 @@ struct _virNWFilterDriverState {
     bool watchingFirewallD;
 };
 
-void virNWFilterObjListFree(virNWFilterObjListPtr nwfilters);
+void
+virNWFilterObjListFree(virNWFilterObjListPtr nwfilters);
 
-void virNWFilterObjRemove(virNWFilterObjListPtr nwfilters,
-                          virNWFilterObjPtr nwfilter);
+void
+virNWFilterObjRemove(virNWFilterObjListPtr nwfilters,
+                     virNWFilterObjPtr nwfilter);
 
 void virNWFilterObjFree(virNWFilterObjPtr obj);
 
-virNWFilterObjPtr virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilters,
-                                           const unsigned char *uuid);
+virNWFilterObjPtr
+virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilters,
+                         const unsigned char *uuid);
 
-virNWFilterObjPtr virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters,
-                                           const char *name);
+virNWFilterObjPtr
+virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters,
+                         const char *name);
 
-virNWFilterObjPtr virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
-                                          virNWFilterDefPtr def);
+virNWFilterObjPtr
+virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
+                        virNWFilterDefPtr def);
 
-int virNWFilterTestUnassignDef(virNWFilterObjPtr nwfilter);
+int
+virNWFilterTestUnassignDef(virNWFilterObjPtr nwfilter);
 
-int virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters,
-                              const char *configDir);
+int
+virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters,
+                          const char *configDir);
 
-void virNWFilterObjLock(virNWFilterObjPtr obj);
+void
+virNWFilterObjLock(virNWFilterObjPtr obj);
 
-void virNWFilterObjUnlock(virNWFilterObjPtr obj);
+void
+virNWFilterObjUnlock(virNWFilterObjPtr obj);
 
 #endif /* VIRNWFILTEROBJ_H */