diff -ur aspell-0.60.8.1/common/config.cpp aspell-0.60.8.1-new/common/config.cpp
--- aspell-0.60.8.1/common/config.cpp	2023-12-19 17:54:05.000000000 -0500
+++ aspell-0.60.8.1-new/common/config.cpp	2025-05-14 00:49:57.760770800 -0400
@@ -6,6 +6,9 @@
 
 //#include <stdio.h>
 //#define DEBUG {fprintf(stderr,"File: %s(%i)\n",__FILE__,__LINE__);}
+
+#define _INTL_NO_DEFINE_MACRO_PRINTF
+
 #include <string.h>
 #include <stdlib.h>
 #include "ndebug.hpp"
diff -ur aspell-0.60.8.1/common/file_util.cpp aspell-0.60.8.1-new/common/file_util.cpp
--- aspell-0.60.8.1/common/file_util.cpp	2023-12-03 00:09:52.000000000 -0500
+++ aspell-0.60.8.1-new/common/file_util.cpp	2025-05-14 00:48:53.661817900 -0400
@@ -30,6 +30,7 @@
 #  define ACCESS _access
 #  include <windows.h>
 #  include <winbase.h>
+#  include "asc_ctype.hpp"
 
 #else
 
diff -ur aspell-0.60.8.1/common/ostream.hpp aspell-0.60.8.1-new/common/ostream.hpp
--- aspell-0.60.8.1/common/ostream.hpp	2023-12-03 00:09:52.000000000 -0500
+++ aspell-0.60.8.1-new/common/ostream.hpp	2025-05-14 00:51:22.687328100 -0400
@@ -7,6 +7,8 @@
 #ifndef ASPELL_OSTREAM__HPP
 #define ASPELL_OSTREAM__HPP
 
+#define _INTL_NO_DEFINE_MACRO_PRINTF
+
 #include <stdarg.h>
 
 #include "parm_string.hpp"
diff -ur aspell-0.60.8.1/modules/speller/default/language.cpp aspell-0.60.8.1-new/modules/speller/default/language.cpp
--- aspell-0.60.8.1/modules/speller/default/language.cpp	2023-12-03 00:09:52.000000000 -0500
+++ aspell-0.60.8.1-new/modules/speller/default/language.cpp	2025-05-14 00:54:28.633802200 -0400
@@ -20,7 +20,7 @@
 #include "getdata.hpp"
 #include "file_util.hpp"
 
-#ifdef ENABLE_NLS
+#ifdef HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
 #endif