From e0a795d9d2c5696d7f7c79d3e219af84c25a7776 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 28 Jul 2019 14:55:02 -0700 Subject: Clean up some more headers --- utils/makemhr/makemhr.cpp | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/utils/makemhr/makemhr.cpp b/utils/makemhr/makemhr.cpp index 70ddbe5a..e480277e 100644 --- a/utils/makemhr/makemhr.cpp +++ b/utils/makemhr/makemhr.cpp @@ -59,45 +59,40 @@ * 1999 */ +#define _UNICODE #include "config.h" -#define _UNICODE +#include "makemhr.h" + +#include +#include +#include +#include +#include +#include #include #include -#include -#include #include -#include -#include -#include -#include -#ifdef HAVE_STRINGS_H -#include -#endif +#include +#include +#include +#include +#include +#include +#include + #ifdef HAVE_GETOPT #include #else #include "../getopt.h" #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "mysofa.h" - -#include "makemhr.h" #include "loaddef.h" #include "loadsofa.h" #include "win_main_utf8.h" + namespace { using namespace std::placeholders; -- cgit v1.2.3