diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/auto/x86_64_accton_as5916_54xm.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/auto/x86_64_accton_as5916_54xm.yml
index 80e0c5ea..5631cabb 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/auto/x86_64_accton_as5916_54xm.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/auto/x86_64_accton_as5916_54xm.yml
@@ -5,35 +5,35 @@
 ###############################################################################
 
 cdefs: &cdefs
-- x86_64_accton_as5916_54xm_CONFIG_INCLUDE_LOGGING:
+- X86_64_ACCTON_AS5916_54XM_CONFIG_INCLUDE_LOGGING:
     doc: "Include or exclude logging."
     default: 1
-- x86_64_accton_as5916_54xm_CONFIG_LOG_OPTIONS_DEFAULT:
+- X86_64_ACCTON_AS5916_54XM_CONFIG_LOG_OPTIONS_DEFAULT:
     doc: "Default enabled log options."
     default: AIM_LOG_OPTIONS_DEFAULT
-- x86_64_accton_as5916_54xm_CONFIG_LOG_BITS_DEFAULT:
+- X86_64_ACCTON_AS5916_54XM_CONFIG_LOG_BITS_DEFAULT:
     doc: "Default enabled log bits."
     default: AIM_LOG_BITS_DEFAULT
-- x86_64_accton_as5916_54xm_CONFIG_LOG_CUSTOM_BITS_DEFAULT:
+- X86_64_ACCTON_AS5916_54XM_CONFIG_LOG_CUSTOM_BITS_DEFAULT:
     doc: "Default enabled custom log bits."
     default: 0
-- x86_64_accton_as5916_54xm_CONFIG_PORTING_STDLIB:
+- X86_64_ACCTON_AS5916_54XM_CONFIG_PORTING_STDLIB:
     doc: "Default all porting macros to use the C standard libraries."
     default: 1
-- x86_64_accton_as5916_54xm_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS:
+- X86_64_ACCTON_AS5916_54XM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS:
     doc: "Include standard library headers for stdlib porting macros."
-    default: x86_64_accton_as5916_54xm_CONFIG_PORTING_STDLIB
-- x86_64_accton_as5916_54xm_CONFIG_INCLUDE_UCLI:
+    default: X86_64_ACCTON_AS5916_54XM_CONFIG_PORTING_STDLIB
+- X86_64_ACCTON_AS5916_54XM_CONFIG_INCLUDE_UCLI:
     doc: "Include generic uCli support."
     default: 0
-- x86_64_accton_as5916_54xm_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION:
+- X86_64_ACCTON_AS5916_54XM_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION:
     doc: "Assume chassis fan direction is the same as the PSU fan direction."
     default: 0
 
 
 definitions:
   cdefs:
-    x86_64_accton_as5916_54xm_CONFIG_HEADER:
+    X86_64_ACCTON_AS5916_54XM_CONFIG_HEADER:
       defs: *cdefs
       basename: x86_64_accton_as5916_54xm_config
 
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/debug.c b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/debug.c
index 90f21761..3c7c8762 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/debug.c
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/debug.c
@@ -1,4 +1,3 @@
-#include "x86_64_accton_as5916_54xm_int.h"
 
 #if x86_64_accton_as5916_54xm_CONFIG_INCLUDE_DEBUG == 1
 
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/platform_lib.c b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/platform_lib.c
index b14867bd..7db9630c 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/platform_lib.c
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/platform_lib.c
@@ -31,70 +31,18 @@
 
 #define PSU_NODE_MAX_PATH_LEN 64
 
-int _onlp_file_write(char *filename, char *buffer, int buf_size, int data_len)
-{
-    int fd;
-    int len;
-
-    if ((buffer == NULL) || (buf_size < 0)) {
-        return -1;
-    }
-
-    if ((fd = open(filename, O_WRONLY, S_IWUSR)) == -1) {
-        return -1;
-    }
-
-    if ((len = write(fd, buffer, buf_size)) < 0) {
-        close(fd);
-        return -1;
-    }
-
-    if ((close(fd) == -1)) {
-        return -1;
-    }
-
-    if ((len > buf_size) || (data_len != 0 && len != data_len)) {
-        return -1;
-    }
-
-    return 0;
-}
-
 int onlp_file_write_integer(char *filename, int value)
 {
-    char buf[8] = {0};
-    sprintf(buf, "%d", value);
-
-    return _onlp_file_write(filename, buf, (int)strlen(buf), 0);
+    return onlp_file_write_int(value, filename, NULL);
 }
 
 int onlp_file_read_binary(char *filename, char *buffer, int buf_size, int data_len)
 {
-    int fd;
-    int len;
-
     if ((buffer == NULL) || (buf_size < 0)) {
         return -1;
     }
 
-    if ((fd = open(filename, O_RDONLY)) == -1) {
-        return -1;
-    }
-
-    if ((len = read(fd, buffer, buf_size)) < 0) {
-        close(fd);
-        return -1;
-    }
-
-    if ((close(fd) == -1)) {
-        return -1;
-    }
-
-    if ((len > buf_size) || (data_len != 0 && len != data_len)) {
-        return -1;
-    }
-
-    return 0;
+    return onlp_file_read((uint8_t*)buffer, buf_size, &data_len, "%s", filename);
 }
 
 int onlp_file_read_string(char *filename, char *buffer, int buf_size, int data_len)