Fix included headers in fuzztest_macros and fuzztest_macros_test.

PiperOrigin-RevId: 910385708

fuzztest/BUILD

diff --git a/fuzztest/BUILD b/fuzztest/BUILD
index a4d29f8..44f4c8b 100644
--- a/fuzztest/BUILD
+++ b/fuzztest/BUILD
@@ -83,7 +83,6 @@
         "@abseil-cpp//absl/strings",
         "@abseil-cpp//absl/strings:string_view",
         "@com_google_fuzztest//common:logging",
-        "@com_google_fuzztest//fuzztest/internal:logging",
         "@com_google_fuzztest//fuzztest/internal:registration",
         "@com_google_fuzztest//fuzztest/internal:registry",
         "@com_google_fuzztest//fuzztest/internal:runtime",
@@ -96,6 +95,7 @@
     deps = [
         ":fuzztest_macros",
         "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
         "@abseil-cpp//absl/strings",
         "@com_google_fuzztest//common:logging",
         "@com_google_fuzztest//common:temp_dir",

fuzztest/CMakeLists.txt

diff --git a/fuzztest/CMakeLists.txt b/fuzztest/CMakeLists.txt
index 24f58c7..bbada08 100644
--- a/fuzztest/CMakeLists.txt
+++ b/fuzztest/CMakeLists.txt
@@ -162,7 +162,6 @@
     absl::statusor
     absl::strings
     absl::string_view
-    fuzztest::logging
     fuzztest::common_logging
     fuzztest::registration
     fuzztest::registry
@@ -176,11 +175,12 @@
     "fuzztest_macros_test.cc"
   DEPS
     fuzztest::fuzztest_macros
+    GTest::gmock_main
     absl::status
+    absl::statusor
     absl::strings
     fuzztest::common_logging
     fuzztest::temp_dir
-    GTest::gmock_main
 )
 
 fuzztest_cc_library(

fuzztest/fuzztest_macros.cc

diff --git a/fuzztest/fuzztest_macros.cc b/fuzztest/fuzztest_macros.cc
index 88add26..b94ea01 100644
--- a/fuzztest/fuzztest_macros.cc
+++ b/fuzztest/fuzztest_macros.cc
@@ -14,7 +14,6 @@
 
 #include "./fuzztest/fuzztest_macros.h"
 
-#include <cstring>
 #include <filesystem>  // NOLINT
 #include <fstream>
 #include <functional>
@@ -32,7 +31,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "./common/logging.h"
-#include "./fuzztest/internal/logging.h"
 #include "./fuzztest/internal/runtime.h"
 
 namespace fuzztest {

fuzztest/fuzztest_macros_test.cc

diff --git a/fuzztest/fuzztest_macros_test.cc b/fuzztest/fuzztest_macros_test.cc
index 41f44d9..97c9e3e 100644
--- a/fuzztest/fuzztest_macros_test.cc
+++ b/fuzztest/fuzztest_macros_test.cc
@@ -1,6 +1,6 @@
 #include "./fuzztest/fuzztest_macros.h"
 
-#include <filesystem>
+#include <filesystem>  // NOLINT
 #include <fstream>
 #include <string>
 #include <string_view>
@@ -9,6 +9,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "./common/logging.h"
 #include "./common/temp_dir.h"