diff --git a/lib/api/include/irods/generalUpdate.h b/lib/api/include/irods/generalUpdate.h
index defb34e0d2..fad0445e78 100644
--- a/lib/api/include/irods/generalUpdate.h
+++ b/lib/api/include/irods/generalUpdate.h
@@ -1,12 +1,19 @@
-#ifndef GENERAL_UPDATE_H__
-#define GENERAL_UPDATE_H__
+#ifndef IRODS_GENERAL_UPDATE_H
+#define IRODS_GENERAL_UPDATE_H
 
 #include "irods/rcConnect.h"
 #include "irods/rodsGeneralUpdate.h"
 
 #ifdef __cplusplus
-extern "C"
+extern "C" {
 #endif
-int rcGeneralUpdate( rcComm_t *conn, generalUpdateInp_t *generalUpdateInp );
 
+int rcGeneralUpdate(rcComm_t* conn, generalUpdateInp_t* generalUpdateInp)
+    __attribute__((deprecated("rcGeneralUpdate is deprecated and will be removed in a later release. If you are "
+                              "reaching for this, consider revising your approach.")));
+
+#ifdef __cplusplus
+} // extern "C"
 #endif
+
+#endif // IRODS_GENERAL_UPDATE_H
diff --git a/server/api/include/irods/rsGeneralUpdate.hpp b/server/api/include/irods/rsGeneralUpdate.hpp
index f2b8aac7c1..5f8c3067d6 100644
--- a/server/api/include/irods/rsGeneralUpdate.hpp
+++ b/server/api/include/irods/rsGeneralUpdate.hpp
@@ -1,10 +1,14 @@
-#ifndef RS_GENERAL_UPDATE_HPP
-#define RS_GENERAL_UPDATE_HPP
+#ifndef IRODS_RS_GENERAL_UPDATE_HPP
+#define IRODS_RS_GENERAL_UPDATE_HPP
 
 #include "irods/rcConnect.h"
 #include "irods/rodsGeneralUpdate.h"
 
-int rsGeneralUpdate( rsComm_t *rsComm, generalUpdateInp_t *generalUpdateInp );
+int rsGeneralUpdate(rsComm_t* rsComm, generalUpdateInp_t* generalUpdateInp)
+    __attribute__((deprecated("rsGeneralUpdate is deprecated and will be removed in a later release. If you are "
+                              "reaching for this, consider revising your approach.")));
+
+// TODO Leading underscores are not allowed in the global namespace.
 int _rsGeneralUpdate( generalUpdateInp_t *generalUpdateInp );
 
-#endif
+#endif // IRODS_RS_GENERAL_UPDATE_HPP
diff --git a/server/icat/include/irods/icatHighLevelRoutines.hpp b/server/icat/include/irods/icatHighLevelRoutines.hpp
index 73f9a8febb..0dd549060e 100644
--- a/server/icat/include/irods/icatHighLevelRoutines.hpp
+++ b/server/icat/include/irods/icatHighLevelRoutines.hpp
@@ -61,7 +61,9 @@ int chlGenQueryTicketSetup( const char *ticket, const char *clientAddr );
 int chlSpecificQuery( specificQueryInp_t specificQueryInp,
                       genQueryOut_t *genQueryOut );
 
-int chlGeneralUpdate( generalUpdateInp_t generalUpdateInp );
+int chlGeneralUpdate(generalUpdateInp_t generalUpdateInp)
+    __attribute__((deprecated("chlGeneralUpdate is deprecated and will be removed in a later release. If you are "
+                              "reaching for this, consider revising your approach.")));
 
 int chlDelCollByAdmin( rsComm_t *rsComm, collInfo_t *collInfo );
 int chlDelColl( rsComm_t *rsComm, collInfo_t *collInfo );