ICU-23247 Delete use of umachine.h & urename.h internal header files.

These are intended to be included indirectly through utypes.h instead.

icu4c/source/common/ulocbuilder.cpp

diff --git a/icu4c/source/common/ulocbuilder.cpp b/icu4c/source/common/ulocbuilder.cpp
index b8b6ce8..b770392 100644
--- a/icu4c/source/common/ulocbuilder.cpp
+++ b/icu4c/source/common/ulocbuilder.cpp
@@ -7,8 +7,8 @@
 #include "unicode/localebuilder.h"
 #include "unicode/locid.h"
 #include "unicode/stringpiece.h"
-#include "unicode/umachine.h"
 #include "unicode/ulocbuilder.h"
+#include "unicode/utypes.h"
 #include "bytesinkutil.h"
 #include "cstring.h"
 #include "ustr_imp.h"

icu4c/source/i18n/number_decimalquantity.h

diff --git a/icu4c/source/i18n/number_decimalquantity.h b/icu4c/source/i18n/number_decimalquantity.h
index 2303186..78b1a36 100644
--- a/icu4c/source/i18n/number_decimalquantity.h
+++ b/icu4c/source/i18n/number_decimalquantity.h
@@ -8,7 +8,6 @@
 #define __NUMBER_DECIMALQUANTITY_H__
 
 #include <cstdint>
-#include "unicode/umachine.h"
 #include "standardplural.h"
 #include "plurrule_impl.h"
 #include "number_types.h"

icu4c/source/i18n/number_usageprefs.cpp

diff --git a/icu4c/source/i18n/number_usageprefs.cpp b/icu4c/source/i18n/number_usageprefs.cpp
index 5c15c1c..8d5ad1c 100644
--- a/icu4c/source/i18n/number_usageprefs.cpp
+++ b/icu4c/source/i18n/number_usageprefs.cpp
@@ -18,7 +18,6 @@
 #include "unicode/numberformatter.h"
 #include "unicode/platform.h"
 #include "unicode/unum.h"
-#include "unicode/urename.h"
 #include "units_data.h"
 
 using namespace icu;

icu4c/source/test/intltest/itrbnf.cpp

diff --git a/icu4c/source/test/intltest/itrbnf.cpp b/icu4c/source/test/intltest/itrbnf.cpp
index ad7ad8f..854b129 100644
--- a/icu4c/source/test/intltest/itrbnf.cpp
+++ b/icu4c/source/test/intltest/itrbnf.cpp
@@ -13,8 +13,6 @@
 
 #include "itrbnf.h"
 
-#include "unicode/umachine.h"
-
 #include "unicode/tblcoll.h"
 #include "unicode/coleitr.h"
 #include "unicode/ures.h"

icu4c/source/test/intltest/itrbnfp.cpp

diff --git a/icu4c/source/test/intltest/itrbnfp.cpp b/icu4c/source/test/intltest/itrbnfp.cpp
index 2e0c537..919e3fc 100644
--- a/icu4c/source/test/intltest/itrbnfp.cpp
+++ b/icu4c/source/test/intltest/itrbnfp.cpp
@@ -13,8 +13,6 @@
 
 #include "itrbnfp.h"
 
-#include "unicode/umachine.h"
-
 #include "unicode/tblcoll.h"
 #include "unicode/coleitr.h"
 #include "unicode/ures.h"

icu4c/source/tools/genrb/parse.cpp

diff --git a/icu4c/source/tools/genrb/parse.cpp b/icu4c/source/tools/genrb/parse.cpp
index 1ae66e3..1e615cf 100644
--- a/icu4c/source/tools/genrb/parse.cpp
+++ b/icu4c/source/tools/genrb/parse.cpp
@@ -22,7 +22,6 @@
 
 // Safer use of UnicodeString.
 #include <cstdint>
-#include "unicode/umachine.h"
 #ifndef UNISTR_FROM_CHAR_EXPLICIT
 #   define UNISTR_FROM_CHAR_EXPLICIT explicit
 #endif
@@ -50,6 +49,7 @@
 #include "unicode/ustring.h"
 #include "unicode/uscript.h"
 #include "unicode/utf16.h"
+#include "unicode/utypes.h"
 #include "unicode/putil.h"
 #include "charstr.h"
 #include "collationbuilder.h"

icu4c/source/tools/icuexportdata/icuexportdata.cpp

diff --git a/icu4c/source/tools/icuexportdata/icuexportdata.cpp b/icu4c/source/tools/icuexportdata/icuexportdata.cpp
index 954db1d..da41d24 100644
--- a/icu4c/source/tools/icuexportdata/icuexportdata.cpp
+++ b/icu4c/source/tools/icuexportdata/icuexportdata.cpp
@@ -6,10 +6,9 @@
 #include <cstdio>
 #include <iostream>
 #include "unicode/localpointer.h"
-#include "unicode/umachine.h"
 #include "unicode/unistr.h"
-#include "unicode/urename.h"
 #include "unicode/uset.h"
+#include "unicode/utypes.h"
 #include <vector>
 #include <algorithm>
 #include "toolutil.h"