diff --git a/mediachanger/castorrmc/h/rmc.h b/mediachanger/castorrmc/h/rmc.h
index 35d21e61a4cf5a0a70ac6f4743f2f0a72e00605c..3da36c80485413e4493ae0f1f059adba396d8262 100644
--- a/mediachanger/castorrmc/h/rmc.h
+++ b/mediachanger/castorrmc/h/rmc.h
@@ -17,11 +17,9 @@
 
 #include "osdep.h"
 #include "rmc_constants.h"
-#define	RMC_CHECKI  5	/* max interval to check for work to be done */
 #define	MAXRETRY 5
 #define	RETRYI	60
 #define	LOGBUFSZ 1024
-#define	PRTBUFSZ 180
 #define	REPBUFSZ 524288	/* must be >= max media changer server reply size */
 #define	REQBUFSZ 256	/* must be >= max media changer server request size */
 #define RMC_MAGIC	0x120D0301
diff --git a/mediachanger/castorrmc/h/rmc_constants.h b/mediachanger/castorrmc/h/rmc_constants.h
index 9582d8b7f0c429501c4b2c83ca117b5249445e6e..ccd9ca9354912e3a85e1ae92c235edfa38c3e201 100644
--- a/mediachanger/castorrmc/h/rmc_constants.h
+++ b/mediachanger/castorrmc/h/rmc_constants.h
@@ -14,6 +14,9 @@
 #define _RMC_CONSTANTS_H
 #include "Castor_limits.h"
 
+#define RMC_CHECKI  5   /* max interval to check for work to be done */
+#define RMC_PRTBUFSZ 180
+
 #define RMC_PORT 5014
 
 			/* SCSI media changer utilities exit codes */
diff --git a/mediachanger/castorrmc/rmc/rmc_errmsg.c b/mediachanger/castorrmc/rmc/rmc_errmsg.c
index d4f60c56599f8d47c174a846e2fcbc8822b9d06a..ac0da469597b278f0d9c209db22083ddc1467286 100644
--- a/mediachanger/castorrmc/rmc/rmc_errmsg.c
+++ b/mediachanger/castorrmc/rmc/rmc_errmsg.c
@@ -28,7 +28,7 @@ rmc_seterrbuf(char *buffer,
 int rmc_errmsg(char *func, char *msg, ...)
 {
 	va_list args;
-	char prtbuf[PRTBUFSZ];
+	char prtbuf[RMC_PRTBUFSZ];
 	int save_errno;
 
 	save_errno = errno;
diff --git a/mediachanger/castorrmc/rmc/rmc_sendrep.c b/mediachanger/castorrmc/rmc/rmc_sendrep.c
index 86944a70850d99c57a4cd8a2c25887812e5d4295..278c19dd757d78f66cc0b344570ff9c2bf934b19 100644
--- a/mediachanger/castorrmc/rmc/rmc_sendrep.c
+++ b/mediachanger/castorrmc/rmc/rmc_sendrep.c
@@ -22,7 +22,7 @@ int rmc_sendrep(const int rpfd, const int rep_type, ...)
 	char func[16];
 	char *msg;
 	int n;
-	char prtbuf[PRTBUFSZ];
+	char prtbuf[RMC_PRTBUFSZ];
 	char *rbp;
 	int rc;
 	char repbuf[REPBUFSZ];
diff --git a/mediachanger/castorrmc/rmc/rmc_smcsubr.c b/mediachanger/castorrmc/rmc/rmc_smcsubr.c
index 3d556f112abb6cc3b6e9db1393eccc7589f3facf..d1954d2b6eeb1efdd1afc3b7e1000b817354e994 100644
--- a/mediachanger/castorrmc/rmc/rmc_smcsubr.c
+++ b/mediachanger/castorrmc/rmc/rmc_smcsubr.c
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 
 #include "h/Ctape.h"
+#include "h/rmc_constants.h"
 #include "h/rmc_sendrep.h"
 #include "h/rmc_smcsubr.h"
 #include "h/rmc_smcsubr2.h"
@@ -620,7 +621,7 @@ static int rmc_usrmsg(
 	...)
 {
 	va_list args;
-	char prtbuf[PRTBUFSZ];
+	char prtbuf[RMC_PRTBUFSZ];
 	const int save_errno = errno;
 
 	va_start (args, msg);
diff --git a/mediachanger/castorrmc/rmc/rmclogit.c b/mediachanger/castorrmc/rmc/rmclogit.c
index eb21ee376eda2d2eb286471b1eeb16c5ff1b4781..99f3fd65689554bc0c775d5e200e2d8de3fec22b 100644
--- a/mediachanger/castorrmc/rmc/rmclogit.c
+++ b/mediachanger/castorrmc/rmc/rmclogit.c
@@ -17,7 +17,7 @@ extern int jid;
 int rmclogit(const char *const func, const char *const msg, ...)
 {
 	va_list args;
-	char prtbuf[PRTBUFSZ];
+	char prtbuf[RMC_PRTBUFSZ];
 	int save_errno;
 	struct tm *tm;
 	time_t current_time;
diff --git a/mediachanger/castorrmc/rmc/send2rmc.c b/mediachanger/castorrmc/rmc/send2rmc.c
index 69b265204eacaddae841a01a36aaea37c088371c..3318b441864a672bf7737eef882ba1d33b211093 100644
--- a/mediachanger/castorrmc/rmc/send2rmc.c
+++ b/mediachanger/castorrmc/rmc/send2rmc.c
@@ -35,7 +35,7 @@ int send2rmc(
 	int magic;
 	int n;
 	char *p;
-	char prtbuf[PRTBUFSZ];
+	char prtbuf[RMC_PRTBUFSZ];
 	int rep_type;
 	char repbuf[REPBUFSZ];
 	char rmchost[CA_MAXHOSTNAMELEN+1];