diff --git a/clients/cgilib.c b/clients/cgilib.c
index 160618e354..9aeb075e70 100644
--- a/clients/cgilib.c
+++ b/clients/cgilib.c
@@ -162,7 +162,7 @@ static void cgilib_err(const char *errmsg)
 
 int checkhost(const char *host, char **desc)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 
 	if (!host)
diff --git a/clients/upssched.c b/clients/upssched.c
index 95b885e096..9aae5711ad 100644
--- a/clients/upssched.c
+++ b/clients/upssched.c
@@ -1439,7 +1439,7 @@ static void upssched_err(const char *errmsg)
 
 static void checkconf(void)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 	int	numerrors = 0;
 
diff --git a/clients/upsset.c b/clients/upsset.c
index f9f94228c9..d771f8aba5 100644
--- a/clients/upsset.c
+++ b/clients/upsset.c
@@ -194,7 +194,7 @@ static void upsset_hosts_err(const char *errmsg)
 /* this defaults to wherever we are now, ups and function-wise */
 static void do_pickups(const char *currfunc)
 {
-	char	hostfn[SMALLBUF];
+	char	hostfn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 
 	snprintf(hostfn, sizeof(hostfn), "%s/hosts.conf", confpath());
@@ -1020,7 +1020,7 @@ static void upsset_conf_err(const char *errmsg)
 /* see if the user has confirmed their cgi directory's secure state */
 static void check_conf(void)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 
 	snprintf(fn, sizeof(fn), "%s/upsset.conf", confpath());
diff --git a/clients/upsstats.c b/clients/upsstats.c
index 4b7f7547e5..778e2b9e9a 100644
--- a/clients/upsstats.c
+++ b/clients/upsstats.c
@@ -846,7 +846,7 @@ static void parse_line(const char *buf)
 
 static void display_template(const char *tfn)
 {
-	char	fn[SMALLBUF], buf[LARGEBUF];
+	char	fn[NUT_PATH_MAX], buf[LARGEBUF];
 
 	snprintf(fn, sizeof(fn), "%s/%s", confpath(), tfn);
 
@@ -965,7 +965,7 @@ static void upsstats_hosts_err(const char *errmsg)
 
 static void load_hosts_conf(void)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 
 	snprintf(fn, sizeof(fn), "%s/hosts.conf", CONFPATH);
diff --git a/common/common.c b/common/common.c
index 056f825ed5..fe8f3d87f7 100644
--- a/common/common.c
+++ b/common/common.c
@@ -2061,7 +2061,7 @@ int snprintfcat(char *dst, size_t size, const char *fmt, ...)
 #ifndef WIN32
 int sendsignal(const char *progname, int sig, int check_current_progname)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 
 	snprintf(fn, sizeof(fn), "%s/%s.pid", rootpidpath(), progname);
 
@@ -3880,12 +3880,12 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
 	DIR *dp;
 	struct dirent *dirp;
 	char *libname_path = NULL, *libname_alias = NULL;
-	char current_test_path[LARGEBUF];
+	char current_test_path[NUT_PATH_MAX];
 
 	upsdebugx(3, "%s('%s', %" PRIuSIZE ", '%s', %i): Entering method...",
 		__func__, base_libname, base_libname_length, dirname, index);
 
-	memset(current_test_path, 0, LARGEBUF);
+	memset(current_test_path, 0, sizeof(current_test_path));
 
 	if ((dp = opendir(dirname)) == NULL) {
 		if (index >= 0) {
@@ -3928,7 +3928,7 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
 				continue;
 			}
 
-			snprintf(current_test_path, LARGEBUF, "%s/%s", dirname, dirp->d_name);
+			snprintf(current_test_path, sizeof(current_test_path), "%s/%s", dirname, dirp->d_name);
 #if HAVE_DECL_REALPATH
 			libname_path = realpath(current_test_path, NULL);
 #else
diff --git a/common/upsconf.c b/common/upsconf.c
index c5716124f1..25ad3fdc6a 100644
--- a/common/upsconf.c
+++ b/common/upsconf.c
@@ -75,7 +75,7 @@ static void upsconf_err(const char *errmsg)
  */
 int read_upsconf(int fatal_errors)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 
 	ups_section = NULL;
diff --git a/common/wincompat.c b/common/wincompat.c
index 745b0bf9e3..e70dc88ac3 100644
--- a/common/wincompat.c
+++ b/common/wincompat.c
@@ -498,11 +498,11 @@ static const char	*named_pipe_name=NULL;
 void pipe_create(const char * pipe_name)
 {
 	BOOL ret;
-	char pipe_full_name[SMALLBUF];
+	char pipe_full_name[NUT_PATH_MAX];
 
 	/* save pipe name for further use in pipe_connect */
-	if( pipe_name == NULL ) {
-		if( named_pipe_name == NULL ) {
+	if (pipe_name == NULL) {
+		if (named_pipe_name == NULL) {
 			return;
 		}
 	}
diff --git a/drivers/clone-outlet.c b/drivers/clone-outlet.c
index 0cc8e7fa98..554d6a9c5f 100644
--- a/drivers/clone-outlet.c
+++ b/drivers/clone-outlet.c
@@ -253,7 +253,7 @@ static TYPE_FD sstate_connect(void)
 
 	/* continued below... */
 #else /* WIN32 */
-	char		pipename[SMALLBUF];
+	char		pipename[NUT_PATH_MAX];
 	BOOL		result = FALSE;
 
 	snprintf(pipename, sizeof(pipename), "\\\\.\\pipe\\%s/%s", dflt_statepath(), device_path);
diff --git a/drivers/clone.c b/drivers/clone.c
index ec45672dee..3d2ce8924a 100644
--- a/drivers/clone.c
+++ b/drivers/clone.c
@@ -268,7 +268,7 @@ static TYPE_FD sstate_connect(void)
 
 	/* continued below... */
 #else /* WIN32 */
-	char		pipename[SMALLBUF];
+	char		pipename[NUT_PATH_MAX];
 	BOOL		result = FALSE;
 
 	snprintf(pipename, sizeof(pipename), "\\\\.\\pipe\\%s/%s", dflt_statepath(), device_path);
diff --git a/drivers/dstate.c b/drivers/dstate.c
index df411cfa59..f830ea8e6a 100644
--- a/drivers/dstate.c
+++ b/drivers/dstate.c
@@ -1081,7 +1081,7 @@ static void sock_close(void)
 
 char * dstate_init(const char *prog, const char *devname)
 {
-	char	sockname[SMALLBUF];
+	char	sockname[NUT_PATH_MAX];
 
 #ifndef WIN32
 	/* do this here for now */
diff --git a/drivers/dummy-ups.c b/drivers/dummy-ups.c
index c20aabe376..b00787deb4 100644
--- a/drivers/dummy-ups.c
+++ b/drivers/dummy-ups.c
@@ -280,7 +280,7 @@ void upsdrv_updateinfo(void)
 			/* less stress on the sys */
 			if (ctx == NULL && next_update == -1) {
 				struct stat	fs;
-				char fn[SMALLBUF];
+				char fn[NUT_PATH_MAX];
 
 				prepare_filepath(fn, sizeof(fn));
 
@@ -446,7 +446,7 @@ void upsdrv_initups(void)
 	}
 	else
 	{
-		char fn[SMALLBUF];
+		char fn[NUT_PATH_MAX];
 		mode = MODE_NONE;
 
 		if (val) {
@@ -747,7 +747,7 @@ static void upsconf_err(const char *errmsg)
  */
 static int parse_data_file(TYPE_FD arg_upsfd)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	char	*ptr, var_value[MAX_STRING_SIZE];
 	size_t	value_args = 0, counter;
 	time_t	now;
diff --git a/drivers/main.c b/drivers/main.c
index 330da81699..6a282b7a63 100644
--- a/drivers/main.c
+++ b/drivers/main.c
@@ -2007,7 +2007,7 @@ int main(int argc, char **argv)
 
 	const char	* drv_name = NULL;
 	char	* dot = NULL;
-	char	name[SMALLBUF];
+	char	name[NUT_PATH_MAX];
 #endif
 
 	const char optstring[] = "+a:s:kDFBd:hx:Lqr:u:g:Vi:c:"
@@ -2595,7 +2595,7 @@ int main(int argc, char **argv)
 	 * deliberately.
 	 */
 	if (cmd || foreground == 0 || foreground == 2 || do_forceshutdown) {
-		char	pidfnbuf[SMALLBUF];
+		char	pidfnbuf[NUT_PATH_MAX];
 
 		snprintf(pidfnbuf, sizeof(pidfnbuf), "%s/%s-%s.pid", altpidpath(), progname, upsname);
 
@@ -3002,7 +3002,7 @@ int main(int argc, char **argv)
 		 */
 		case 2:
 			if (!pidfn) {
-				char	pidfnbuf[SMALLBUF];
+				char	pidfnbuf[NUT_PATH_MAX];
 				snprintf(pidfnbuf, sizeof(pidfnbuf), "%s/%s-%s.pid", altpidpath(), progname, upsname);
 				pidfn = xstrdup(pidfnbuf);
 			}
diff --git a/drivers/snmp-ups.c b/drivers/snmp-ups.c
index 2878861ebc..d3b0221996 100644
--- a/drivers/snmp-ups.c
+++ b/drivers/snmp-ups.c
@@ -4181,7 +4181,7 @@ static void mibconf_err(const char *errmsg)
 /* load *mib.conf into an snmp_info_t structure */
 void read_mibconf(char *mib)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 	int	numerrors = 0;
 
diff --git a/drivers/upsdrvctl.c b/drivers/upsdrvctl.c
index f7bed0bae1..812b2c2ebb 100644
--- a/drivers/upsdrvctl.c
+++ b/drivers/upsdrvctl.c
@@ -194,7 +194,7 @@ static void signal_driver_cmd(const ups_t *ups,
 /* TODO: implement WIN32: https://github.com/networkupstools/nut/issues/1916
  * Currently the codepath is not implemented below
  */
-	char	pidfn[SMALLBUF];
+	char	pidfn[NUT_PATH_MAX];
 #endif
 	int	ret;
 
@@ -338,7 +338,7 @@ static void signal_driver(const ups_t *ups) {
 /* handle sending the signal */
 static void stop_driver(const ups_t *ups)
 {
-	char	pidfn[SMALLBUF];
+	char	pidfn[NUT_PATH_MAX];
 	int	ret, i;
 
 	upsdebugx(1, "Stopping UPS: %s", ups->upsname);
@@ -819,7 +819,7 @@ static void status_driver(const ups_t *ups)
 	 */
 	static int	headerShown = 0;
 #ifndef WIN32
-	char	pidfn[SMALLBUF];
+	char	pidfn[NUT_PATH_MAX];
 	int	cmdret = -1;
 #endif
 	char	bufPid[LARGEBUF], *pidStrFromSocket = NULL,
@@ -1023,7 +1023,7 @@ static void status_driver(const ups_t *ups)
 static void start_driver(const ups_t *ups)
 {
 	char	*argv[10];
-	char	dfn[SMALLBUF], dbg[SMALLBUF];
+	char	dfn[NUT_PATH_MAX], dbg[SMALLBUF];
 	int	ret, arg = 0;
 	int	initial_exec_error = exec_error, initial_exec_timeout = exec_timeout, drv_maxretry = maxretry;
 	struct stat	fs;
@@ -1248,7 +1248,7 @@ static void help(const char *arg_progname)
 static void shutdown_driver(const ups_t *ups)
 {
 	char	*argv[9];
-	char	dfn[SMALLBUF];
+	char	dfn[NUT_PATH_MAX];
 	int	arg = 0;
 
 	upsdebugx(1, "Shutdown UPS: %s", ups->upsname);
diff --git a/drivers/upsdrvquery.c b/drivers/upsdrvquery.c
index 2c4a767bbb..75a5b02a2d 100644
--- a/drivers/upsdrvquery.c
+++ b/drivers/upsdrvquery.c
@@ -158,7 +158,7 @@ udq_pipe_conn_t *upsdrvquery_connect(const char *sockfn) {
 }
 
 udq_pipe_conn_t *upsdrvquery_connect_drvname_upsname(const char *drvname, const char *upsname) {
-	char	sockname[SMALLBUF];
+	char	sockname[NUT_PATH_MAX];
 #ifndef WIN32
 	struct stat     fs;
 	snprintf(sockname, sizeof(sockname), "%s/%s-%s",
diff --git a/drivers/upsdrvquery.h b/drivers/upsdrvquery.h
index e3854940b2..0b98f5e31c 100644
--- a/drivers/upsdrvquery.h
+++ b/drivers/upsdrvquery.h
@@ -32,7 +32,7 @@ typedef struct udq_pipe_conn_s {
 	int		newread;	/* Set to 1 to start a new ReadFile, forget old buf */
 #endif	/* WIN32 */
 	char		buf[LARGEBUF];
-	char		sockfn[LARGEBUF];
+	char		sockfn[NUT_PATH_MAX];
 } udq_pipe_conn_t;
 
 udq_pipe_conn_t *upsdrvquery_connect(const char *sockfn);
diff --git a/scripts/Windows/wininit.c b/scripts/Windows/wininit.c
index 3b402d7957..b378163731 100644
--- a/scripts/Windows/wininit.c
+++ b/scripts/Windows/wininit.c
@@ -296,10 +296,10 @@ static DWORD shutdown_ups(void)
 /* return 0 on failure */
 static int parse_nutconf(BOOL start_flag)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	FILE	*nutf;
 	char	buf[SMALLBUF];
-	char	fullname[SMALLBUF];
+	char	fullname[NUT_PATH_MAX];
 
 	snprintf(fn, sizeof(fn), "%s/nut.conf", confpath());
 
diff --git a/server/conf.c b/server/conf.c
index a40b09bcac..6f93a7fd11 100644
--- a/server/conf.c
+++ b/server/conf.c
@@ -357,7 +357,7 @@ static void upsd_conf_err(const char *errmsg)
 
 void load_upsdconf(int reloading)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 	int	numerrors = 0;
 
@@ -497,7 +497,7 @@ void do_upsconf_args(char *upsname, char *var, char *val)
 void upsconf_add(int reloading)
 {
 	ups_t	*tmp = upstable, *next;
-	char	statefn[SMALLBUF];
+	char	statefn[NUT_PATH_MAX];
 
 	if (!tmp) {
 		upslogx(LOG_WARNING, "Warning: no UPS definitions in ups.conf");
@@ -599,7 +599,7 @@ static void delete_ups(upstype_t *target)
 /* see if we can open a file */
 static int check_file(const char *fn)
 {
-	char	chkfn[SMALLBUF];
+	char	chkfn[NUT_PATH_MAX];
 	FILE	*f;
 
 	snprintf(chkfn, sizeof(chkfn), "%s/%s", confpath(), fn);
diff --git a/server/desc.c b/server/desc.c
index e6b08f0d91..bdc9924e72 100644
--- a/server/desc.c
+++ b/server/desc.c
@@ -95,7 +95,7 @@ static void desc_file_err(const char *errmsg)
 
 void desc_load(void)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 
 	snprintf(fn, sizeof(fn), "%s/cmdvartab", datapath);
diff --git a/server/pipedebug.c b/server/pipedebug.c
index f306be8395..ef1c4a4f8a 100644
--- a/server/pipedebug.c
+++ b/server/pipedebug.c
@@ -40,7 +40,7 @@ static void pipe_arg(int numarg, char **arg)
 static HANDLE pipe_connect(const char *pipefn)
 {
 	HANDLE	fd;
-	char	pipename[SMALLBUF];
+	char	pipename[NUT_PATH_MAX];
 	BOOL	result = FALSE;
 
 	snprintf(pipename, sizeof(pipename), "\\\\.\\pipe\\%s", pipefn);
diff --git a/server/sstate.c b/server/sstate.c
index 832bd0e501..fec9427287 100644
--- a/server/sstate.c
+++ b/server/sstate.c
@@ -275,7 +275,7 @@ TYPE_FD sstate_connect(upstype_t *ups)
 	}
 
 #else
-	char pipename[SMALLBUF];
+	char pipename[NUT_PATH_MAX];
 	const char	*dumpcmd = "DUMPALL\n";
 	BOOL  result = FALSE;
 	DWORD bytesWritten;
diff --git a/server/upsd.c b/server/upsd.c
index 4f4c4b412f..8fb5a3ff8b 100644
--- a/server/upsd.c
+++ b/server/upsd.c
@@ -157,7 +157,7 @@ static HANDLE		mutex = INVALID_HANDLE_VALUE;
 static handler_t	*handler = NULL;
 
 	/* pid file */
-static char	pidfn[SMALLBUF];
+static char	pidfn[NUT_PATH_MAX];
 
 	/* set by signal handlers */
 static int	reload_flag = 0, exit_flag = 0;
diff --git a/server/user.c b/server/user.c
index 8ebb418ec9..1ee14b47ec 100644
--- a/server/user.c
+++ b/server/user.c
@@ -468,7 +468,7 @@ static void upsd_user_err(const char *errmsg)
 
 void user_load(void)
 {
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	PCONF_CTX_t	ctx;
 
 	curr_user = NULL;