Assort IWYU Cleanups (#56295)

* Assort IWYU cleanups

* merge fixups

* win help

* more win fix

Author: WillAyd

pandas/_libs/include/pandas/parser/tokenizer.h

@@ -18,11 +18,8 @@ See LICENSE for the license
 #define ERROR_OVERFLOW 2
 #define ERROR_INVALID_CHARS 3
 
-#include "pandas/portable.h"
 #include <stdint.h>
 
-#include "pandas/vendored/klib/khash.h"
-
 #define STREAM_INIT_SIZE 32
 
 #define REACHED_EOF 1

pandas/_libs/include/pandas/vendored/ujson/python/version.h

@@ -10,6 +10,7 @@ Distributed under the terms of the BSD Simplified License.
 
 #include "pandas/parser/pd_parser.h"
 #include "pandas/parser/io.h"
+#include "pandas/portable.h"
 
 static int to_double(char *item, double *p_value, char sci, char decimal,
                      int *maybe_int) {

pandas/_libs/src/parser/pd_parser.c

@@ -16,15 +16,16 @@ Python's built-in csv module and Warren Weckesser's textreader project on
 GitHub. See Python Software Foundation License and BSD licenses for these.
 
 */
-
 #include "pandas/parser/tokenizer.h"
+#include "pandas/portable.h"
 
 #include <ctype.h>
 #include <float.h>
 #include <math.h>
 #include <stdbool.h>
 
 #include "pandas/portable.h"
+#include "pandas/vendored/klib/khash.h" // for kh_int64_t, kh_destroy_int64
 
 void coliter_setup(coliter_t *self, parser_t *parser, int64_t i,
                    int64_t start) {

pandas/_libs/src/parser/tokenizer.c

@@ -25,9 +25,8 @@ This file is derived from NumPy 1.7. See NUMPY_LICENSE.txt
 #include <Python.h>
 
 #include "pandas/vendored/numpy/datetime/np_datetime.h"
-#include <numpy/arrayobject.h>
-#include <numpy/arrayscalars.h>
 #include <numpy/ndarraytypes.h>
+#include <numpy/npy_common.h>
 
 #if defined(_WIN32)
 #ifndef ENABLE_INTSAFE_SIGNED_FUNCTIONS

pandas/_libs/src/vendored/numpy/datetime/np_datetime.c

@@ -32,9 +32,8 @@ This file implements string parsing and creation for NumPy datetime.
 
 #include <time.h>
 
-#include <numpy/arrayobject.h>
-#include <numpy/arrayscalars.h>
 #include <numpy/ndarraytypes.h>
+#include <numpy/npy_common.h>
 
 #include "pandas/vendored/numpy/datetime/np_datetime.h"
 #include "pandas/vendored/numpy/datetime/np_datetime_strings.h"

pandas/_libs/src/vendored/numpy/datetime/np_datetime_strings.c

@@ -41,7 +41,6 @@ Numeric decoder derived from TCL library
 // Licence at LICENSES/ULTRAJSON_LICENSE
 
 #include "pandas/vendored/ujson/lib/ultrajson.h"
-#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>

pandas/_libs/src/vendored/ujson/lib/ultrajsondec.c

@@ -41,8 +41,6 @@ Numeric decoder derived from TCL library
 // Licence at LICENSES/ULTRAJSON_LICENSE
 
 #include "pandas/vendored/ujson/lib/ultrajson.h"
-#include <assert.h>
-#include <float.h>
 #include <locale.h>
 #include <math.h>
 #include <stdint.h>

pandas/_libs/src/vendored/ujson/lib/ultrajsonenc.c

@@ -40,7 +40,6 @@ Numeric decoder derived from TCL library
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <math.h>
 
 #define NO_IMPORT_ARRAY
 #define PY_ARRAY_UNIQUE_SYMBOL UJSON_NUMPY

pandas/_libs/src/vendored/ujson/python/objToJSON.c

@@ -38,7 +38,6 @@ Numeric decoder derived from TCL library
 
 // Licence at LICENSES/ULTRAJSON_LICENSE
 
-#include "pandas/vendored/ujson/python/version.h"
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #define PY_ARRAY_UNIQUE_SYMBOL UJSON_NUMPY