diff --git a/libminifi/include/c2/C2Agent.h b/libminifi/include/c2/C2Agent.h
index 3f0e12a7c1..4818a6b0b1 100644
--- a/libminifi/include/c2/C2Agent.h
+++ b/libminifi/include/c2/C2Agent.h
@@ -29,8 +29,8 @@
 #include <utility>
 #include <vector>
 
-#include "../core/state/nodes/MetricsBase.h"
-#include "../core/state/Value.h"
+#include "core/state/nodes/MetricsBase.h"
+#include "core/state/Value.h"
 #include "core/state/UpdateController.h"
 #include "controllers/UpdatePolicyControllerService.h"
 #include "C2Payload.h"
diff --git a/libminifi/include/c2/C2Payload.h b/libminifi/include/c2/C2Payload.h
index 09c90540f4..62a0971c5c 100644
--- a/libminifi/include/c2/C2Payload.h
+++ b/libminifi/include/c2/C2Payload.h
@@ -24,7 +24,7 @@
 #include <map>
 #include <limits>
 
-#include "../core/state/Value.h"
+#include "core/state/Value.h"
 #include "core/state/UpdateController.h"
 #include "utils/Enum.h"
 #include "utils/gsl.h"
diff --git a/libminifi/include/core/state/Value.h b/libminifi/include/core/state/Value.h
deleted file mode 100644
index 1f440bd7d9..0000000000
--- a/libminifi/include/core/state/Value.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma once
-
-#include "minifi-cpp/core/state/Value.h"
-
-namespace org::apache::nifi::minifi::state::response {
-
-inline std::string to_string(const SerializedResponseNode& node) { return node.to_string(); }
-
-std::string hashResponseNodes(const std::vector<SerializedResponseNode>& nodes);
-
-}  // namespace org::apache::nifi::minifi::state::response
\ No newline at end of file
diff --git a/libminifi/include/core/state/nodes/MetricsBase.h b/libminifi/include/core/state/nodes/MetricsBase.h
index 95a8bbd795..57ca77a2ad 100644
--- a/libminifi/include/core/state/nodes/MetricsBase.h
+++ b/libminifi/include/core/state/nodes/MetricsBase.h
@@ -24,7 +24,7 @@
 #include <optional>
 #include <unordered_map>
 
-#include "../Value.h"
+#include "core/state/Value.h"
 #include "core/state/PublishedMetricProvider.h"
 #include "core/Core.h"
 #include "core/Connectable.h"
diff --git a/libminifi/test/unit/ResponseNodeValueTests.cpp b/libminifi/test/unit/ResponseNodeValueTests.cpp
index 58e52f1c34..9f169928d9 100644
--- a/libminifi/test/unit/ResponseNodeValueTests.cpp
+++ b/libminifi/test/unit/ResponseNodeValueTests.cpp
@@ -17,7 +17,7 @@
  */
 #include <memory>
 
-#include "../../include/core/state/Value.h"
+#include "core/state/Value.h"
 #include "unit/TestBase.h"
 #include "unit/Catch.h"
 
diff --git a/utils/include/core/Processor.h b/utils/include/core/Processor.h
index 761e61f0ce..897a6e72ff 100644
--- a/utils/include/core/Processor.h
+++ b/utils/include/core/Processor.h
@@ -44,6 +44,8 @@
 #include "utils/gsl.h"
 #include "minifi-cpp/core/OutputAttributeDefinition.h"
 #include "minifi-cpp/core/Processor.h"
+#include "core/Property.h"
+#include "core/ProcessContext.h"
 
 #define ADD_GET_PROCESSOR_NAME \
   std::string getProcessorType() const override { \
@@ -65,7 +67,6 @@ class Connection;
 
 namespace core {
 
-class ProcessContext;
 class ProcessSession;
 class ProcessSessionFactory;
 
diff --git a/utils/include/core/state/Value.h b/utils/include/core/state/Value.h
index ca38ed8136..c59d17bb15 100644
--- a/utils/include/core/state/Value.h
+++ b/utils/include/core/state/Value.h
@@ -504,4 +504,8 @@ ValueNode& ValueNode::operator=(const T ref) {
   return *this;
 }
 
+inline std::string to_string(const SerializedResponseNode& node) { return node.to_string(); }
+
+std::string hashResponseNodes(const std::vector<SerializedResponseNode>& nodes);
+
 }  // namespace org::apache::nifi::minifi::state::response
diff --git a/utils/src/core/ConfigurableComponent.cpp b/utils/src/core/ConfigurableComponent.cpp
index e9c83c1cbd..02657ae170 100644
--- a/utils/src/core/ConfigurableComponent.cpp
+++ b/utils/src/core/ConfigurableComponent.cpp
@@ -21,6 +21,7 @@
 #include <map>
 #include <vector>
 
+#include "core/PropertyValue.h"
 #include "core/ConfigurableComponent.h"
 #include "core/logging/LoggerFactory.h"
 #include "range/v3/range/conversion.hpp"