diff --git a/plugins/microservices/src/json_compare.cpp b/plugins/microservices/src/json_compare.cpp
index f75ccc5206..d27b8568e8 100644
--- a/plugins/microservices/src/json_compare.cpp
+++ b/plugins/microservices/src/json_compare.cpp
@@ -1,13 +1,13 @@
 /// \file
 
 #include "json_common.hpp"
-#include "msi_preconditions.hpp"
 
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/objInfo.h" // For StrArray
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"
diff --git a/plugins/microservices/src/json_contains.cpp b/plugins/microservices/src/json_contains.cpp
index 53b149a8e0..3e653352a8 100644
--- a/plugins/microservices/src/json_contains.cpp
+++ b/plugins/microservices/src/json_contains.cpp
@@ -1,13 +1,13 @@
 /// \file
 
 #include "json_common.hpp"
-#include "msi_preconditions.hpp"
 
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"
 
diff --git a/plugins/microservices/src/json_dump.cpp b/plugins/microservices/src/json_dump.cpp
index e85e23dcf6..218c84be4a 100644
--- a/plugins/microservices/src/json_dump.cpp
+++ b/plugins/microservices/src/json_dump.cpp
@@ -1,13 +1,13 @@
 /// \file
 
 #include "json_common.hpp"
-#include "msi_preconditions.hpp"
 
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"
 
diff --git a/plugins/microservices/src/json_free.cpp b/plugins/microservices/src/json_free.cpp
index fb7d922756..7f08e77560 100644
--- a/plugins/microservices/src/json_free.cpp
+++ b/plugins/microservices/src/json_free.cpp
@@ -1,12 +1,11 @@
 /// \file
 
-#include "msi_preconditions.hpp"
-
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"
 
diff --git a/plugins/microservices/src/json_handles.cpp b/plugins/microservices/src/json_handles.cpp
index 5dbf724f78..5c92020cbb 100644
--- a/plugins/microservices/src/json_handles.cpp
+++ b/plugins/microservices/src/json_handles.cpp
@@ -1,13 +1,13 @@
 /// \file
 
 #include "json_common.hpp"
-#include "msi_preconditions.hpp"
 
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"
 
diff --git a/plugins/microservices/src/json_names.cpp b/plugins/microservices/src/json_names.cpp
index 709271ace3..5b7656233c 100644
--- a/plugins/microservices/src/json_names.cpp
+++ b/plugins/microservices/src/json_names.cpp
@@ -1,13 +1,13 @@
 /// \file
 
 #include "json_common.hpp"
-#include "msi_preconditions.hpp"
 
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/objInfo.h" // For StrArray
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"
diff --git a/plugins/microservices/src/json_parse.cpp b/plugins/microservices/src/json_parse.cpp
index 3ac70e7eb6..b5f09e841b 100644
--- a/plugins/microservices/src/json_parse.cpp
+++ b/plugins/microservices/src/json_parse.cpp
@@ -1,12 +1,11 @@
 /// \file
 
-#include "msi_preconditions.hpp"
-
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/objInfo.h"
 #include "irods/process_stash.hpp"
 #include "irods/rcMisc.h"
diff --git a/plugins/microservices/src/json_size.cpp b/plugins/microservices/src/json_size.cpp
index 9b8f9f6c73..e28b5320a9 100644
--- a/plugins/microservices/src/json_size.cpp
+++ b/plugins/microservices/src/json_size.cpp
@@ -1,13 +1,13 @@
 /// \file
 
 #include "json_common.hpp"
-#include "msi_preconditions.hpp"
 
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"
 
diff --git a/plugins/microservices/src/json_type.cpp b/plugins/microservices/src/json_type.cpp
index 259c58e02a..ec17a4afd9 100644
--- a/plugins/microservices/src/json_type.cpp
+++ b/plugins/microservices/src/json_type.cpp
@@ -1,13 +1,13 @@
 /// \file
 
 #include "json_common.hpp"
-#include "msi_preconditions.hpp"
 
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"
 
diff --git a/plugins/microservices/src/json_value.cpp b/plugins/microservices/src/json_value.cpp
index 7fbe24d43f..b359f87ffd 100644
--- a/plugins/microservices/src/json_value.cpp
+++ b/plugins/microservices/src/json_value.cpp
@@ -1,13 +1,13 @@
 /// \file
 
 #include "json_common.hpp"
-#include "msi_preconditions.hpp"
 
 #include "irods/irods_error.hpp"
 #include "irods/irods_logger.hpp"
 #include "irods/irods_ms_plugin.hpp"
 #include "irods/irods_re_structs.hpp"
 #include "irods/msParam.h"
+#include "irods/msi_preconditions.hpp"
 #include "irods/process_stash.hpp"
 #include "irods/rodsErrorTable.h"