From cce3d0ab1fc945544f1fa2633ef03fdb906ea420 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 9 Jul 2025 03:01:36 +0200
Subject: [PATCH] Revert "apply the logic to tests that include 3rd-party
 headers"

This reverts commit 9148ea61d5af5979eed7ceb912a5275c7b1d394d.

No need: curl_setup.h is already included in each source and it
does the undef already.
---
 tests/libtest/lib1960.c | 3 ---
 tests/libtest/lib571.c  | 4 ----
 tests/tunit/tool1621.c  | 2 +-
 tests/unit/unit1305.c   | 2 --
 tests/unit/unit1663.c   | 2 --
 tests/unit/unit1664.c   | 2 --
 tests/unit/unit2600.c   | 2 --
 7 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/tests/libtest/lib1960.c b/tests/libtest/lib1960.c
index cfbff3407f..4fb7247073 100644
--- a/tests/libtest/lib1960.c
+++ b/tests/libtest/lib1960.c
@@ -25,8 +25,6 @@
 
 #ifdef HAVE_INET_PTON
 
-#include "curl_mem_undef.h" /* include BEFORE system headers */
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -34,7 +32,6 @@
 #include <arpa/inet.h>
 #endif
 
-#include "curl_memory.h"
 #include "memdebug.h"
 
 /* to prevent libcurl from closing our socket */
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index 86e242a9a3..4a8d805bf0 100644
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "first.h"
 
-#include "curl_mem_undef.h" /* include BEFORE system headers */
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -36,8 +34,6 @@
 #endif
 
 #include "testutil.h"
-
-#include "curl_memory.h"
 #include "memdebug.h"
 
 #define RTP_PKT_CHANNEL(p)   ((int)((unsigned char)((p)[1])))
diff --git a/tests/tunit/tool1621.c b/tests/tunit/tool1621.c
index 571a33c43f..4919988c6c 100644
--- a/tests/tunit/tool1621.c
+++ b/tests/tunit/tool1621.c
@@ -23,8 +23,8 @@
  ***************************************************************************/
 #include "unitcheck.h"
 
-#include "curl_mem_undef.h" /* include BEFORE system headers */
 #include "tool_xattr.h"
+
 #include "memdebug.h" /* LAST include file */
 
 static CURLcode test_tool1621(char *arg)
diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index bb172f8c6e..025b2321be 100644
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "unitcheck.h"
 
-#include "curl_mem_undef.h" /* include BEFORE system headers */
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/tests/unit/unit1663.c b/tests/unit/unit1663.c
index c4990f4e19..b017965380 100644
--- a/tests/unit/unit1663.c
+++ b/tests/unit/unit1663.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "unitcheck.h"
 
-#include "curl_mem_undef.h" /* include BEFORE system headers */
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/tests/unit/unit1664.c b/tests/unit/unit1664.c
index 0240c08a65..d3e7670108 100644
--- a/tests/unit/unit1664.c
+++ b/tests/unit/unit1664.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "unitcheck.h"
 
-#include "curl_mem_undef.h" /* include BEFORE system headers */
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/tests/unit/unit2600.c b/tests/unit/unit2600.c
index de8888726f..21e575258b 100644
--- a/tests/unit/unit2600.c
+++ b/tests/unit/unit2600.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "unitcheck.h"
 
-#include "curl_mem_undef.h" /* include BEFORE system headers */
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif