diff --git a/source/c_api/accAPI.cpp b/source/c_api/accAPI.cpp
index 420f8ff0..5b9b8eb7 100644
--- a/source/c_api/accAPI.cpp
+++ b/source/c_api/accAPI.cpp
@@ -364,7 +364,7 @@ void udaSetPrivateFlag(unsigned int flag)
  * @return Void.
  */
 
-void reudaSetPrivateFlag(unsigned int flag)
+void udaResetPrivateFlag(unsigned int flag)
 {
     unsigned int* private_flags = udaPrivateFlags();
     *private_flags &= !flag;
@@ -380,8 +380,9 @@ void reudaSetPrivateFlag(unsigned int flag)
  * @return Void.
  */
 
-void udaSetClientFlag(CLIENT_FLAGS* client_flags, unsigned int flag)
+void udaSetClientFlag(unsigned int flag)
 {
+    auto client_flags = udaClientFlags();
     client_flags->flags = client_flags->flags | flag;
 }
 
@@ -392,8 +393,9 @@ void udaSetClientFlag(CLIENT_FLAGS* client_flags, unsigned int flag)
  * @return Void.
  */
 
-void reudaSetClientFlag(CLIENT_FLAGS* client_flags, unsigned int flag)
+void udaResetClientFlag(unsigned int flag)
 {
+    auto client_flags = udaClientFlags();
     client_flags->flags &= !flag;
 }
 
diff --git a/source/plugins/uda/uda_plugin.cpp b/source/plugins/uda/uda_plugin.cpp
index 5b3d5c84..69bbcbc4 100644
--- a/source/plugins/uda/uda_plugin.cpp
+++ b/source/plugins/uda/uda_plugin.cpp
@@ -2,14 +2,15 @@
 
 #include <cstdlib>
 
-#include "accAPI.h"
+// #include "accAPI.h"
 #include "initStructs.h"
-#include "udaGetAPI.h"
-#include "udaPlugin.h"
-#include <client/udaClient.h>
+// #include "udaGetAPI.h"
+// #include "udaPlugin.h"
+// #include <client/udaClient.h>
 #include <clientserver/stringUtils.h>
-#include <include/logging.h>
+// #include <include/logging.h>
 #include <plugins/uda_plugin_base.hpp>
+#include <uda.h>
 
 #include <boost/filesystem.hpp>
 #include <fmt/format.h>