diff --git a/src/ioc/db/chfPlugin.c b/src/ioc/db/chfPlugin.c
index 8b9cddfed..cb91b0ef6 100644
--- a/src/ioc/db/chfPlugin.c
+++ b/src/ioc/db/chfPlugin.c
@@ -24,6 +24,7 @@
 #include <epicsTypes.h>
 #include <epicsString.h>
 #include <errlog.h>
+#include <shareLib.h>
 
 #define epicsExportSharedSymbols
 #include "chfPlugin.h"
@@ -67,9 +68,7 @@ typedef enum chfPluginType {
  * Convert the (long) integer value 'val' to the type named in 'opt->optType'
  * and store the result at 'user + opt->offset'.
  */
-static
-int
-store_integer_value(const chfPluginArgDef *opt, void *user, long val)
+static int store_integer_value(const chfPluginArgDef *opt, void *user, long val)
 {
     long *ival;
     int *eval;
@@ -128,9 +127,7 @@ store_integer_value(const chfPluginArgDef *opt, void *user, long val)
  * Convert the (int) boolean value 'val' to the type named in 'opt->optType'
  * and store the result at 'user + opt->offset'.
  */
-static
-int
-store_boolean_value(const chfPluginArgDef *opt, void *user, int val)
+static int store_boolean_value(const chfPluginArgDef *opt, void *user, int val)
 {
     long *ival;
     int *eval;
@@ -175,9 +172,7 @@ store_boolean_value(const chfPluginArgDef *opt, void *user, int val)
  * Convert the double value 'val' to the type named in 'opt->optType'
  * and store the result at 'user + opt->offset'.
  */
-static
-int
-store_double_value(const chfPluginArgDef *opt, void *user, double val)
+static int store_double_value(const chfPluginArgDef *opt, void *user, double val)
 {
     long *ival;
     int *eval;
@@ -230,9 +225,7 @@ store_double_value(const chfPluginArgDef *opt, void *user, double val)
  * Convert the (char*) string value 'val' to the type named in 'opt->optType'
  * and store the result at 'user + opt->offset'.
  */
-static
-int
-store_string_value(const chfPluginArgDef *opt, void *user, const char *val, size_t len)
+static int store_string_value(const chfPluginArgDef *opt, void *user, const char *val, size_t len)
 {
     long *ival;
     int *eval;
@@ -553,10 +546,7 @@ static chFilterIf wrapper_fif = {
     channel_close
 };
 
-epicsShareFunc
-const char*
-epicsShareAPI
-chfPluginEnumString(const chfPluginEnumType *emap, int i, const char* def)
+const char* chfPluginEnumString(const chfPluginEnumType *emap, int i, const char* def)
 {
     for(; emap && emap->name; emap++) {
         if ( i == emap->value ) {
@@ -566,10 +556,7 @@ chfPluginEnumString(const chfPluginEnumType *emap, int i, const char* def)
     return def;
 }
 
-epicsShareFunc
-int
-epicsShareAPI
-chfPluginRegister(const char* key, const chfPluginIf *pif, const chfPluginArgDef* opts)
+int chfPluginRegister(const char* key, const chfPluginIf *pif, const chfPluginArgDef* opts)
 {
     chfPlugin *p;
     size_t i;
diff --git a/src/ioc/db/chfPlugin.h b/src/ioc/db/chfPlugin.h
index 44b04e5a5..9b31654db 100644
--- a/src/ioc/db/chfPlugin.h
+++ b/src/ioc/db/chfPlugin.h
@@ -263,10 +263,7 @@ typedef struct chfPluginArgDef {
  * @param def String to be returned when 'i' isn't a valid Enum index.
  * @return The string associated with 'i'.
  */
-epicsShareFunc
-const char*
-epicsShareAPI
-chfPluginEnumString(const chfPluginEnumType *Enums, int i, const char* def);
+epicsShareFunc const char* chfPluginEnumString(const chfPluginEnumType *Enums, int i, const char* def);
 
 /** @brief Register a plugin.
  *
@@ -274,10 +271,7 @@ chfPluginEnumString(const chfPluginEnumType *Enums, int i, const char* def);
  * @param pif Pointer to the plugin's interface.
  * @param opts Pointer to the configuration argument description table.
  */
-epicsShareFunc
-int
-epicsShareAPI
-chfPluginRegister(const char* key, const chfPluginIf *pif, const chfPluginArgDef* opts);
+epicsShareFunc int chfPluginRegister(const char* key, const chfPluginIf *pif, const chfPluginArgDef* opts);
 
 #ifdef __cplusplus
 }
diff --git a/src/ioc/db/dbAccessDefs.h b/src/ioc/db/dbAccessDefs.h
index ffbab3a2d..7e5c7a78d 100644
--- a/src/ioc/db/dbAccessDefs.h
+++ b/src/ioc/db/dbAccessDefs.h
@@ -20,6 +20,7 @@
 #include "epicsTypes.h"
 #include "epicsTime.h"
 #include "dbBase.h"
+#include "dbAddr.h"
 
 #ifdef INCLdb_accessh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
diff --git a/src/ioc/db/dbChannel.c b/src/ioc/db/dbChannel.c
index 70a22409a..f635db5dd 100644
--- a/src/ioc/db/dbChannel.c
+++ b/src/ioc/db/dbChannel.c
@@ -518,7 +518,7 @@ long dbChannelOpen(dbChannel *chan)
 
     /* Save probe results */
     chan->final_no_elements  = probe.no_elements;
-    chan->final_field_size = probe.field_size;
+    chan->final_field_size   = probe.field_size;
     chan->final_type         = probe.field_type;
     chan->dbr_final_type     = dbDBRnewToDBRold[mapDBFToDBR[probe.field_type]];