diff --git a/dirty.h b/dirty.h
index f361edc9b..0f9d01074 100644
--- a/dirty.h
+++ b/dirty.h
@@ -32,8 +32,8 @@ rsRetVal submitMsg2(smsg_t *pMsg);
 rsRetVal __attribute__((deprecated)) submitMsg(smsg_t *pMsg);
 rsRetVal multiSubmitFlush(multi_submit_t *pMultiSub);
 rsRetVal logmsgInternal(const int iErr, const syslog_pri_t pri, const uchar *const msg, int flags);
-rsRetVal __attribute__((deprecated)) parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len,
-int flags, flowControl_t flowCtlTypeu, prop_t *pInputName, struct syslogTime *stTime, time_t ttGenTime,
+rsRetVal __attribute__((deprecated)) parseAndSubmitMessage(const uchar *hname, const uchar *hnameIP, const uchar *msg, const int len,
+const int flags, const flowControl_t flowCtlTypeu, prop_t *pInputName, const struct syslogTime *stTime, const time_t ttGenTime,
 ruleset_t *pRuleset);
 rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName, struct nvlst *lst);
 rsRetVal startMainQueue(qqueue_t *pQueue);
diff --git a/runtime/msg.c b/runtime/msg.c
index c458f3e53..4146c1c81 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -880,7 +880,7 @@ finalize_it:
  * udp input).
  * rgerhards, 2008-10-06
  */
-rsRetVal msgConstructWithTime(smsg_t **ppThis, struct syslogTime *stTime, time_t ttGenTime)
+rsRetVal msgConstructWithTime(smsg_t **ppThis, const struct syslogTime *stTime, const time_t ttGenTime)
 {
 	DEFiRet;
 
diff --git a/runtime/msg.h b/runtime/msg.h
index 0f130cb5f..f20a83a21 100644
--- a/runtime/msg.h
+++ b/runtime/msg.h
@@ -163,7 +163,7 @@ struct msg {
  */
 PROTOTYPEObjClassInit(msg);
 rsRetVal msgConstruct(smsg_t **ppThis);
-rsRetVal msgConstructWithTime(smsg_t **ppThis, struct syslogTime *stTime, time_t ttGenTime);
+rsRetVal msgConstructWithTime(smsg_t **ppThis, const struct syslogTime *stTime, const time_t ttGenTime);
 rsRetVal msgConstructForDeserializer(smsg_t **ppThis);
 rsRetVal msgConstructFinalizer(smsg_t *pThis);
 rsRetVal msgDestruct(smsg_t **ppM);
diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
index 4a6be7881..6799610cd 100644
--- a/tools/rsyslogd.c
+++ b/tools/rsyslogd.c
@@ -1557,8 +1557,12 @@ processImInternal(void)
  * function for new plugins. -- rgerhards, 2009-10-12
  */
 rsRetVal
-parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len, int flags, flowControl_t flowCtlType,
-	prop_t *pInputName, struct syslogTime *stTime, time_t ttGenTime, ruleset_t *pRuleset)
+parseAndSubmitMessage(const uchar *const hname, const uchar *const hnameIP, const uchar *const msg,
+	const int len, const int flags, const flowControl_t flowCtlType,
+	prop_t *const pInputName,
+	const struct syslogTime *const stTime,
+	const time_t ttGenTime,
+	ruleset_t *const pRuleset)
 {
 	prop_t *pProp = NULL;
 	smsg_t *pMsg = NULL;