diff --git a/gcc/ada/gcc-interface/misc.cc b/gcc/ada/gcc-interface/misc.cc
index 56742e75dde2f9a4d1ce8a31a69e6889351c8529..c7c735e57639b6ce9b1340dcc8ad32899b617384 100644
--- a/gcc/ada/gcc-interface/misc.cc
+++ b/gcc/ada/gcc-interface/misc.cc
@@ -23,7 +23,6 @@
* *
****************************************************************************/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc
index a27804b91b8f0c2be083ef3f29960eb6a51bbf51..5d971c1681d6bddfd544ec153af5a2ae0e393ef6 100644
--- a/gcc/ada/gcc-interface/trans.cc
+++ b/gcc/ada/gcc-interface/trans.cc
@@ -23,7 +23,6 @@
* *
****************************************************************************/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ada/gcc-interface/utils.cc b/gcc/ada/gcc-interface/utils.cc
index 655ceb3d68301f14fd500b17e7cc682bac9d8ccb..8e8cf55ae12bedb1920016a5083b8f74d9574cec 100644
--- a/gcc/ada/gcc-interface/utils.cc
+++ b/gcc/ada/gcc-interface/utils.cc
@@ -23,7 +23,6 @@
* *
****************************************************************************/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/access-diagram.cc b/gcc/analyzer/access-diagram.cc
index 4822ae3928458d4900daa7e21196730b9359cc9e..93e9d242a65377c3048f3959e3378561e3c01fb8 100644
--- a/gcc/analyzer/access-diagram.cc
+++ b/gcc/analyzer/access-diagram.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#define INCLUDE_MAP
#define INCLUDE_SET
#define INCLUDE_VECTOR
diff --git a/gcc/analyzer/analysis-plan.cc b/gcc/analyzer/analysis-plan.cc
index f0bf5af7d0311e26ce85a50a51f5f6905dacf10f..8d2dd36dad9c6a64c9d0aee9d1caabf68b1d8290 100644
--- a/gcc/analyzer/analysis-plan.cc
+++ b/gcc/analyzer/analysis-plan.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tree.h"
diff --git a/gcc/analyzer/analyzer-language.cc b/gcc/analyzer/analyzer-language.cc
index e66ab38c9e770600a3155c24cffbfc0453b80e57..5c12d94250d886726fee6d44a50870a3d73c2778 100644
--- a/gcc/analyzer/analyzer-language.cc
+++ b/gcc/analyzer/analyzer-language.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tree.h"
diff --git a/gcc/analyzer/analyzer-logging.cc b/gcc/analyzer/analyzer-logging.cc
index 2a4d02f83ba6dc03cce63e032c660426cb888b96..db2224cffbe537bd689a1d82d554b02e6e4380e8 100644
--- a/gcc/analyzer/analyzer-logging.cc
+++ b/gcc/analyzer/analyzer-logging.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/analyzer-pass.cc b/gcc/analyzer/analyzer-pass.cc
index 6f16671bc5a23568adf69c6e4b3c09f0fb09f3e0..317c4691601a3edded038dc5eaf1fc5e3a07b55d 100644
--- a/gcc/analyzer/analyzer-pass.cc
+++ b/gcc/analyzer/analyzer-pass.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "context.h"
diff --git a/gcc/analyzer/analyzer-selftests.cc b/gcc/analyzer/analyzer-selftests.cc
index 4500e3a78f3a069e802c0a2dc89c212e909324dc..0d6a0c9906b70c1f4ba6d6180b14e8d3bfb2ea82 100644
--- a/gcc/analyzer/analyzer-selftests.cc
+++ b/gcc/analyzer/analyzer-selftests.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tree.h"
diff --git a/gcc/analyzer/analyzer.cc b/gcc/analyzer/analyzer.cc
index f77dcd76c5cd1c354cd1c3ac3119bc29391d1e79..72c755122d785c76addf5ec19e2bb41b7db706a4 100644
--- a/gcc/analyzer/analyzer.cc
+++ b/gcc/analyzer/analyzer.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tree.h"
diff --git a/gcc/analyzer/bar-chart.cc b/gcc/analyzer/bar-chart.cc
index 3a259f80066b71513373cb9a541c82792db79935..4a4acf5f377cc0d5a62ee507e468553ad44eeab6 100644
--- a/gcc/analyzer/bar-chart.cc
+++ b/gcc/analyzer/bar-chart.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/bounds-checking.cc b/gcc/analyzer/bounds-checking.cc
index e52a63ed9a243514e16a96930ffcc856fa5cf621..8122d4d5776e87b16dfb1e88acdc3b9a71e02c96 100644
--- a/gcc/analyzer/bounds-checking.cc
+++ b/gcc/analyzer/bounds-checking.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/call-details.cc b/gcc/analyzer/call-details.cc
index 00c939399b200d2d358273bb3b7e593f895ebe7e..965bd91b860d96d81f3bbbecc97f5da622740862 100644
--- a/gcc/analyzer/call-details.cc
+++ b/gcc/analyzer/call-details.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/call-info.cc b/gcc/analyzer/call-info.cc
index 6c458c777eaaf460bdb5cabb25dbc595dce843c9..ee466bd111add9444be439eb105ea9984acf91b3 100644
--- a/gcc/analyzer/call-info.cc
+++ b/gcc/analyzer/call-info.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/call-string.cc b/gcc/analyzer/call-string.cc
index 024a1fec03ef4c77da8bd75b3863ecfd59ed5f01..23ba9a5fc9dde69aff6acb9698b1dc769e06d9c2 100644
--- a/gcc/analyzer/call-string.cc
+++ b/gcc/analyzer/call-string.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "pretty-print.h"
diff --git a/gcc/analyzer/call-summary.cc b/gcc/analyzer/call-summary.cc
index f6d22df547e3ce097fff5bad1ed90ead9d547abf..27fb57521f26a16e69741a88d846752cfa055fdb 100644
--- a/gcc/analyzer/call-summary.cc
+++ b/gcc/analyzer/call-summary.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/checker-event.cc b/gcc/analyzer/checker-event.cc
index 5a292377e937bb9a3c32ff1b8351df82e1b5819d..a7098ae19a138cc9f461167bb5e41316ccfe435e 100644
--- a/gcc/analyzer/checker-event.cc
+++ b/gcc/analyzer/checker-event.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/checker-path.cc b/gcc/analyzer/checker-path.cc
index d607679beec8e68671dfd69fcfe8613bfc3bc9bc..fd3d6efae67e8273d38789b0018f11e25f3be477 100644
--- a/gcc/analyzer/checker-path.cc
+++ b/gcc/analyzer/checker-path.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/complexity.cc b/gcc/analyzer/complexity.cc
index 0f1f8cad5798c43741a6d8b22ed6a28159b031d2..ddbed58ea42794c26736d02e4ee264826ae17106 100644
--- a/gcc/analyzer/complexity.cc
+++ b/gcc/analyzer/complexity.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/constraint-manager.cc b/gcc/analyzer/constraint-manager.cc
index 429a3a0e2a719f6bc3ff239ab9b9d51cd915ee90..15255c6d1a88cf745645c313ae4fa1201a0358f2 100644
--- a/gcc/analyzer/constraint-manager.cc
+++ b/gcc/analyzer/constraint-manager.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/diagnostic-manager.cc b/gcc/analyzer/diagnostic-manager.cc
index 0b2e4ee56c7b30006e0772cbbb6cdbc367ddf1c9..c80b232e66f2ed9eb9b962cf07fd726f7fa4e772 100644
--- a/gcc/analyzer/diagnostic-manager.cc
+++ b/gcc/analyzer/diagnostic-manager.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc
index d5328d7e162e82e4cea98a871b5ae0da3b1564af..d19eb7a70e619b7f0c03ad7deb46d984c64473cb 100644
--- a/gcc/analyzer/engine.cc
+++ b/gcc/analyzer/engine.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/feasible-graph.cc b/gcc/analyzer/feasible-graph.cc
index 35b489fde35710abfe071613cb96f66a0f04cb32..1b950a9430d19cafa698013d6fc802b1c9767b92 100644
--- a/gcc/analyzer/feasible-graph.cc
+++ b/gcc/analyzer/feasible-graph.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/infinite-loop.cc b/gcc/analyzer/infinite-loop.cc
index ac589ed5dbdf87b84f2172858b44e45d6d76ac44..f1a60e8d65a44b98a619f236fb04fc48f9b8b46b 100644
--- a/gcc/analyzer/infinite-loop.cc
+++ b/gcc/analyzer/infinite-loop.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/infinite-recursion.cc b/gcc/analyzer/infinite-recursion.cc
index 343115eadbaa762b5e1b679d9f1c28ae96422feb..d2c44f3fc2f3037ca84ca494c801f6d69b2754c8 100644
--- a/gcc/analyzer/infinite-recursion.cc
+++ b/gcc/analyzer/infinite-recursion.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/kf-analyzer.cc b/gcc/analyzer/kf-analyzer.cc
index da49baa5bff1aeecdbf3dc58f7503acd352d6234..dcde272e9e0762f2474ebba10aece309ea96dc11 100644
--- a/gcc/analyzer/kf-analyzer.cc
+++ b/gcc/analyzer/kf-analyzer.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/kf-lang-cp.cc b/gcc/analyzer/kf-lang-cp.cc
index 8d1c566c54510baf6f2ae223711e990d9331dd84..2e519a32e884f88da20d3d5af2c670bfef9f4ad4 100644
--- a/gcc/analyzer/kf-lang-cp.cc
+++ b/gcc/analyzer/kf-lang-cp.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/kf.cc b/gcc/analyzer/kf.cc
index 33a18867a999f9d23779b61b7459f50eeb3c22c7..8b16590d71b1a9348166415651c2379a8e44e3e8 100644
--- a/gcc/analyzer/kf.cc
+++ b/gcc/analyzer/kf.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/known-function-manager.cc b/gcc/analyzer/known-function-manager.cc
index 522d2aa9e577c8f618144f210e114aeb875344ac..e999b79369aa5c27cb17d936d35ee181ada8d762 100644
--- a/gcc/analyzer/known-function-manager.cc
+++ b/gcc/analyzer/known-function-manager.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/pending-diagnostic.cc b/gcc/analyzer/pending-diagnostic.cc
index 01a7697b3bd8ca472656a0bfc472e5083bcbaddd..8d2428d29002d66710c331639acef2a993db1043 100644
--- a/gcc/analyzer/pending-diagnostic.cc
+++ b/gcc/analyzer/pending-diagnostic.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/program-point.cc b/gcc/analyzer/program-point.cc
index bfb1dd48f801917446fed12ca7344ac0eaf9fa5c..1df402095b21f8c06a06cd42e3251639fa6e0fc1 100644
--- a/gcc/analyzer/program-point.cc
+++ b/gcc/analyzer/program-point.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/program-state.cc b/gcc/analyzer/program-state.cc
index 5cad3e68bf01df3c25657cafbbca4bfa89faa321..6ac4d3cdc41d726a91afac0cfbe2e195bdd67404 100644
--- a/gcc/analyzer/program-state.cc
+++ b/gcc/analyzer/program-state.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/ranges.cc b/gcc/analyzer/ranges.cc
index 420aac4a910daf89903e942b51bd6dbd0a01fc17..0967d6337b30f3c7cf1656c2f9ba5f01d63b5c0b 100644
--- a/gcc/analyzer/ranges.cc
+++ b/gcc/analyzer/ranges.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/record-layout.cc b/gcc/analyzer/record-layout.cc
index e70e92a56fdd6ca4aa437a364fa883ab864a3ac3..da95faeaaa83f134fdaeabba8100907b34623c8e 100644
--- a/gcc/analyzer/record-layout.cc
+++ b/gcc/analyzer/record-layout.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/region-model-asm.cc b/gcc/analyzer/region-model-asm.cc
index 2a074b647755fda7554762be1032e7e640560bfb..e8ffc2219b9371834c94393c596a8dfd29ef4c9a 100644
--- a/gcc/analyzer/region-model-asm.cc
+++ b/gcc/analyzer/region-model-asm.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/region-model-manager.cc b/gcc/analyzer/region-model-manager.cc
index 8154d914e81cfe4c8c780546da32e4ba7b7c2f93..f8ed2640e16968723f0dd59dd74e265a82758731 100644
--- a/gcc/analyzer/region-model-manager.cc
+++ b/gcc/analyzer/region-model-manager.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/region-model-reachability.cc b/gcc/analyzer/region-model-reachability.cc
index ffb08322b2601a5c5c1b6fa6ca2de1194ba1e5d6..d5a1d874ea5fd62c983d41a89aec765f5a405b3e 100644
--- a/gcc/analyzer/region-model-reachability.cc
+++ b/gcc/analyzer/region-model-reachability.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc
index aa4e9982c89187420f8c0c2f88754b74b877ae80..ffadd24e3766a9707a94f6746574c10a808ab48e 100644
--- a/gcc/analyzer/region-model.cc
+++ b/gcc/analyzer/region-model.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_ALGORITHM
#define INCLUDE_VECTOR
#include "system.h"
diff --git a/gcc/analyzer/region.cc b/gcc/analyzer/region.cc
index ac1ea646eb835f7667ec97b1772d1ac7e0a72573..643ffc483974a3ac07c3f9e97305006ea386198f 100644
--- a/gcc/analyzer/region.cc
+++ b/gcc/analyzer/region.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/sm-fd.cc b/gcc/analyzer/sm-fd.cc
index aacc2123b24324f059bcc72aefc2d4963da3d53a..187fd45eb21dc50c7b15d9f6e9b7d1f048dda9e5 100644
--- a/gcc/analyzer/sm-fd.cc
+++ b/gcc/analyzer/sm-fd.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/sm-file.cc b/gcc/analyzer/sm-file.cc
index d6e7e6b25e76da0f7f0a24cd227cf26a769286cc..e6198293e4db1315370ee401fd4366c664fd4734 100644
--- a/gcc/analyzer/sm-file.cc
+++ b/gcc/analyzer/sm-file.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/sm-malloc.cc b/gcc/analyzer/sm-malloc.cc
index 957c0d055e61e4189f070acf245c10bedd1e3424..30a1ec3fcacfe6035f4b3d45bb39000f235bcfd8 100644
--- a/gcc/analyzer/sm-malloc.cc
+++ b/gcc/analyzer/sm-malloc.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/sm-pattern-test.cc b/gcc/analyzer/sm-pattern-test.cc
index b56289ad259b477e7a2b4f88da1b5a67881e542e..2aaf941d4c59e5e9a7f01e22a9772f6ce11e9bc7 100644
--- a/gcc/analyzer/sm-pattern-test.cc
+++ b/gcc/analyzer/sm-pattern-test.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/sm-sensitive.cc b/gcc/analyzer/sm-sensitive.cc
index 52cd58417b09471b27031d1e9e3fa9f8b17c4d71..963f517d57f4c8651cd2dd7ce74cc3827bfd0211 100644
--- a/gcc/analyzer/sm-sensitive.cc
+++ b/gcc/analyzer/sm-sensitive.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "make-unique.h"
diff --git a/gcc/analyzer/sm-signal.cc b/gcc/analyzer/sm-signal.cc
index c48dfe9c046363c8651c44202be5fde337cad8b8..8adaa6f0e23bd5e4280c612cadfa701d0b4db244 100644
--- a/gcc/analyzer/sm-signal.cc
+++ b/gcc/analyzer/sm-signal.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/sm-taint.cc b/gcc/analyzer/sm-taint.cc
index ecea46feddad523094c2f1148c0833287f41afd2..f610f7234786ac50b5695a36a91cfc3aa573f779 100644
--- a/gcc/analyzer/sm-taint.cc
+++ b/gcc/analyzer/sm-taint.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/sm.cc b/gcc/analyzer/sm.cc
index 4c4b2eaf73efd2ea324374ae11dce6dbbc5b13db..f4b8992301fc2a0f29a2fd9b73470a2f94586804 100644
--- a/gcc/analyzer/sm.cc
+++ b/gcc/analyzer/sm.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/state-purge.cc b/gcc/analyzer/state-purge.cc
index d2fe4f3599c000857081e34c43599abbdc56f200..0ac0dcd62af275db3314e3139ae5d2f8df10a83a 100644
--- a/gcc/analyzer/state-purge.cc
+++ b/gcc/analyzer/state-purge.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/store.cc b/gcc/analyzer/store.cc
index e95c86ff516a283443de4e7295bdb2a3425be8c8..4c50c2a4d53c7ed6a5410022eea1d9151cd647f3 100644
--- a/gcc/analyzer/store.cc
+++ b/gcc/analyzer/store.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/supergraph.cc b/gcc/analyzer/supergraph.cc
index 9d78b1b44c8dd02381cc9260f09e46ff75e2c06e..ef6ab63292955a3d7518cd8d2aceb39e1cf8550b 100644
--- a/gcc/analyzer/supergraph.cc
+++ b/gcc/analyzer/supergraph.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tree.h"
diff --git a/gcc/analyzer/svalue.cc b/gcc/analyzer/svalue.cc
index 3be861e3f04f700d3a8c414218f8310fb394c5b2..1acb50b332e6d2d2c6b0cca6cf8489dc81cb9f5f 100644
--- a/gcc/analyzer/svalue.cc
+++ b/gcc/analyzer/svalue.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/symbol.cc b/gcc/analyzer/symbol.cc
index fdebe569af66bb550fd8deb85c852a99ae5b10c7..f2c29a8b5b771e25b69c586d501441926fc841bb 100644
--- a/gcc/analyzer/symbol.cc
+++ b/gcc/analyzer/symbol.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tree.h"
diff --git a/gcc/analyzer/trimmed-graph.cc b/gcc/analyzer/trimmed-graph.cc
index a03cae5862b1c64233e1610fde63c8ed7132113f..0456f5d4f6b6f8a362adf6b83820389d0574d800 100644
--- a/gcc/analyzer/trimmed-graph.cc
+++ b/gcc/analyzer/trimmed-graph.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/analyzer/varargs.cc b/gcc/analyzer/varargs.cc
index 2159c47ce85e64d29b8db467b887338afed26c36..83f034d34db57fa019c75ad398159952c9a3a688 100644
--- a/gcc/analyzer/varargs.cc
+++ b/gcc/analyzer/varargs.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/asan.cc b/gcc/asan.cc
index 408c25de4de349ee376dbe7835c0b5e3ab0cb98e..087595bd9c7087bbe3a377369902a15fec09cafe 100644
--- a/gcc/asan.cc
+++ b/gcc/asan.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/attribs.cc b/gcc/attribs.cc
index 1d6589835a1626fd64e860e2a73272951e326808..27332a1957e343b7feece8beb6846b2589811589 100644
--- a/gcc/attribs.cc
+++ b/gcc/attribs.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/auto-profile.cc b/gcc/auto-profile.cc
index e81f6d7eaaed97fc83bfdf7a79e325b58ee4d560..3f890e6d1e6ab5a1fc10e959c02e48660323c00c 100644
--- a/gcc/auto-profile.cc
+++ b/gcc/auto-profile.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_MAP
-#define INCLUDE_MEMORY
#define INCLUDE_SET
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-ada-spec.cc b/gcc/c-family/c-ada-spec.cc
index 9ee9fa1b6394397929e90a8ba42c7ef9b065e38a..8cd535166642576ef9a76d010aeaf7f0d88a5664 100644
--- a/gcc/c-family/c-ada-spec.cc
+++ b/gcc/c-family/c-ada-spec.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-attribs.cc b/gcc/c-family/c-attribs.cc
index a1c5d0c895beb1a0f2f800d5bb9aad523f7db9a9..5a71749d2f9c7a6f62814e9c70290601acd1dac0 100644
--- a/gcc/c-family/c-attribs.cc
+++ b/gcc/c-family/c-attribs.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
index 9254fb6c010a26e6ed9d6e2ec11c976f7eb31b67..7fcd978d95bc91b06d7a1b1d4ae14dcb04fe6666 100644
--- a/gcc/c-family/c-common.cc
+++ b/gcc/c-family/c-common.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#define GCC_C_COMMON_C
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-format.cc b/gcc/c-family/c-format.cc
index 119859b66d921e92a9edde81a8b97a7d89613e5e..5b3a856ac1f17d48016e56ecca6fa15ea443f9b1 100644
--- a/gcc/c-family/c-format.cc
+++ b/gcc/c-family/c-format.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-gimplify.cc b/gcc/c-family/c-gimplify.cc
index 7885e29503346dc45ec75beb21ba9a8b284c90d1..09ea1b79159070e2323544c2d8482589a0447b18 100644
--- a/gcc/c-family/c-gimplify.cc
+++ b/gcc/c-family/c-gimplify.cc
@@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-indentation.cc b/gcc/c-family/c-indentation.cc
index 3bd85e53c59d417eee2585079c6530c4cbd28f8b..6f0900032a2adbb181c0dba84aaf338aefc95ce6 100644
--- a/gcc/c-family/c-indentation.cc
+++ b/gcc/c-family/c-indentation.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc
index fb9d0875b8e4e3298c858dbab6e69fea459fdeb9..a0029294d400969cd0c0068a5ebdf7b04055f42a 100644
--- a/gcc/c-family/c-opts.cc
+++ b/gcc/c-family/c-opts.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-pch.cc b/gcc/c-family/c-pch.cc
index 50479ad43f4365b4d5ac64001a7a7d7c5b57e486..f104575d3d081ab4e199bf14b500d05fe66ffbee 100644
--- a/gcc/c-family/c-pch.cc
+++ b/gcc/c-family/c-pch.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-pragma.cc b/gcc/c-family/c-pragma.cc
index 979347729e867fde1fc0aded9fff557e8977b89b..52997eb5bdc9afb3b06442580e81523f965e4ed6 100644
--- a/gcc/c-family/c-pragma.cc
+++ b/gcc/c-family/c-pragma.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-pretty-print.cc b/gcc/c-family/c-pretty-print.cc
index 320f350e600edb690d6d4821b4d7644656271309..b772d8d8ae2bacfeafae53485906ed7bb9073862 100644
--- a/gcc/c-family/c-pretty-print.cc
+++ b/gcc/c-family/c-pretty-print.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-type-mismatch.cc b/gcc/c-family/c-type-mismatch.cc
index abc8cb83cc5475436a2cb4925c8fd2ae831cf7c0..89646854f3c75aabb3ec2447353c5da775778399 100644
--- a/gcc/c-family/c-type-mismatch.cc
+++ b/gcc/c-family/c-type-mismatch.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c-family/c-warn.cc b/gcc/c-family/c-warn.cc
index 8c94888bda0bd953c88acd695c6aebd942eddcce..05d6e37edaee2f1bc9c1857ae878074b0485e47f 100644
--- a/gcc/c-family/c-warn.cc
+++ b/gcc/c-family/c-warn.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/c-family/known-headers.cc b/gcc/c-family/known-headers.cc
index 871fd714eb5874ae879bbd9658850c18b47734e6..58a7259e8c4964cb37c9a5c96c271cc98ebb13f6 100644
--- a/gcc/c-family/known-headers.cc
+++ b/gcc/c-family/known-headers.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "c-family/c-common.h"
diff --git a/gcc/c-family/name-hint.h b/gcc/c-family/name-hint.h
index 6f58fc05bbe9de12cc13f6280bfb692b7a789b7a..3d95027228bf7f3d871d48544e388af8daaf5011 100644
--- a/gcc/c-family/name-hint.h
+++ b/gcc/c-family/name-hint.h
@@ -20,14 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_NAME_HINT_H
#define GCC_NAME_HINT_H
-/* This header uses std::unique_ptr, but <memory> can't be directly
- included due to issues with macros. Hence it must be included from
- system.h by defining INCLUDE_MEMORY in any source file using it. */
-
-#ifndef INCLUDE_MEMORY
-# error "You must define INCLUDE_MEMORY before including system.h to use name-hint.h"
-#endif
-
enum lookup_name_fuzzy_kind {
/* Names of types. */
FUZZY_LOOKUP_TYPENAME,
diff --git a/gcc/c/c-aux-info.cc b/gcc/c/c-aux-info.cc
index b422da0e7264173591ddf08bcc07ee2b118ee78a..f6b5980aa8301c206386d3293a943c89fb0219d2 100644
--- a/gcc/c/c-aux-info.cc
+++ b/gcc/c/c-aux-info.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c/c-convert.cc b/gcc/c/c-convert.cc
index 9180c6ae14ec0cb9e6e07f55c217a38b972fefc4..7c1064c6691b5dc9567665aa3ba4c9b1bba47184 100644
--- a/gcc/c/c-convert.cc
+++ b/gcc/c/c-convert.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
Every language front end must have a `convert' function
but what kind of conversions it does will depend on the language. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc
index a84b35ea23e79e4b7321f47f515264ce3dde9d02..b9c688eb2093dc21a680d6a1284c93e90dcf8359 100644
--- a/gcc/c/c-decl.cc
+++ b/gcc/c/c-decl.cc
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_STRING
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "target.h"
diff --git a/gcc/c/c-errors.cc b/gcc/c/c-errors.cc
index 653ad8c5235f6c59cad0744b4983c45cd2cf3e66..77f008eba1c289e26912695d4cf2d28032f11bbb 100644
--- a/gcc/c/c-errors.cc
+++ b/gcc/c/c-errors.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c/c-fold.cc b/gcc/c/c-fold.cc
index 0c4c5904e40268b3a0e6c554cb124297c8ca3889..e0c28bacd1e253cb22e6f848ddf711cd34ba2f2b 100644
--- a/gcc/c/c-fold.cc
+++ b/gcc/c/c-fold.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c/c-lang.cc b/gcc/c/c-lang.cc
index 7e5604fce6b6fae6efb26ddca7f974a46bb05297..870e23b4a33c2d75b597b27663aa8e1d84d99d53 100644
--- a/gcc/c/c-lang.cc
+++ b/gcc/c/c-lang.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c/c-objc-common.cc b/gcc/c/c-objc-common.cc
index dcabab0581cbe204b5370d5fda050fbd80de299c..7b471cc7071d4324a0ac0668cce255a7d6c170e7 100644
--- a/gcc/c/c-objc-common.cc
+++ b/gcc/c/c-objc-common.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc
index 44d344fcd32abebe6d0bfef329259ab870a26aca..48683572d7cd76f7aa4dc5b120d2d40dd0d96703 100644
--- a/gcc/c/c-parser.cc
+++ b/gcc/c/c-parser.cc
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
location rather than implicitly using input_location. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc
index 970fe68434b78df72a979c9f42d79c0616744108..24ecaa7cfda111d05d7f29e95dbcf3aa69564bc8 100644
--- a/gcc/c/c-typeck.cc
+++ b/gcc/c/c-typeck.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
including computing the types of the result, C-specific error checks,
and some optimization. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/c/gimple-parser.cc b/gcc/c/gimple-parser.cc
index 7e445ce2ff8fff4d0034f180b419706c4842ff3d..81f3921c876090fa2cf4f24861d9920e21e1cf9d 100644
--- a/gcc/c/gimple-parser.cc
+++ b/gcc/c/gimple-parser.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/calls.cc b/gcc/calls.cc
index f67067acad41f524a97ea9603553619a79bc1c65..648889662c7c34c0f576746bc5323aead666e48c 100644
--- a/gcc/calls.cc
+++ b/gcc/calls.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cfganal.cc b/gcc/cfganal.cc
index 863f88ff1eababb3d9dc660b82cdd1163a20fd23..35c59f3f5d26edb10a36327e40d97e3de7439133 100644
--- a/gcc/cfganal.cc
+++ b/gcc/cfganal.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
/* This file contains various simple utilities to analyze the CFG. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cfgexpand.cc b/gcc/cfgexpand.cc
index ed890f692e5889b1be7226f82725729879f546f8..2a984758bc7b7e4c1300044921a8acebfff4ac56 100644
--- a/gcc/cfgexpand.cc
+++ b/gcc/cfgexpand.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cfghooks.cc b/gcc/cfghooks.cc
index 55fdf983e1ce2d1844dd526f33f9429591e7e5ff..3ced91c96394a079dfd81f1cd83d7d4f839af646 100644
--- a/gcc/cfghooks.cc
+++ b/gcc/cfghooks.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cfgloop.cc b/gcc/cfgloop.cc
index 5be20f888a6cee2ffda5ed30ce73eb53e710064f..7f852942c3ed47a0d0694e330fdb6cc50bbeba90 100644
--- a/gcc/cfgloop.cc
+++ b/gcc/cfgloop.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cgraph.cc b/gcc/cgraph.cc
index d4c35341ab58f9c410dd666aa2b16d9ce61ff099..3332ea41ce2de37769e89e5baa46d1cff99ca72e 100644
--- a/gcc/cgraph.cc
+++ b/gcc/cgraph.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
optimization. It represents a multi-graph where nodes are functions
(symbols within symbol table) and edges are call sites. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cgraphclones.cc b/gcc/cgraphclones.cc
index 0467c9dcfd09589f4a4c27919fb3f0727767b787..33cab4583348daa9a80c659af2ea7f5b3f3d562a 100644
--- a/gcc/cgraphclones.cc
+++ b/gcc/cgraphclones.cc
@@ -64,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
only difference is that clones are not visible during the
Generate Summary stage. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cgraphunit.cc b/gcc/cgraphunit.cc
index 9dbee9b6fae02c1526964366f79bf566247126b1..d60ebc1c9884316a9c6194c1df437d710fa7449b 100644
--- a/gcc/cgraphunit.cc
+++ b/gcc/cgraphunit.cc
@@ -157,7 +157,6 @@ along with GCC; see the file COPYING3. If not see
and apply simple transformations
*/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/collect-utils.cc b/gcc/collect-utils.cc
index 5397fe2c7a097752ad6319ffe64ad1d2b2e21bb8..981a14a554b95e1b6d31bb187d9694d7410a8ee3 100644
--- a/gcc/collect-utils.cc
+++ b/gcc/collect-utils.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/collect2.cc b/gcc/collect2.cc
index c0b005fb40d6e4d6c13283b8452e66ab8dc007c6..1bb0e8e0cdb4e372c4fdd36b98cd233dc32731a6 100644
--- a/gcc/collect2.cc
+++ b/gcc/collect2.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
/* Build tables of static constructors and destructors and run ld. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/common/config/aarch64/aarch64-common.cc b/gcc/common/config/aarch64/aarch64-common.cc
index 2bfc597e333b6018970a9ee6e370a66b6d0960ef..64b65b7ff9e4bf7c72bf0c5db6fa976a51fe9f32 100644
--- a/gcc/common/config/aarch64/aarch64-common.cc
+++ b/gcc/common/config/aarch64/aarch64-common.cc
@@ -19,7 +19,6 @@
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/common/config/arm/arm-common.cc b/gcc/common/config/arm/arm-common.cc
index 68674575ccfc9dc871991791d71bef9e1a0b2f8d..dbcbe3f6e996161c32e2bb0287866bec2f6f34eb 100644
--- a/gcc/common/config/arm/arm-common.cc
+++ b/gcc/common/config/arm/arm-common.cc
@@ -18,7 +18,6 @@
<http://www.gnu.org/licenses/>. */
#define INCLUDE_LIST
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#define INCLUDE_ALGORITHM
#include "config.h"
diff --git a/gcc/common/config/avr/avr-common.cc b/gcc/common/config/avr/avr-common.cc
index 2ff8cbf2cbc8029d94727a3276c869d66008bd97..7473429fa360af598c05b35d3ccbc135856b2e6c 100644
--- a/gcc/common/config/avr/avr-common.cc
+++ b/gcc/common/config/avr/avr-common.cc
@@ -17,7 +17,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/aarch64/aarch64-cc-fusion.cc b/gcc/config/aarch64/aarch64-cc-fusion.cc
index 3cae4c4d8bd589a8eb184770abd28b838f569ac6..3af8c00d8462ad6b6e1b5ed085bb699722b051a2 100644
--- a/gcc/config/aarch64/aarch64-cc-fusion.cc
+++ b/gcc/config/aarch64/aarch64-cc-fusion.cc
@@ -64,7 +64,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
#define INCLUDE_ARRAY
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/aarch64/aarch64-early-ra.cc b/gcc/config/aarch64/aarch64-early-ra.cc
index 3d5355b040e4eb301776372921107bdc9de6fea7..309587267ae6065662fb79f18ff7b5bac14335b4 100644
--- a/gcc/config/aarch64/aarch64-early-ra.cc
+++ b/gcc/config/aarch64/aarch64-early-ra.cc
@@ -40,7 +40,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/config/aarch64/aarch64-sve-builtins.cc b/gcc/config/aarch64/aarch64-sve-builtins.cc
index ea2281127691aa96649a4befed6c236598f6c02b..0fec1cd439e729dca495aac4dea054a25ede20a7 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins.cc
+++ b/gcc/config/aarch64/aarch64-sve-builtins.cc
@@ -19,7 +19,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index 3b95ac50bbc8e2689b775460eb2c32475d555f25..91de13159cbc8270dc530565d48c9800530b18cc 100644
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -22,7 +22,6 @@
#define INCLUDE_STRING
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "config.h"
#include "system.h"
diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc
index 95d3285a5859bf5f3a4b318298b43bf8580e6f11..24dcd710d559c2dad9bd0da4230cd22cc1cdedda 100644
--- a/gcc/config/arc/arc.cc
+++ b/gcc/config/arc/arc.cc
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/arm/aarch-common.cc b/gcc/config/arm/aarch-common.cc
index 44012feb5be72a69105361c61e8982e0a180c932..aa405af8192bf30ad4679b342288c8ee5bf21e80 100644
--- a/gcc/config/arm/aarch-common.cc
+++ b/gcc/config/arm/aarch-common.cc
@@ -23,7 +23,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/arm/arm-mve-builtins.cc b/gcc/config/arm/arm-mve-builtins.cc
index ed3d6000641ed3104874face97b53ee9a09ba6e3..36bd66882b5a419488df139ad56b15050e203871 100644
--- a/gcc/config/arm/arm-mve-builtins.cc
+++ b/gcc/config/arm/arm-mve-builtins.cc
@@ -19,7 +19,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc
index fd7b4dc14beb16591f1e126b42ddf996f1dddb74..7292fddef809a58de44efa254c64dc1005c2c300 100644
--- a/gcc/config/arm/arm.cc
+++ b/gcc/config/arm/arm.cc
@@ -23,7 +23,6 @@
#define IN_TARGET_CODE 1
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/avr/avr-devices.cc b/gcc/config/avr/avr-devices.cc
index 9bb55dce1ea9f80d4bfaa0be28dd9753568d4578..7b9f6693e9d9da969c2a7ed09277e233e32464d3 100644
--- a/gcc/config/avr/avr-devices.cc
+++ b/gcc/config/avr/avr-devices.cc
@@ -20,7 +20,6 @@
#ifndef IN_GEN_AVR_MMCU_TEXI
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/avr/driver-avr.cc b/gcc/config/avr/driver-avr.cc
index 3eefcabe48ddb3170948787093f53b94ee8dffe4..4dcabc604e85d95bd0044893e4cc34a3c6236c35 100644
--- a/gcc/config/avr/driver-avr.cc
+++ b/gcc/config/avr/driver-avr.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/bpf/bpf.cc b/gcc/config/bpf/bpf.cc
index aa00d149c4d3234ac641f56161619f6c34b7284f..2051fa5b08b132f054e81bf89ba4e65b7ae21df0 100644
--- a/gcc/config/bpf/bpf.cc
+++ b/gcc/config/bpf/bpf.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/bpf/btfext-out.cc b/gcc/config/bpf/btfext-out.cc
index 760b2b59ff6a311b3d0169198f38a9ce4b4b0464..a976b6d2859bff30c50f0a3e81314b0a8f160a09 100644
--- a/gcc/config/bpf/btfext-out.cc
+++ b/gcc/config/bpf/btfext-out.cc
@@ -19,7 +19,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/bpf/core-builtins.cc b/gcc/config/bpf/core-builtins.cc
index deb368a1d3db072726e59f7c6e44eadd6ee02f0d..86e2e9d6e39fb0b06684d6289cae3efba9a37d99 100644
--- a/gcc/config/bpf/core-builtins.cc
+++ b/gcc/config/bpf/core-builtins.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/darwin.cc b/gcc/config/darwin.cc
index 4e495fce82bb58eaab4e14b03ce8c8ba0da6f51b..c25d2eeb2eb843a5a2bf0f1b57e56931f01ce5e1 100644
--- a/gcc/config/darwin.cc
+++ b/gcc/config/darwin.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/gcn/mkoffload.cc b/gcc/config/gcn/mkoffload.cc
index 17a3342113472dfc2d138b06f81d21c28792253e..c1d80aae59c7168e85f14348981f00adc8755dcc 100644
--- a/gcc/config/gcn/mkoffload.cc
+++ b/gcc/config/gcn/mkoffload.cc
@@ -24,7 +24,6 @@
This is not a complete assembler. We presume the source is well
formed from the compiler and can die horribly if it is not. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/i386/driver-i386.cc b/gcc/config/i386/driver-i386.cc
index a8b02765245f37ee8a88575d71c702db4529678e..008e5c67b820da8aea8e454ba6b0858630d65de5 100644
--- a/gcc/config/i386/driver-i386.cc
+++ b/gcc/config/i386/driver-i386.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/i386/i386-builtins.cc b/gcc/config/i386/i386-builtins.cc
index e12e758cd59aa14fc893937623f5048f86ca30f1..955e9e81d949c63eb46f57d0d531cc5132b11318 100644
--- a/gcc/config/i386/i386-builtins.cc
+++ b/gcc/config/i386/i386-builtins.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
index a6e6e738a524122265a2ecf3ece3aa334c187ee3..f8dcce465e9aa2839207692b8d52e18e896ae1f0 100644
--- a/gcc/config/i386/i386-expand.cc
+++ b/gcc/config/i386/i386-expand.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/i386/i386-features.cc b/gcc/config/i386/i386-features.cc
index 1fc29cae5d39a93ae7e3c066165f3a1dce100643..003b003e09c100beae9d45b4aea06955bb54142c 100644
--- a/gcc/config/i386/i386-features.cc
+++ b/gcc/config/i386/i386-features.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/i386/i386-options.cc b/gcc/config/i386/i386-options.cc
index 76a20179a36577f2e85616cc645a961ec8038037..f9e0392f23ac34e97889e0bba727882f0e6a7fdb 100644
--- a/gcc/config/i386/i386-options.cc
+++ b/gcc/config/i386/i386-options.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc
index c7e70c21999e9301b36f2ef1d52955fb1616074c..b4d11dff4ee57472dccf076d2383003e05d6dd68 100644
--- a/gcc/config/i386/i386.cc
+++ b/gcc/config/i386/i386.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#define IN_TARGET_CODE 1
diff --git a/gcc/config/loongarch/loongarch-builtins.cc b/gcc/config/loongarch/loongarch-builtins.cc
index 6820a68faccae88a38dae1238ad79f57c8e6ee76..261c5eb55466f5de5b8172e39ac3cf5fbebc0110 100644
--- a/gcc/config/loongarch/loongarch-builtins.cc
+++ b/gcc/config/loongarch/loongarch-builtins.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/loongarch/loongarch.cc b/gcc/config/loongarch/loongarch.cc
index 0f981dc24b739c56ec9c4e9517b11200f231627c..861558f07bcc110722e1174230534c0eb020f242 100644
--- a/gcc/config/loongarch/loongarch.cc
+++ b/gcc/config/loongarch/loongarch.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/mingw/winnt-cxx.cc b/gcc/config/mingw/winnt-cxx.cc
index 0be80955e59f1ff1da4973511618d79d56f9956c..4d8dad3ffd8f7a59491591fda393caac0cd85134 100644
--- a/gcc/config/mingw/winnt-cxx.cc
+++ b/gcc/config/mingw/winnt-cxx.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/mingw/winnt.cc b/gcc/config/mingw/winnt.cc
index 56904925d5d5be3f52bc31b66e56c7331f6b753e..df5e29428f40c46ae06a6b424b03791c6ae1bfd2 100644
--- a/gcc/config/mingw/winnt.cc
+++ b/gcc/config/mingw/winnt.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/mips/mips.cc b/gcc/config/mips/mips.cc
index 392755316eb34dc0526bddf6546795574ee050af..7c7307f62846046b15f1c7f2753a2fd0c29a7bbc 100644
--- a/gcc/config/mips/mips.cc
+++ b/gcc/config/mips/mips.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/msp430/driver-msp430.cc b/gcc/config/msp430/driver-msp430.cc
index 5ffa8ef35e65cb8a07a0c5ea8b8dff5694f34b3f..a11fd3d7dec8a97c169aa0f55010f0cdb8da0fee 100644
--- a/gcc/config/msp430/driver-msp430.cc
+++ b/gcc/config/msp430/driver-msp430.cc
@@ -20,7 +20,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/nvptx/mkoffload.cc b/gcc/config/nvptx/mkoffload.cc
index ddb1c66316481ef59d36dd7f33cf0bb8e75def3d..df16ee647364f4a0327730c926c94500d6c647ea 100644
--- a/gcc/config/nvptx/mkoffload.cc
+++ b/gcc/config/nvptx/mkoffload.cc
@@ -29,7 +29,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index 3072d3729a891d703c0e71a9708fe0d1ab13b893..924399f7a35ef268df65b30e9415be952fff5e3f 100644
--- a/gcc/config/nvptx/nvptx.cc
+++ b/gcc/config/nvptx/nvptx.cc
@@ -20,7 +20,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include <sstream>
#include "system.h"
diff --git a/gcc/config/riscv/riscv-avlprop.cc b/gcc/config/riscv/riscv-avlprop.cc
index 066377c5c14b1327578a98c55457c797382a0688..91d80aa00d62fd525c05655c57554e6e4fc78296 100644
--- a/gcc/config/riscv/riscv-avlprop.cc
+++ b/gcc/config/riscv/riscv-avlprop.cc
@@ -65,7 +65,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
diff --git a/gcc/config/riscv/riscv-target-attr.cc b/gcc/config/riscv/riscv-target-attr.cc
index 2979d63a0119bbff499ca61bd6fa279fdb882ca8..1e1d3a07a202d612ccefdfaa260497e6ed57f481 100644
--- a/gcc/config/riscv/riscv-target-attr.cc
+++ b/gcc/config/riscv/riscv-target-attr.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/config/riscv/riscv-vector-builtins.cc b/gcc/config/riscv/riscv-vector-builtins.cc
index 458d9b0886e3c21acebf9115f90da5f53ac1968e..41730c483ee1f067e7a3baf4dce3cd73f2791baf 100644
--- a/gcc/config/riscv/riscv-vector-builtins.cc
+++ b/gcc/config/riscv/riscv-vector-builtins.cc
@@ -20,7 +20,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/riscv/riscv-vector-costs.cc b/gcc/config/riscv/riscv-vector-costs.cc
index 67b9e3e8f413d67102187d40057ffc87ee3ab077..acd86d8f69a883d0eae149025b8faee11aa407e2 100644
--- a/gcc/config/riscv/riscv-vector-costs.cc
+++ b/gcc/config/riscv/riscv-vector-costs.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc
index 35c69a903579a66fd1aa404d1177adac389033c9..720d52964c1cef33af215f546a712070f2c2b7f8 100644
--- a/gcc/config/riscv/riscv-vsetvl.cc
+++ b/gcc/config/riscv/riscv-vsetvl.cc
@@ -63,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index a25fdf89e4458da669e567679369fd960515b74d..8f5b43e2c245f21fed0e439f090fc161a859a39e 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#define INCLUDE_ALGORITHM
diff --git a/gcc/config/rs6000/driver-rs6000.cc b/gcc/config/rs6000/driver-rs6000.cc
index a054827b2e039a9ff61420caad86a07ce875384b..a7b86a81b1b1ebcaa01b2846a749e55744ddc1e8 100644
--- a/gcc/config/rs6000/driver-rs6000.cc
+++ b/gcc/config/rs6000/driver-rs6000.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/rs6000/host-darwin.cc b/gcc/config/rs6000/host-darwin.cc
index fa9140d5389f14f1d395b2319eaddc749a32c2f9..e4fe079f3f562c09d7dabe161225bdd78ab69e8a 100644
--- a/gcc/config/rs6000/host-darwin.cc
+++ b/gcc/config/rs6000/host-darwin.cc
@@ -19,7 +19,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index 4dc80e598fa4141ba5b1811a4117bdc572b48e87..7e3a7c423dc4487632b9f530a9590da26c0d8eb4 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -22,7 +22,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index fa0e2ce8eea514fcca826f34bf7fa7b279eb0b23..3c25315877f0456e046798da4fc3b44537b96899 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -22,7 +22,6 @@
#define IN_TARGET_CODE 1
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/config/s390/s390-c.cc b/gcc/config/s390/s390-c.cc
index 0332fb4e904b99bd56d8fe91a5d1ba73eda242cc..4521a86f0480a047168c563cdb44bdbd750da2ab 100644
--- a/gcc/config/s390/s390-c.cc
+++ b/gcc/config/s390/s390-c.cc
@@ -29,7 +29,6 @@
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index 874b11274a430cc938c368b9727d38812e05bc44..25d43ae3e138ced8032773dc1522678c3d4ab1f8 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/sol2-cxx.cc b/gcc/config/sol2-cxx.cc
index 4f5fbc602249cc77ad963588247a663cddca4fb5..aa558be585ef82c3493ad441ea5738ff167a0490 100644
--- a/gcc/config/sol2-cxx.cc
+++ b/gcc/config/sol2-cxx.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/vms/vms-c.cc b/gcc/config/vms/vms-c.cc
index 0e9fa2f14d6f08c6b7dd0701ab01d48ccfcb1228..d0620b4d7a5f7e40d31a3780e89b7880d2e301f2 100644
--- a/gcc/config/vms/vms-c.cc
+++ b/gcc/config/vms/vms-c.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_TARGET_CODE 1
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/config/xtensa/xtensa-dynconfig.cc b/gcc/config/xtensa/xtensa-dynconfig.cc
index 6ddc02a6e9b04eede7959caed075df60d9171219..3bd2760e4d8912e3f8714008eaa66c2c546300ca 100644
--- a/gcc/config/xtensa/xtensa-dynconfig.cc
+++ b/gcc/config/xtensa/xtensa-dynconfig.cc
@@ -17,7 +17,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/coroutine-passes.cc b/gcc/coroutine-passes.cc
index ce74a0278b3ea30b1db0daf898574b4965f87d03..0f8e24f8d5513e9b90312dd29c7f272f2d15afcc 100644
--- a/gcc/coroutine-passes.cc
+++ b/gcc/coroutine-passes.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/coverage.cc b/gcc/coverage.cc
index ea71f4641bb0497dcd68c8dbf65d5c381dc30c03..1ed55fed54757f38a8acfbe7f5160b9842312e69 100644
--- a/gcc/coverage.cc
+++ b/gcc/coverage.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#define GCOV_LINKAGE
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc
index 3033be47c7d7f138cf8944da7652ef572182be83..2179332fb9dad4b81fa26c58104b10d06ecbf795 100644
--- a/gcc/cp/call.cc
+++ b/gcc/cp/call.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
/* High-level class interface. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc
index c11b91d75ce6c32e2e27fb07b750894372a15c97..7b0007e2defe4b194b12c99e2f4622083cd1ec35 100644
--- a/gcc/cp/class.cc
+++ b/gcc/cp/class.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
/* High-level class interface. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc
index c097860e6551b6cc8bff69d42ab4c621f85edd1f..55e44fcbafbab71f4a2b4bb9dc3aee5cfc368cc6 100644
--- a/gcc/cp/constexpr.cc
+++ b/gcc/cp/constexpr.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8a36b9c88c4d8d8a0a860791713acddd77c76840..cf0e5d37571c9c371c922c2ac7c4c7fe2f4f2a78 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc
index 113469b49f7ddda8d0e7e9d958e132e11656f163..c01e48803f275ad455a22c68c0aadd503c471db6 100644
--- a/gcc/cp/contracts.cc
+++ b/gcc/cp/contracts.cc
@@ -130,7 +130,6 @@ along with GCC; see the file COPYING3. If not see
More helpful for optimization might be to make the contracts a wrapper
function that could be inlined into the caller, the callee, or both. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc
index ba326bcd627b4ea6d45dc78fcc8a810e008ec569..7585229d94ab5818c575cc6c5a448af7825d2874 100644
--- a/gcc/cp/coroutines.cc
+++ b/gcc/cp/coroutines.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc
index 68f651e960517486cece9a0b1db615e0b2a5bd50..003e68f1ea725d2998bc965344bf68093b5c3817 100644
--- a/gcc/cp/cp-gimplify.cc
+++ b/gcc/cp/cp-gimplify.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/cp-lang.cc b/gcc/cp/cp-lang.cc
index faab86d2d13bb79a94873f0f508ef0ad015279ec..6a8d733e44551f1535b49c76313aa983645693f7 100644
--- a/gcc/cp/cp-lang.cc
+++ b/gcc/cp/cp-lang.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/cp-objcp-common.cc b/gcc/cp/cp-objcp-common.cc
index 921931b9846a3307540857a1adeb1af2512d5e4a..0126758b12d13e0cf9c908491eef73071b12a09d 100644
--- a/gcc/cp/cp-objcp-common.cc
+++ b/gcc/cp/cp-objcp-common.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/cp-ubsan.cc b/gcc/cp/cp-ubsan.cc
index 1055714fa3571d1334d46de26f4e46bdc031be20..c4ae0fe7eea34c3b42ac4c7ccc9f74d164ee9cdb 100644
--- a/gcc/cp/cp-ubsan.cc
+++ b/gcc/cp/cp-ubsan.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/cvt.cc b/gcc/cp/cvt.cc
index 75e7f06071637af2c5b164b0146842bced12adf2..002cdbcfa3c749df92ea9ba7d30a62ed0de1f5f1 100644
--- a/gcc/cp/cvt.cc
+++ b/gcc/cp/cvt.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
Every language front end must have a `convert' function
but what kind of conversions it does will depend on the language. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/cxx-pretty-print.cc b/gcc/cp/cxx-pretty-print.cc
index f42031237375b386277937800a4e955f39d90a4f..aea7cc7f09747c040614d6ecd5e83d01892de26b 100644
--- a/gcc/cp/cxx-pretty-print.cc
+++ b/gcc/cp/cxx-pretty-print.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 1ed1113f9e3989376eb34cc5922e85df4c27540a..80485f0a4288c2dfd252018cc652a650a7c35b38 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
line numbers. For example, the CONST_DECLs for enum values. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "target.h"
diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc
index 5f176168309c289f98878f65a78f45f1b9a3adda..bc3a9d0e922c95beb4606f42b766d32dab734a60 100644
--- a/gcc/cp/decl2.cc
+++ b/gcc/cp/decl2.cc
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
/* ??? not all decl nodes are given the most useful possible
line numbers. For example, the CONST_DECLs for enum values. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/dump.cc b/gcc/cp/dump.cc
index 8166bbfdee6e1b51cab0bcd82da8d81c161972ae..aafb62ffaa019e692b591407a70c772ea15f2e52 100644
--- a/gcc/cp/dump.cc
+++ b/gcc/cp/dump.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/error.cc b/gcc/cp/error.cc
index 7ef79b90868f4b7c7989471713a1a1641a67f24f..a19f011f94d984f62c0f46afafc4675068467a45 100644
--- a/gcc/cp/error.cc
+++ b/gcc/cp/error.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
/* For use with name_hint. */
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "cp-tree.h"
diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc
index e14a9fd3f9c91853dfa0f30edd53a9d5c2a61b28..7b4abd1f56e5a8ec68049286c1be61b58741d8d1 100644
--- a/gcc/cp/except.cc
+++ b/gcc/cp/except.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/expr.cc b/gcc/cp/expr.cc
index e5ec2352f57fbea7e8be023432848e8efe1035b2..de4991e616cdc4115a0acbaa1d62653fd2018b3f 100644
--- a/gcc/cp/expr.cc
+++ b/gcc/cp/expr.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/friend.cc b/gcc/cp/friend.cc
index 5261daa4994c83651f0816ccb9089602ba9ed973..2e70d0160c46f4e497dedb56e19c6b8f85038984 100644
--- a/gcc/cp/friend.cc
+++ b/gcc/cp/friend.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc
index a11701002c8d88bfc2c6777d7795a9a537995e8b..8526d7581a781a9e8aeb847c564c13e9c0c5052f 100644
--- a/gcc/cp/init.cc
+++ b/gcc/cp/init.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
/* High-level class interface. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/lambda.cc b/gcc/cp/lambda.cc
index b4b40e20b6a76eacdde67f4e1115e4f8031d1224..d8a15d97d5d5ff611ab7b3f4816aacdb91bc3d35 100644
--- a/gcc/cp/lambda.cc
+++ b/gcc/cp/lambda.cc
@@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/lex.cc b/gcc/cp/lex.cc
index bf63e1c0d9d836095396f6ce1a9d22dc41a58c15..0b4d42414fe0751d0cd5b048dda3a825bc49d054 100644
--- a/gcc/cp/lex.cc
+++ b/gcc/cp/lex.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
/* For use with name_hint. */
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "cp-tree.h"
diff --git a/gcc/cp/logic.cc b/gcc/cp/logic.cc
index f36abb2d4e469499e5dfbc50aecabc2aa55eebb8..fab2c357dc4eb0e5f94e84333441a44f0336572a 100644
--- a/gcc/cp/logic.cc
+++ b/gcc/cp/logic.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_LIST
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tm.h"
diff --git a/gcc/cp/mangle.cc b/gcc/cp/mangle.cc
index 4d46c0917a9b490c69ac026ec6567dc174e872f6..f10f791ac72d3907daed71f3e676d40762bedf5e 100644
--- a/gcc/cp/mangle.cc
+++ b/gcc/cp/mangle.cc
@@ -44,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
mangle_ctor_vtbl_for_type: `C-in-B' constructor virtual table data
mangle_thunk: thunk function or entry */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/mapper-client.cc b/gcc/cp/mapper-client.cc
index fbe52814cb9403f6d824b908f7843565c65bf95f..7baee70727f2369514b6f00f76aed04489acda78 100644
--- a/gcc/cp/mapper-client.cc
+++ b/gcc/cp/mapper-client.cc
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#define INCLUDE_MAP
-#define INCLUDE_MEMORY
#include "system.h"
#include "line-map.h"
diff --git a/gcc/cp/mapper-resolver.cc b/gcc/cp/mapper-resolver.cc
index 655d65cd9225b6f2fea4dd20895437be47fa3069..2ac71ca089a038f5b1130fb179e017a11f27e40f 100644
--- a/gcc/cp/mapper-resolver.cc
+++ b/gcc/cp/mapper-resolver.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#define INCLUDE_VECTOR
#define INCLUDE_ALGORITHM
#define INCLUDE_MAP
-#define INCLUDE_MEMORY
#include "system.h"
// We don't want or need to be aware of networking
diff --git a/gcc/cp/method.cc b/gcc/cp/method.cc
index adffa9ba0f333bf048eb3b80b92b1c40456eb43f..d704db2af061bb06abbda6f153e122b2fc631ea1 100644
--- a/gcc/cp/method.cc
+++ b/gcc/cp/method.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
/* Handle method declarations. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
index 617bf4c68b1876ef93e0cab2765e0a7922a4d90b..95efed1e3c179705abecd55d65263654bec174e4 100644
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -208,7 +208,6 @@ Classes used:
#define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc
index 769879976420db7ab74c2e4b7fb51f5c2bf28258..30dfbfe2e48d05dd1309944434d6a2d1b6d2df98 100644
--- a/gcc/cp/name-lookup.cc
+++ b/gcc/cp/name-lookup.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "cp-tree.h"
diff --git a/gcc/cp/optimize.cc b/gcc/cp/optimize.cc
index 6fd6513ef30d39e3ad89d98d53df73df3f56bf66..598e0aa13d32686f492d4831b0d39ec07d8bb1d0 100644
--- a/gcc/cp/optimize.cc
+++ b/gcc/cp/optimize.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index f449ebde744a7114892da5afa5aff5682d2ecb43..f60ed47dfd780eb232414761295df9a9305bc6f7 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "omp-selectors.h"
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 5b7918805a38e1c0c919c1e1ccc7be6ee6ec676e..564e368ff43bb8b9b6fdea1c5a7d9e878522f5b4 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM // for std::equal
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "cp-tree.h"
diff --git a/gcc/cp/ptree.cc b/gcc/cp/ptree.cc
index 95c7a69e27c8c6722e486e63721770fc713abb32..3f23483988aada745f84ebf0a49cd6b010b0fc5d 100644
--- a/gcc/cp/ptree.cc
+++ b/gcc/cp/ptree.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/rtti.cc b/gcc/cp/rtti.cc
index 412e1c83a75ac454c9aadef1b23aceaee43add1e..51775b8478e34988ec4b050f5dfa492b2907a6aa 100644
--- a/gcc/cp/rtti.cc
+++ b/gcc/cp/rtti.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/search.cc b/gcc/cp/search.cc
index def1cb934010869eac06482eaa8c24ddeb829228..d438e18b74b9c93444b9a02e79ddb96b0d19c693 100644
--- a/gcc/cp/search.cc
+++ b/gcc/cp/search.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
/* High-level class interface. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index d58dd022463193cace488bc60287247adda8505e..b6ff12f508ed12df6dac48964d954c5a6bd8ff70 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc
index 8e566cadcaf2b2d7757d3b39045046528098ff2b..4a8f0d4c0744522ad6b20cc50beb3de0062b97f5 100644
--- a/gcc/cp/tree.cc
+++ b/gcc/cp/tree.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc
index 4c15e26f692afe62500dbecf62cfbd3f8821b99a..102a8ed131cf4a136b4b62cd8e862337f4b0e37e 100644
--- a/gcc/cp/typeck.cc
+++ b/gcc/cp/typeck.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
including computing the types of the result, C and C++ specific error
checks, and some optimization. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/typeck2.cc b/gcc/cp/typeck2.cc
index f369cb8c24dd7421ee884dea48a78e2f7a867681..2694c1dfd51ccdafa4c822d5fd1eb430a732993e 100644
--- a/gcc/cp/typeck2.cc
+++ b/gcc/cp/typeck2.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
including computing the types of the result, C and C++ specific error
checks, and some optimization. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/cp/vtable-class-hierarchy.cc b/gcc/cp/vtable-class-hierarchy.cc
index c34f970c1d2405a2819643ba5e37f33c33f05b02..b9ff07ee2a79f79368ccf4f3ba2ccec42ea0fcfa 100644
--- a/gcc/cp/vtable-class-hierarchy.cc
+++ b/gcc/cp/vtable-class-hierarchy.cc
@@ -110,7 +110,6 @@ along with GCC; see the file COPYING3. If not see
gcc/vtable-verify.h, because they are used both here and in
gcc/vtable-verify.cc. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-attribs.cc b/gcc/d/d-attribs.cc
index 873140ee7c8bd377651508c13425dda2a16cbb4d..0f7ca10e0175ee1dedf2fa7477c6681636af7b2f 100644
--- a/gcc/d/d-attribs.cc
+++ b/gcc/d/d-attribs.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
/* Implementation of attribute handlers for user defined attributes and
internal built-in functions. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-builtins.cc b/gcc/d/d-builtins.cc
index 2ca02fe691cb3c9d40cad819532edbb64438a972..4546c0e9b5637b75b470ca3f551bfe4d6a1a17c6 100644
--- a/gcc/d/d-builtins.cc
+++ b/gcc/d/d-builtins.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc
index eeeb48defa281adae74717da66fc43bf7983c83b..2b3089b5f6dd02753ad9a73d03ecaca0b2ee46c1 100644
--- a/gcc/d/d-codegen.cc
+++ b/gcc/d/d-codegen.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-convert.cc b/gcc/d/d-convert.cc
index a07c7d8ba68e2ce524b30bab6e98439972dac8b5..5c79cdf6e1e4274d6dd7e1f4ddb48f7232aa9709 100644
--- a/gcc/d/d-convert.cc
+++ b/gcc/d/d-convert.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-diagnostic.cc b/gcc/d/d-diagnostic.cc
index f8c32ae918dea3169debde4dd25538402d29dd88..4cd3c0cbcb505890af3695e4d330ae46b70dfa92 100644
--- a/gcc/d/d-diagnostic.cc
+++ b/gcc/d/d-diagnostic.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-frontend.cc b/gcc/d/d-frontend.cc
index c3e5d8594adcfb69b141bdc6274f8030b8e108a1..0d7f4a3ec7fdd44c2381c1a6f8a61a7bd30b7888 100644
--- a/gcc/d/d-frontend.cc
+++ b/gcc/d/d-frontend.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc
index 2aa2a3f9767fcd4e601e8d76c9c37639805160ce..89ffa7e61ea1ece9d241a14ae0e132e5f7a76017 100644
--- a/gcc/d/d-lang.cc
+++ b/gcc/d/d-lang.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-longdouble.cc b/gcc/d/d-longdouble.cc
index ba10a356909682d9890a2b575d2de9948396c893..e4c8c5e6eb061b07d8335f3dff1138736cbce7aa 100644
--- a/gcc/d/d-longdouble.cc
+++ b/gcc/d/d-longdouble.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/d-target.cc b/gcc/d/d-target.cc
index 17cae450623fe34e5f6d8160de626d551007439d..dd46e5358918f28c08c7d5243acf170c4c23be28 100644
--- a/gcc/d/d-target.cc
+++ b/gcc/d/d-target.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/decl.cc b/gcc/d/decl.cc
index 0afaa71664d59a8f3ba2334f968d66fbf9efc2fd..0a87c85ae2e516d0100a3cb5b9d389ede789eac4 100644
--- a/gcc/d/decl.cc
+++ b/gcc/d/decl.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc
index a690f2ef2cf1346470ae13bbeeb5b044231e9ba7..d055e0b4025b468de2b07c3adfd7b3356fba1fde 100644
--- a/gcc/d/expr.cc
+++ b/gcc/d/expr.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/intrinsics.cc b/gcc/d/intrinsics.cc
index 34143b343e8b0179a546d530fd6590eddcb08608..c895c1a1a52949c022a607465ff45383434edd65 100644
--- a/gcc/d/intrinsics.cc
+++ b/gcc/d/intrinsics.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/modules.cc b/gcc/d/modules.cc
index f9b4a1e8e412f6286c0f7c58ea9e8b044ec20d4c..b111ee90cea00831f78dc3ad1d89615afaa56370 100644
--- a/gcc/d/modules.cc
+++ b/gcc/d/modules.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/toir.cc b/gcc/d/toir.cc
index 2bbba1035c7fba681c1dea367b577a65560c812e..a6848f2ffa2cb0e53b6ae6c17530418adb550b40 100644
--- a/gcc/d/toir.cc
+++ b/gcc/d/toir.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/typeinfo.cc b/gcc/d/typeinfo.cc
index 56aaf29d54ebdc820b12a8b7184a938abde3b47f..cadcbe8164e975bc91f0e84f3155d83bda18ea0f 100644
--- a/gcc/d/typeinfo.cc
+++ b/gcc/d/typeinfo.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/d/types.cc b/gcc/d/types.cc
index 2f78c917de230cd9907056f8c733bb00597dc756..9fa2f888cb22551cc8b82c2984e6965c2b2d2010 100644
--- a/gcc/d/types.cc
+++ b/gcc/d/types.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/data-streamer-in.cc b/gcc/data-streamer-in.cc
index 64dec35296cce83418fba33d21472bf00a203407..07dbc5e2bc367f7bf7a3a0bf999b24da23a52cb2 100644
--- a/gcc/data-streamer-in.cc
+++ b/gcc/data-streamer-in.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/data-streamer-out.cc b/gcc/data-streamer-out.cc
index 7a5542fa1c3e2c95b7ab294d817bd84596a7336a..91bb3738755faace618dba7d5c37c300150c6ff0 100644
--- a/gcc/data-streamer-out.cc
+++ b/gcc/data-streamer-out.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/data-streamer.cc b/gcc/data-streamer.cc
index 1caf72f9e9656a37bc7410702ea73b5c9f7c9990..896413e8d2b6857afaa32610d978fac433c078c0 100644
--- a/gcc/data-streamer.cc
+++ b/gcc/data-streamer.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic-format-json.cc b/gcc/diagnostic-format-json.cc
index ab51fce8ad7716eb88d01474e19959060086ca0b..b44cc29516fc9488ae7ef92beae53b7378b461c8 100644
--- a/gcc/diagnostic-format-json.cc
+++ b/gcc/diagnostic-format-json.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic-format-sarif.cc b/gcc/diagnostic-format-sarif.cc
index 0d56475dc6dab7e5e3ddaaa9ff8202389bcf9923..288340c28125ce212c669d644dea4bcf6f22cabc 100644
--- a/gcc/diagnostic-format-sarif.cc
+++ b/gcc/diagnostic-format-sarif.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_LIST
#define INCLUDE_MAP
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic-format-text.cc b/gcc/diagnostic-format-text.cc
index 217733784e8ddac0b108c6cbe52039d07bb6282c..d85c880834859430bfd3eece68551c8f13b9a54d 100644
--- a/gcc/diagnostic-format-text.cc
+++ b/gcc/diagnostic-format-text.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic-global-context.cc b/gcc/diagnostic-global-context.cc
index f8b2f7fb52ce8d0c334598b936fcbf2d329c4bba..83eeda0e6e69abe3d0d57fed6743e9e87330fa10 100644
--- a/gcc/diagnostic-global-context.cc
+++ b/gcc/diagnostic-global-context.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
/* This file implements the parts of the language independent aspect
of diagnostic messages that implicitly use global_dc. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic-macro-unwinding.cc b/gcc/diagnostic-macro-unwinding.cc
index 7a161d9d2b3a39d2118b7741e4c392473ccdb293..dc5a200fd52c3ef49eb30a8b2386b84cd5385ef8 100644
--- a/gcc/diagnostic-macro-unwinding.cc
+++ b/gcc/diagnostic-macro-unwinding.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic-path.cc b/gcc/diagnostic-path.cc
index 326f2a37f2d7bedd6c53beee59a0baffcc989c94..fe187bd5d4fc40094e143c99e587299cceaff416 100644
--- a/gcc/diagnostic-path.cc
+++ b/gcc/diagnostic-path.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
diff --git a/gcc/diagnostic-show-locus.cc b/gcc/diagnostic-show-locus.cc
index 4e695c557a771d4edd3089db2f548dbbdffff6ca..ef866acc253ec41c08db8f41d3842c5e89d979dc 100644
--- a/gcc/diagnostic-show-locus.cc
+++ b/gcc/diagnostic-show-locus.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic-spec.cc b/gcc/diagnostic-spec.cc
index 77e4b67dc8879969df7568e71bf543466fd13419..addaf089f035f55d78acb953bbb935a3c830d75b 100644
--- a/gcc/diagnostic-spec.cc
+++ b/gcc/diagnostic-spec.cc
@@ -19,7 +19,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc
index cc642b017d2291f31abb7f8d1efa39bb07afe302..dd696a7050e7e4da6870a412b2093021cf8296b0 100644
--- a/gcc/diagnostic.cc
+++ b/gcc/diagnostic.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
message module. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index f32d404c7a4d69281b3d50236b896ea4e6a6d911..d51724fbaf630229eb771af9f1b28637f74c37e8 100644
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -21,14 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_DIAGNOSTIC_H
#define GCC_DIAGNOSTIC_H
-/* This header uses std::unique_ptr, but <memory> can't be directly
- included due to issues with macros. Hence it must be included from
- system.h by defining INCLUDE_MEMORY in any source file using it. */
-
-#ifndef INCLUDE_MEMORY
-# error "You must define INCLUDE_MEMORY before including system.h to use diagnostic.h"
-#endif
-
#include "unique-argv.h"
#include "rich-location.h"
#include "pretty-print.h"
diff --git a/gcc/digraph.cc b/gcc/digraph.cc
index 7b2726d24fe381172c70dbf6e5f4eeed4cbb6ec7..b323764a93cdec4dba74984e7dad890b6d878d5b 100644
--- a/gcc/digraph.cc
+++ b/gcc/digraph.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/dumpfile.cc b/gcc/dumpfile.cc
index 5c19294b7c1961e49d1f1b1deda62b333242f5bf..06a607cf56071535a7ee6ae765d0082223f635e2 100644
--- a/gcc/dumpfile.cc
+++ b/gcc/dumpfile.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "options.h"
diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc
index a2621ec7c760abb733b669306ffca212ccfc60d7..0eb339077919441c03cfd30a813fcc673fb6b6ac 100644
--- a/gcc/dwarf2out.cc
+++ b/gcc/dwarf2out.cc
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
DW_CFA_... = DWARF2 CFA call frame instruction
DW_TAG_... = DWARF2 DIE tag */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/edit-context.cc b/gcc/edit-context.cc
index f51ebf0e51582aeb38c06589734993e20ca90370..37ac4989de0b00de40448d0d8ee3c266b16d8ff1 100644
--- a/gcc/edit-context.cc
+++ b/gcc/edit-context.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/except.cc b/gcc/except.cc
index 3cb2728497a76c3f6abf3514b955f1cbf49a4c22..759b023305eea0dbbb0434629b4d2da4ab0cb707 100644
--- a/gcc/except.cc
+++ b/gcc/except.cc
@@ -109,7 +109,6 @@ along with GCC; see the file COPYING3. If not see
output_call_frame_info (dwarf2out.cc) emits the required unwind data. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/expr.cc b/gcc/expr.cc
index aa6ee85e7195d0bb28f7248aee0636657869c34f..cf87167ec0cdb55c81723ac07cb308d32baf675c 100644
--- a/gcc/expr.cc
+++ b/gcc/expr.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/file-prefix-map.cc b/gcc/file-prefix-map.cc
index 6841559c5ed84357f25e18074acf18005298c45d..6b432e2a15afc647a693cca86e71e3cf201411dc 100644
--- a/gcc/file-prefix-map.cc
+++ b/gcc/file-prefix-map.cc
@@ -15,7 +15,6 @@
along with this program; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/final.cc b/gcc/final.cc
index 11141f2b56c89f561c50f2a556469f943238ca90..5d911586de5bca928baeee3a68e7fe1bd37290e4 100644
--- a/gcc/final.cc
+++ b/gcc/final.cc
@@ -44,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM /* reverse */
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/fortran/arith.cc b/gcc/fortran/arith.cc
index 3ecbbd30cfa20e8fb6beafec50c3fc5b0b94df02..a214b8bc1b3720839e45b574f46337b6ba2f0615 100644
--- a/gcc/fortran/arith.cc
+++ b/gcc/fortran/arith.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
would evaluate them. We use the GNU MP library and the MPFR
library to do arithmetic, and this file provides the interface. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/array.cc b/gcc/fortran/array.cc
index e650d85eb8c804eac57dfab46637ac3e0aa6421a..6dedaed3d4d1e56bcbf94f7d2af52af965ca7223 100644
--- a/gcc/fortran/array.cc
+++ b/gcc/fortran/array.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/bbt.cc b/gcc/fortran/bbt.cc
index 556baeec71dbab29c4561708d07133fb60eee956..f564ce104e8774bfd74fce234da1285209e7bf46 100644
--- a/gcc/fortran/bbt.cc
+++ b/gcc/fortran/bbt.cc
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
This implementation is based on Stefan Nilsson's article in the
July 1997 Doctor Dobb's Journal, "Treaps in Java". */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/check.cc b/gcc/fortran/check.cc
index 5c7fe34226289d9a9c2f5d679175374811e766a5..f10e665088df139909761475bc76f2b8ef5ee2f1 100644
--- a/gcc/fortran/check.cc
+++ b/gcc/fortran/check.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
has been sorted into the right order and has NULL arguments in the
correct places for missing optional arguments. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/class.cc b/gcc/fortran/class.cc
index fc709fec322ce801f086278dab7b935fa3c9b091..da09d210b4b520f8f88db120ec79d587e722a0a5 100644
--- a/gcc/fortran/class.cc
+++ b/gcc/fortran/class.cc
@@ -56,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
type-bound procedures. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/constructor.cc b/gcc/fortran/constructor.cc
index 8a4e11d86861e6c1c01ac9dd469ebf3dbe959a4a..942e26397321512c92864c22a7add9d1f17e7a60 100644
--- a/gcc/fortran/constructor.cc
+++ b/gcc/fortran/constructor.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/convert.cc b/gcc/fortran/convert.cc
index 187bda64063e3aad5f08d4d8fa60e8143afa42ad..674e3f425e85c1b3d56ba58bd2ced5f66762b1f9 100644
--- a/gcc/fortran/convert.cc
+++ b/gcc/fortran/convert.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
different data types for the translation of the gfortran internal
representation to GIMPLE. The only entry point is `convert'. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/cpp.cc b/gcc/fortran/cpp.cc
index 9d662ac5ab231d098946d03445c21570e3e1df3b..7c5f00cfd69074fb064e7f3df623aba36de70442 100644
--- a/gcc/fortran/cpp.cc
+++ b/gcc/fortran/cpp.cc
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/data.cc b/gcc/fortran/data.cc
index 3aa869be1aaade53337bba39d54f5bb8d5e62964..e7202455b3eca3b0f01d8278b23b972123bdb3c0 100644
--- a/gcc/fortran/data.cc
+++ b/gcc/fortran/data.cc
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
etc., to convert the initial value. Refer to trans-expr.cc and
trans-array.cc. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc
index 000c8dcf34eddda36dee09c2aa2744e9c3794b9d..fbcc782261fca6286ace46835b425903f1899e56 100644
--- a/gcc/fortran/decl.cc
+++ b/gcc/fortran/decl.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/dependency.cc b/gcc/fortran/dependency.cc
index 1fd65bbadca6105ea1af869f0f447b2035f4ce65..03d5061a6e32afd5836f40cd0021cc81024a5ada 100644
--- a/gcc/fortran/dependency.cc
+++ b/gcc/fortran/dependency.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
have different dependency checking functions for different types
if dependencies. Ideally these would probably be merged. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/dump-parse-tree.cc b/gcc/fortran/dump-parse-tree.cc
index f749104dc5de481352c10eebd949b92e9593fa8d..8e6adfe2829009704b64d273e37a139a9e55f3a8 100644
--- a/gcc/fortran/dump-parse-tree.cc
+++ b/gcc/fortran/dump-parse-tree.cc
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
TODO: Dump DATA. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/error.cc b/gcc/fortran/error.cc
index 1445ebcbecd89c2e5a0248a9547db6db0ea69d12..36961e591da83560cb1359abeeab36eb6edea3cd 100644
--- a/gcc/fortran/error.cc
+++ b/gcc/fortran/error.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
for possible use later. If a line does not match a legal
construction, then the saved error message is reported. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc
index fdbf991664043a271e5ce04320ac11ffb0ed2016..6b40e8e0aa5b62dfb7090cdcfcfec05111d8c31c 100644
--- a/gcc/fortran/expr.cc
+++ b/gcc/fortran/expr.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/f95-lang.cc b/gcc/fortran/f95-lang.cc
index 30043cf2f92f1439663a6dd36daa0ce3b3d1627a..aed19a9822ee40595e8cfeb6a099bbf5067b693f 100644
--- a/gcc/fortran/f95-lang.cc
+++ b/gcc/fortran/f95-lang.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
/* declare required prototypes: */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/frontend-passes.cc b/gcc/fortran/frontend-passes.cc
index 3a36b1ddf73587c17de2dc1d73a5ac69a2bfa5f6..405074ecb02be508d9609f4dd1ee7496eb04607d 100644
--- a/gcc/fortran/frontend-passes.cc
+++ b/gcc/fortran/frontend-passes.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc
index 176c7d4a8ed413ba90147fef81f330ffc98ece28..fd39c01653e037af560e4d94d1a73420c7001d68 100644
--- a/gcc/fortran/interface.cc
+++ b/gcc/fortran/interface.cc
@@ -63,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
formal argument list points to symbols within the same namespace as
the program unit name. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/intrinsic.cc b/gcc/fortran/intrinsic.cc
index 3fb1c63bbd42be7d8ab1c43c1c31e12d40b6660b..a2e241280c38e8d1dfea11b74f34ad4592863312 100644
--- a/gcc/fortran/intrinsic.cc
+++ b/gcc/fortran/intrinsic.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/io.cc b/gcc/fortran/io.cc
index 5678a65116dd2c015630dcb9c0ab9865a5845f9c..bf75cd58d7a58710a121de2cd83aafa7a07e1e87 100644
--- a/gcc/fortran/io.cc
+++ b/gcc/fortran/io.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/iresolve.cc b/gcc/fortran/iresolve.cc
index 6adc63043ebb7bb0132ffcf52fe6662104961ae2..580f8c8407d6720db377fbe2a4ad52c1355bbb5a 100644
--- a/gcc/fortran/iresolve.cc
+++ b/gcc/fortran/iresolve.cc
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
code node is passed. The result type and library subroutine name
are generally set according to the function arguments. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/match.cc b/gcc/fortran/match.cc
index 75dd2693fe6986adcf959e2ca10a5169dc840c77..c6fe2f91c2d1f1eadfff921f6408a994cf4e4d23 100644
--- a/gcc/fortran/match.cc
+++ b/gcc/fortran/match.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/matchexp.cc b/gcc/fortran/matchexp.cc
index f7185d5aa4ff0668c1275095b763abdcfd13ede9..9e773cf8feeb3a8cff313bd7ca09905d76bd8389 100644
--- a/gcc/fortran/matchexp.cc
+++ b/gcc/fortran/matchexp.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/misc.cc b/gcc/fortran/misc.cc
index 0ef6679fee9cc3739152bc2b02c1269b0be4ce7a..991829516efea81706995a58fedec1745425f980 100644
--- a/gcc/fortran/misc.cc
+++ b/gcc/fortran/misc.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/module.cc b/gcc/fortran/module.cc
index d184dbc661fc36730036511f61eb62d4d428bb8e..a6b4393dca7d731a47cb31c7c2070044e1c9d870 100644
--- a/gcc/fortran/module.cc
+++ b/gcc/fortran/module.cc
@@ -64,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
which are zero based. Symbols are written to the module in no
particular order. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index 8dc486a56a2c2b89163c78299651adf474672637..6ef571eea8e56077cc1873c9239d932101bffd26 100644
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#define INCLUDE_STRING
#include "config.h"
diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc
index c531b89864715aa14df1e98f7db8c49baa20a261..0004df9278b866824cc5a09333e1201340e9b2e5 100644
--- a/gcc/fortran/options.cc
+++ b/gcc/fortran/options.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/parse.cc b/gcc/fortran/parse.cc
index 9d7d43aa5daca1c58f01f7a8f3b078c8809c97ae..d2fe22d0edc6bfcb36e6b2f974d9bea69b2a06ec 100644
--- a/gcc/fortran/parse.cc
+++ b/gcc/fortran/parse.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/primary.cc b/gcc/fortran/primary.cc
index 0f258edd12940e6824f1cc76684dff21a3bd3e67..1db27929eebd60fb92973e323174f12b368d9625 100644
--- a/gcc/fortran/primary.cc
+++ b/gcc/fortran/primary.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
index e8f780d1ef96413c0cd197ab36ddb1fd0fea866c..b817192cd9309cf55c02a0357131ea9b451a4f77 100644
--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/scanner.cc b/gcc/fortran/scanner.cc
index 30b6cbfab398f6be7c60637da099270e17d67e73..9585fc2a98cc65c380650dc8ccccd63ac70e3ddf 100644
--- a/gcc/fortran/scanner.cc
+++ b/gcc/fortran/scanner.cc
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
From the scanner's viewpoint, the higher level subroutines ask for
new characters and do a lot of jumping backwards. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc
index 573ec6bd3a8bd3a3e7caabb65bfbb95b13434aa1..7d8122cb74e143788188631725dec93df80b2ec1 100644
--- a/gcc/fortran/simplify.cc
+++ b/gcc/fortran/simplify.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/st.cc b/gcc/fortran/st.cc
index 2ce61450c0d17fb8615faaa702942d62bc0f7aa6..48e4258d10d2b902313d839cc95ac1eedd16b568 100644
--- a/gcc/fortran/st.cc
+++ b/gcc/fortran/st.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
GENERIC tree structures and from there to executable code for a
target. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/symbol.cc b/gcc/fortran/symbol.cc
index 5e83fb400e3f11d509d5812f382f20ba005e0a6f..e803cdd93c9a7f1cbf0d6bcbf4d9e47b8ddb8ba2 100644
--- a/gcc/fortran/symbol.cc
+++ b/gcc/fortran/symbol.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/target-memory.cc b/gcc/fortran/target-memory.cc
index 235ecc49e399a573db2d2d9415483f0cb2d4368d..c71c403209001713a67101210a057d308bdecf3a 100644
--- a/gcc/fortran/target-memory.cc
+++ b/gcc/fortran/target-memory.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-array.cc b/gcc/fortran/trans-array.cc
index e888b737bec345946ec6e675d072a0d9ff282ef6..32dcd4cb0c7d96eb4f5158b2c2805ec965f20d10 100644
--- a/gcc/fortran/trans-array.cc
+++ b/gcc/fortran/trans-array.cc
@@ -75,7 +75,6 @@ along with GCC; see the file COPYING3. If not see
After the loop code has been added into its parent scope gfc_cleanup_loop
is called to free all the SS allocated by the scalarizer. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-common.cc b/gcc/fortran/trans-common.cc
index ac69a47df919cacc342857d46056e93631a99f76..77428de67c157a3f5eea994e3f933a47e51ff56c 100644
--- a/gcc/fortran/trans-common.cc
+++ b/gcc/fortran/trans-common.cc
@@ -94,7 +94,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_MAP
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tm.h"
diff --git a/gcc/fortran/trans-const.cc b/gcc/fortran/trans-const.cc
index 9c2d683b1a16a3b6797c53d9288046e884ab5af3..204f4df301c06c4cfc656375ad183c797cc7eb5f 100644
--- a/gcc/fortran/trans-const.cc
+++ b/gcc/fortran/trans-const.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
/* trans-const.cc -- convert constant values */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-decl.cc b/gcc/fortran/trans-decl.cc
index a2c15959551e1f498d171946c1cc0d0fa6dcf374..a62fe3f0441ca1996ba4b0d21934bd52398a020a 100644
--- a/gcc/fortran/trans-decl.cc
+++ b/gcc/fortran/trans-decl.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
/* trans-decl.cc -- Handling of backend function and variable decls, etc */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc
index a3c1dc0b7af41397a874eebcb86ff392f175ad00..7013dd3a4119dec3f13952eb2a5c7599e39cc857 100644
--- a/gcc/fortran/trans-expr.cc
+++ b/gcc/fortran/trans-expr.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
/* trans-expr.cc-- generate GENERIC trees for gfc_expr. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-intrinsic.cc b/gcc/fortran/trans-intrinsic.cc
index 14a81fb5fa0dbfbda686f37fdf0601a2b11ba5b1..1b36ac6e5ac114f2b846ec112c08511db143b0b8 100644
--- a/gcc/fortran/trans-intrinsic.cc
+++ b/gcc/fortran/trans-intrinsic.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
/* trans-intrinsic.cc-- generate GENERIC trees for calls to intrinsics. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-io.cc b/gcc/fortran/trans-io.cc
index 41396a3fe4c69da0f21c58a70b58e6b8804c81a2..961a711c530193cea63bc2841d494a10de874fb9 100644
--- a/gcc/fortran/trans-io.cc
+++ b/gcc/fortran/trans-io.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc
index 4f4b408d61c5a3b08c90b3627bf26b12fb8cea1a..a23788a9c57b62fc438a1df873c180c4b7942d87 100644
--- a/gcc/fortran/trans-openmp.cc
+++ b/gcc/fortran/trans-openmp.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-stmt.cc b/gcc/fortran/trans-stmt.cc
index a409c25b8991bd5b3d483cb4d79d2995e1f39e6a..b8fba1d91fef8f5b3ced69f693928b91b0087984 100644
--- a/gcc/fortran/trans-stmt.cc
+++ b/gcc/fortran/trans-stmt.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans-types.cc b/gcc/fortran/trans-types.cc
index 2170869206e434a4dc0cb8e4afeee471c92ff2c8..e596a362c023aa1dce57983f996e5d1baf26514d 100644
--- a/gcc/fortran/trans-types.cc
+++ b/gcc/fortran/trans-types.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
/* trans-types.cc -- gfortran backend types */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fortran/trans.cc b/gcc/fortran/trans.cc
index 1a0ba63705867c6e783888fb072cf166900b8854..604cb53f417dfe3cdc97a18dd0455bf0b0c94eb2 100644
--- a/gcc/fortran/trans.cc
+++ b/gcc/fortran/trans.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/fwprop.cc b/gcc/fwprop.cc
index 5ddefdf6d2f59f664f22bc24f81f6d8598ac7e7c..9b8fba592163754f4fd33f56a9ae149e21757db1 100644
--- a/gcc/fwprop.cc
+++ b/gcc/fwprop.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index 683fc3ece3ad3ab6a4396211a7ae6f5dbf6c73b6..8eb33d6a8f54f18f199c48eab44db7a4cfc3533a 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#define IN_GCC
#endif
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gcc-rich-location.cc b/gcc/gcc-rich-location.cc
index 0fa9db8e66db1b7986d7fb0cab47f4d188914b47..568744b39a31fe286f644f9dd762fe97f1f72ab1 100644
--- a/gcc/gcc-rich-location.cc
+++ b/gcc/gcc-rich-location.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gcc-urlifier.cc b/gcc/gcc-urlifier.cc
index 0db5429395ebb2ed203c8d3bd4aa3b475cfcbb11..d2c78f82e31f499e1c225b6cac9405a95f53e20b 100644
--- a/gcc/gcc-urlifier.cc
+++ b/gcc/gcc-urlifier.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index 5fe5fd86a98e7c1c4173d5211590998cbc3764f5..92c92996401005a9ad17fecd1af4385833785cec 100644
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -27,7 +27,6 @@ CC recognizes how to compile each input file by suffixes in the file names.
Once it knows which kind of compilation to perform, the procedure for
compilation is specified by a string called a "spec". */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/gcov-dump.cc b/gcc/gcov-dump.cc
index 8730f588a47f317fd9f639b4f13840d71e3533e1..5ffd3f93660055a0ceceaa059716ff10601377a1 100644
--- a/gcc/gcov-dump.cc
+++ b/gcc/gcov-dump.cc
@@ -17,7 +17,6 @@ along with Gcov; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gcov-tool.cc b/gcc/gcov-tool.cc
index 0f3c5c75110280902444361ec4022b7a99e3f6a6..100f7357bcf8eb275770db326470aac13c0e6376 100644
--- a/gcc/gcov-tool.cc
+++ b/gcc/gcov-tool.cc
@@ -23,7 +23,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gcov.cc b/gcc/gcov.cc
index 514ff1c93b997cfcc1ebecffa704df08a0a04143..01b94d10b1c95a6ed83f04f76e16a68ab6b080b4 100644
--- a/gcc/gcov.cc
+++ b/gcc/gcov.cc
@@ -32,7 +32,6 @@ along with Gcov; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#define INCLUDE_STRING
#define INCLUDE_MAP
diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc
index 29f91e30826f2e1332eaa3ba7083e49cbd216dac..aec7816d20bafaf12b104f69fa048f44d1a5fc80 100644
--- a/gcc/gengtype.cc
+++ b/gcc/gengtype.cc
@@ -1724,7 +1724,6 @@ open_base_files (void)
outf_p gtype_desc_c;
gtype_desc_c = create_file ("GCC", "gtype-desc.cc");
- oprintf (gtype_desc_c, "#define INCLUDE_MEMORY\n");
for (ifp = ifiles; *ifp; ifp++)
oprintf (gtype_desc_c, "#include \"%s\"\n", *ifp);
for (int j = 0; j < (int) num_build_headers; j++)
diff --git a/gcc/genmatch.cc b/gcc/genmatch.cc
index 9a0817b8ee31f4ff1ba87aaa962a7d258c50ec70..19884e4d33dd06977cf63c544329df1c1af648e2 100644
--- a/gcc/genmatch.cc
+++ b/gcc/genmatch.cc
@@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "bconfig.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc
index c19dac0dbfde9dab458f40fa49ebc7fd49ac0f5a..5eedad54ced01ca3167216b223893473f58f78f4 100644
--- a/gcc/gimple-fold.cc
+++ b/gcc/gimple-fold.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-harden-conditionals.cc b/gcc/gimple-harden-conditionals.cc
index 7bfa75a5bd6d7223dd3149dff2d2f3808925a3ac..4ab086e1ab0b71656da1febc5ae783120f9f8c7e 100644
--- a/gcc/gimple-harden-conditionals.cc
+++ b/gcc/gimple-harden-conditionals.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-harden-control-flow.cc b/gcc/gimple-harden-control-flow.cc
index f5654c3bb9f643e61a2cd97f5b79f62133aedeef..70383e6e26582ad84d6e6b6aa98bbc9dfac3753f 100644
--- a/gcc/gimple-harden-control-flow.cc
+++ b/gcc/gimple-harden-control-flow.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM /* find */
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/gimple-if-to-switch.cc b/gcc/gimple-if-to-switch.cc
index 8f71f43864f0156e24df1021fe26cb885ef5b118..4151d1bb520e1c9f6b3fa079c1e1eb81abac9e98 100644
--- a/gcc/gimple-if-to-switch.cc
+++ b/gcc/gimple-if-to-switch.cc
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
d) We move all GIMPLE statements in the removed blocks into the
first one. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-loop-interchange.cc b/gcc/gimple-loop-interchange.cc
index a4ea818bbdfdf198a3ccc6c8eb1063420461841c..b4228044a3873f5dad872e1a0449372277acdb97 100644
--- a/gcc/gimple-loop-interchange.cc
+++ b/gcc/gimple-loop-interchange.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/gimple-loop-jam.cc b/gcc/gimple-loop-jam.cc
index 1367dd9c50bc80246ae90e10bf9c7717cf1e4e4f..4cc5bfa9955c230076b4f2124a1556ca18d72d93 100644
--- a/gcc/gimple-loop-jam.cc
+++ b/gcc/gimple-loop-jam.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tree-pass.h"
diff --git a/gcc/gimple-loop-versioning.cc b/gcc/gimple-loop-versioning.cc
index 2968c929d04aeb2f77063f1ac6340e7f109a0c90..67d0617a0e7325fab1a64a096308c159f5c79900 100644
--- a/gcc/gimple-loop-versioning.cc
+++ b/gcc/gimple-loop-versioning.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/gimple-lower-bitint.cc b/gcc/gimple-lower-bitint.cc
index ea56c4c5bf8baca1f21b98fbf438dfcac8beb61b..1b7c2f46230c58a8b4356b6e1cd49f2aa9975949 100644
--- a/gcc/gimple-lower-bitint.cc
+++ b/gcc/gimple-lower-bitint.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-predicate-analysis.cc b/gcc/gimple-predicate-analysis.cc
index 6b9043cc2dd00f9f56fa4ab0bd2e0de8616cfeda..01688b8581bc93bae8dd4e4292d948519df1dae8 100644
--- a/gcc/gimple-predicate-analysis.cc
+++ b/gcc/gimple-predicate-analysis.cc
@@ -20,7 +20,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/gimple-pretty-print.cc b/gcc/gimple-pretty-print.cc
index dcd03f37bb9276784a3747ac14761b2330bc1f41..fa6af6761b0adfb0d707d606129191d6b2a57297 100644
--- a/gcc/gimple-pretty-print.cc
+++ b/gcc/gimple-pretty-print.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-cache.cc b/gcc/gimple-range-cache.cc
index 1788a935429b5be7ee047561cdd43b7e9273bccc..8b7189eb5b83f3304da6da7f5a905a5ee7bdc188 100644
--- a/gcc/gimple-range-cache.cc
+++ b/gcc/gimple-range-cache.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-edge.cc b/gcc/gimple-range-edge.cc
index d2387289ad2d793acc6f0e4a04b1e568cd37cddb..1916aa708169fa3ebcbe9b43ca7173e8cf24f8e9 100644
--- a/gcc/gimple-range-edge.cc
+++ b/gcc/gimple-range-edge.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc
index a4063b718f6fa4a262007869470457785a3b274c..d7c4f3c26e0efdafa69dc4e8a3671db87c1e6e2e 100644
--- a/gcc/gimple-range-fold.cc
+++ b/gcc/gimple-range-fold.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-gori.cc b/gcc/gimple-range-gori.cc
index f5103fd0e98ffd6faa776c9c8ff76c3cca8c3bab..f2e2b5049aaae08220f775237ce7b35ad7f90054 100644
--- a/gcc/gimple-range-gori.cc
+++ b/gcc/gimple-range-gori.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-infer.cc b/gcc/gimple-range-infer.cc
index dd748248eaa5ae15c138ba69182541c23682573f..98642e2438fc6aeab09088ca5f70f5fe45793f69 100644
--- a/gcc/gimple-range-infer.cc
+++ b/gcc/gimple-range-infer.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc
index 030030cb1562ec75954b967f2645aba221b3ee92..68a7df8d01bca9c5fce25ec4c5d56c24af002bba 100644
--- a/gcc/gimple-range-op.cc
+++ b/gcc/gimple-range-op.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc
index 85c3d15c9039ed379b81ca6bb2c31b6cb655f18f..f64a7a5e8caeecb9709fb71893369f4142188075 100644
--- a/gcc/gimple-range-path.cc
+++ b/gcc/gimple-range-path.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-phi.cc b/gcc/gimple-range-phi.cc
index aeb6c400ae93b56c18d3eaf079e939ca24335a23..c679e4ed7f29ae42817226a32ccb749e0ec30936 100644
--- a/gcc/gimple-range-phi.cc
+++ b/gcc/gimple-range-phi.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range-trace.cc b/gcc/gimple-range-trace.cc
index 5302646ed49f9edf7b671f10b3a1b22f76e8d8cc..e1679a1bfc9fa91a4171b26afa1b8f2b164c449d 100644
--- a/gcc/gimple-range-trace.cc
+++ b/gcc/gimple-range-trace.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc
index 00e1a3c4ad536b89f2dffdf1581e460b52419e49..6111dd28c8643cbe8c53ae763d054477c2004eaa 100644
--- a/gcc/gimple-range.cc
+++ b/gcc/gimple-range.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-ssa-backprop.cc b/gcc/gimple-ssa-backprop.cc
index ea3ae0bf04387f85cd5a4fff3de505d67fe0afec..e3374b18138625fb49eadb5323db8823c50b08e0 100644
--- a/gcc/gimple-ssa-backprop.cc
+++ b/gcc/gimple-ssa-backprop.cc
@@ -84,7 +84,6 @@ along with GCC; see the file COPYING3. If not see
Note that this pass does not deal with direct redundancies,
such as cos(-x)->cos(x). match.pd handles those cases instead. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-ssa-sprintf.cc b/gcc/gimple-ssa-sprintf.cc
index 2e06b9112f0b368cfd7d2084b17916710d50eca6..0900710647c43c476bfaca6aff9850eff643cd0c 100644
--- a/gcc/gimple-ssa-sprintf.cc
+++ b/gcc/gimple-ssa-sprintf.cc
@@ -45,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
character arrays that a character pointer may point to as a bound
on the longest string. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-ssa-store-merging.cc b/gcc/gimple-ssa-store-merging.cc
index 0929defdf6cbd8ecf0c29a2567abcd77b01cda54..51104f7f510a10378afca837f210cd4a5abf0943 100644
--- a/gcc/gimple-ssa-store-merging.cc
+++ b/gcc/gimple-ssa-store-merging.cc
@@ -138,7 +138,6 @@
[p] (32-bit) := 0x12345678; // (val & 0xffffffff0000) >> 16;
[p + 4B] (16-bit) := 0xabcd; // val & 0x00000000ffff; */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-ssa-strength-reduction.cc b/gcc/gimple-ssa-strength-reduction.cc
index fab9c24db03a2cbe5f603e225033ee83ba4335e2..f3e1cc6303a15b26cafad9a3b6d27cf5dbaef02a 100644
--- a/gcc/gimple-ssa-strength-reduction.cc
+++ b/gcc/gimple-ssa-strength-reduction.cc
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
If desired, it could be extended to floating-point operations under
control of something like -funsafe-math-optimizations. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access.cc
index 902bb70de031636552eac25243ae1e09e58b73aa..16f76ffaf69392d62825dffe0c44fbc0fba7001c 100644
--- a/gcc/gimple-ssa-warn-access.cc
+++ b/gcc/gimple-ssa-warn-access.cc
@@ -20,7 +20,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/gimple-ssa-warn-alloca.cc b/gcc/gimple-ssa-warn-alloca.cc
index c85f5c77312131c0d11d8a528865cf946b3e7de3..f12e55bc7957378f56c84f770e0db0942b8b6047 100644
--- a/gcc/gimple-ssa-warn-alloca.cc
+++ b/gcc/gimple-ssa-warn-alloca.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-ssa-warn-restrict.cc b/gcc/gimple-ssa-warn-restrict.cc
index 4bccca52f0d1fbe1743cc7c6ec68c0952d16220a..d71f1331c8549ea689e2602d7dc5497d529cbe00 100644
--- a/gcc/gimple-ssa-warn-restrict.cc
+++ b/gcc/gimple-ssa-warn-restrict.cc
@@ -19,7 +19,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-streamer-in.cc b/gcc/gimple-streamer-in.cc
index d7843c5ecaae6b85eb48bfe97c85d7a682b6e8d6..61f6d069875fcd87f6ccaef24a8b8eae21ec010b 100644
--- a/gcc/gimple-streamer-in.cc
+++ b/gcc/gimple-streamer-in.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple-streamer-out.cc b/gcc/gimple-streamer-out.cc
index f30f06ee720c0c276ecfdc4e9d89d739bce33a9e..e63d8b4df0cc7712c09dc90fc622b41c884c5149 100644
--- a/gcc/gimple-streamer-out.cc
+++ b/gcc/gimple-streamer-out.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimple.cc b/gcc/gimple.cc
index 6e8ac05c8776401177312bbbe90d5d8ec89359d0..b31c8dc9b716321aa67c70aa61ab65c157ed1d95 100644
--- a/gcc/gimple.cc
+++ b/gcc/gimple.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index 7b2466a2e34f0bdba6b0da6918ee791821e7a1c2..fb0ca23bfb6c97f1e86891ec85ee19954efa41dd 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/go/go-backend.cc b/gcc/go/go-backend.cc
index 69dbef664151a0a5a470239155181fafbf4fb8f2..25e5d35e6f1e9d753ba700cb73c931fe5b0479cf 100644
--- a/gcc/go/go-backend.cc
+++ b/gcc/go/go-backend.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/go/go-lang.cc b/gcc/go/go-lang.cc
index 42a21594f35851bafd316b1a3ad3e55ab00dea01..9316425b2aaf14467633edfae0a775c56094973b 100644
--- a/gcc/go/go-lang.cc
+++ b/gcc/go/go-lang.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/graph.cc b/gcc/graph.cc
index 677dc50b61bc5583aed955a776b3c08be74b6d7c..07da0798f51d0231716b012554eaf8140a623fb1 100644
--- a/gcc/graph.cc
+++ b/gcc/graph.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/graphite-dependences.cc b/gcc/graphite-dependences.cc
index 41e1114173bfd259ca3c4cec267d3d5ccbf96b7a..a35f71254f8428e135d27726b648702dc6ddb7b2 100644
--- a/gcc/graphite-dependences.cc
+++ b/gcc/graphite-dependences.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_ISL
-#define INCLUDE_MEMORY
#include "config.h"
diff --git a/gcc/graphite-isl-ast-to-gimple.cc b/gcc/graphite-isl-ast-to-gimple.cc
index f8074270e83de25885323a5ff059281b66af31e8..1013c0acea33ced15dc54db3d9adfb2d5958dec6 100644
--- a/gcc/graphite-isl-ast-to-gimple.cc
+++ b/gcc/graphite-isl-ast-to-gimple.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_ISL
-#define INCLUDE_MEMORY
#include "config.h"
diff --git a/gcc/graphite-optimize-isl.cc b/gcc/graphite-optimize-isl.cc
index ff3dd6b7ab634f2c5b0fcf04f13f8317514732f7..2222dd685425ece0dfedb0dcc368e2cc143bb779 100644
--- a/gcc/graphite-optimize-isl.cc
+++ b/gcc/graphite-optimize-isl.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_ISL
-#define INCLUDE_MEMORY
#include "config.h"
diff --git a/gcc/graphite-poly.cc b/gcc/graphite-poly.cc
index 76aba03d63320ce457f280028593432e15def930..c78ff986c3259204fc8eee7c1fd8b3c3df7167f2 100644
--- a/gcc/graphite-poly.cc
+++ b/gcc/graphite-poly.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_ISL
-#define INCLUDE_MEMORY
#include "config.h"
diff --git a/gcc/graphite-scop-detection.cc b/gcc/graphite-scop-detection.cc
index c519765b7663c44f0c7028b6658507bb5b50b2e8..fac26941021ad3458911dd508be490f2d3d7616f 100644
--- a/gcc/graphite-scop-detection.cc
+++ b/gcc/graphite-scop-detection.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_ISL
-#define INCLUDE_MEMORY
#include "config.h"
diff --git a/gcc/graphite-sese-to-poly.cc b/gcc/graphite-sese-to-poly.cc
index 1e7818a9ca3e29e4ee15f340f81cdfa5ff36dc84..5ce898505a3063952a8f1a526c46199dcc5d97aa 100644
--- a/gcc/graphite-sese-to-poly.cc
+++ b/gcc/graphite-sese-to-poly.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_ISL
-#define INCLUDE_MEMORY
#include "config.h"
diff --git a/gcc/graphite.cc b/gcc/graphite.cc
index 166850ceef175928e2e9e3e1d85ba6add3d584cc..2481c2bd17feb6829c78eaa090b9420a31be9d1e 100644
--- a/gcc/graphite.cc
+++ b/gcc/graphite.cc
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
the related work. */
#define INCLUDE_ISL
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
diff --git a/gcc/graphviz.cc b/gcc/graphviz.cc
index daa97066953316e5c6e28b9c0705eb623049e2bd..e41c8bc0ef38d7877e10dfc5728667ac604d2855 100644
--- a/gcc/graphviz.cc
+++ b/gcc/graphviz.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/input.cc b/gcc/input.cc
index 04462ef6f5a7eb5e05b3df2fd7e695a530eac1ad..9f5228d255c0aecb63058c5f50aa22507f481d10 100644
--- a/gcc/input.cc
+++ b/gcc/input.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc
index 25741cf47bb0d48454fe626c58438d05cd214389..e6d707c286db22c4f25639ea5c02300b516da616 100644
--- a/gcc/ipa-cp.cc
+++ b/gcc/ipa-cp.cc
@@ -101,7 +101,6 @@ along with GCC; see the file COPYING3. If not see
the second stage. */
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-devirt.cc b/gcc/ipa-devirt.cc
index ebd19d8db33fc8b82b0c34c35d5e936ec2160ca2..e88e9db781e93e84427105c753f834c289e814ec 100644
--- a/gcc/ipa-devirt.cc
+++ b/gcc/ipa-devirt.cc
@@ -105,7 +105,6 @@ along with GCC; see the file COPYING3. If not see
pass_ipa_devirt performs simple speculative devirtualization.
*/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-fnsummary.cc b/gcc/ipa-fnsummary.cc
index e6bdc00696945c65261f2099807d387925e5dac6..3f5e09960ef80c683ba1c8525e45799be809303f 100644
--- a/gcc/ipa-fnsummary.cc
+++ b/gcc/ipa-fnsummary.cc
@@ -52,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
inlined performs analysis via its analyze_function method. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-free-lang-data.cc b/gcc/ipa-free-lang-data.cc
index 80e30f5875409321d908cebd74ef24350645ac39..3ad203fec4c2a128f6f5e98a5d976357de2f9aa1 100644
--- a/gcc/ipa-free-lang-data.cc
+++ b/gcc/ipa-free-lang-data.cc
@@ -29,7 +29,6 @@
It is intended to be language-independent but can occasionally
calls language-dependent routines. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-icf-gimple.cc b/gcc/ipa-icf-gimple.cc
index 73fc56557fe7c29afb0d5b79b696213b43495a48..31f6cdbda0601ddedb470327eb504fd4fa73d345 100644
--- a/gcc/ipa-icf-gimple.cc
+++ b/gcc/ipa-icf-gimple.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-icf.cc b/gcc/ipa-icf.cc
index ae212336f2250a4129403d4b8a6e617755846eb3..60152e60bc5d353544161ef062b100f7f5af4efa 100644
--- a/gcc/ipa-icf.cc
+++ b/gcc/ipa-icf.cc
@@ -51,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
*/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-inline-analysis.cc b/gcc/ipa-inline-analysis.cc
index e52199872cf4a7052c1eac117572bac76232d1ee..a190cb6501b8be650fe6b694add4b040de10f879 100644
--- a/gcc/ipa-inline-analysis.cc
+++ b/gcc/ipa-inline-analysis.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-inline.cc b/gcc/ipa-inline.cc
index fe8efa9a157806b98f62832dfd2445e2afaf9b54..8c423af42d1c87bbc4561025d5e84f1f30ded617 100644
--- a/gcc/ipa-inline.cc
+++ b/gcc/ipa-inline.cc
@@ -89,7 +89,6 @@ along with GCC; see the file COPYING3. If not see
This should almost always lead to reduction of code size by eliminating
the need for offline copy of the function. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-modref-tree.cc b/gcc/ipa-modref-tree.cc
index 4bf7158535c5b5c246745e3af653356f29eda3d0..961d46621a0c2b9b2dd3be92cada2694382f3563 100644
--- a/gcc/ipa-modref-tree.cc
+++ b/gcc/ipa-modref-tree.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-modref.cc b/gcc/ipa-modref.cc
index 08a7740de9434e68b216fad3bce78d204dc2d83f..7449041c102b204f73e32aca9cfd47d22efac249 100644
--- a/gcc/ipa-modref.cc
+++ b/gcc/ipa-modref.cc
@@ -53,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
That is a vector recording what function parameters
may escape to a function call (and with what parameter index). */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-param-manipulation.cc b/gcc/ipa-param-manipulation.cc
index e1f6f3db2999c24f859f6015db62510ad2825433..ad36b8389c00ae5f9a593dcde3f353e0db36ba75 100644
--- a/gcc/ipa-param-manipulation.cc
+++ b/gcc/ipa-param-manipulation.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-polymorphic-call.cc b/gcc/ipa-polymorphic-call.cc
index d7c051e46c410c5a7705da9d5e96f65028ae7861..cfc9084bb3f744c10c68eba784e768b24e754ffc 100644
--- a/gcc/ipa-polymorphic-call.cc
+++ b/gcc/ipa-polymorphic-call.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-predicate.cc b/gcc/ipa-predicate.cc
index fbe1d6d917d036e06c7e14e8d19e8217305e0642..164aba4a126635da8b3d9353f8fa98f2b439c05a 100644
--- a/gcc/ipa-predicate.cc
+++ b/gcc/ipa-predicate.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-profile.cc b/gcc/ipa-profile.cc
index 17cd2df722bda52dee4182a2b5dc96eed06c8ab9..85062ca8959f13e03e33f443f39e9969f0a517cd 100644
--- a/gcc/ipa-profile.cc
+++ b/gcc/ipa-profile.cc
@@ -37,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
once, executed at startup and executed at exit. These flags are used to
control code size/performance threshold and code placement (by producing
.text.unlikely/.text.hot/.text.startup/.text.exit subsections). */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-prop.cc b/gcc/ipa-prop.cc
index 2a0d4503f52524b89579d7f882da6ad671261c8d..cbc825670fe0203ff208303876b5374cebebe25d 100644
--- a/gcc/ipa-prop.cc
+++ b/gcc/ipa-prop.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-pure-const.cc b/gcc/ipa-pure-const.cc
index 52b88f2535fc67e7574cb332b350eac38c095dbf..eddc05dd0d1c708030ae6e5cc54784f656422d30 100644
--- a/gcc/ipa-pure-const.cc
+++ b/gcc/ipa-pure-const.cc
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
should be one of the later passes since it's information is used by
the rest of the compilation. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-reference.cc b/gcc/ipa-reference.cc
index 103f7bccc5998f8eeb5a7126f51fd107cf8682e3..3655d32d762493b36f1a5b3d6e0958a901873084 100644
--- a/gcc/ipa-reference.cc
+++ b/gcc/ipa-reference.cc
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
traumatic, promote some statics to registers, and improve aliasing
information. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-split.cc b/gcc/ipa-split.cc
index a522e070a2da5dcad78a0541e227de9601027bbd..bf6266d8fc1c091a0a0b083f9b8d274978d0dc63 100644
--- a/gcc/ipa-split.cc
+++ b/gcc/ipa-split.cc
@@ -74,7 +74,6 @@ along with GCC; see the file COPYING3. If not see
7) There is nothing preventing us from producing multiple parts of single function
when needed or splitting also the parts. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-sra.cc b/gcc/ipa-sra.cc
index 585ba53ce63eb4aed2de10d5a244d574c528038f..04920f2aa8e44eb24b5160a079e40ff3d0c2ac9c 100644
--- a/gcc/ipa-sra.cc
+++ b/gcc/ipa-sra.cc
@@ -56,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
ipa-param-manipulation.h for more details. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-strub.cc b/gcc/ipa-strub.cc
index 6dbef204de606266f134b2fadbba7004b0472893..8fa7bdf530023a138229d958b6c2c5d11edbb2f4 100644
--- a/gcc/ipa-strub.cc
+++ b/gcc/ipa-strub.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ipa-utils.cc b/gcc/ipa-utils.cc
index 51b3a7682ee39938ec4f800679ed7699d83f8ee7..94175ac70d39ecd27bd0c8bbaf011c3b093a64e0 100644
--- a/gcc/ipa-utils.cc
+++ b/gcc/ipa-utils.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/jit/dummy-frontend.cc b/gcc/jit/dummy-frontend.cc
index 047c0c284aa9fb2cbf70276eb15c86af6fdbd084..773c0e101c06291428a2413eb6cb11386b006ccd 100644
--- a/gcc/jit/dummy-frontend.cc
+++ b/gcc/jit/dummy-frontend.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/jit/jit-playback.cc b/gcc/jit/jit-playback.cc
index d5bd0407afd1a52ed87c31451370cb663acd5f75..15b4e135b3e3ab7ad0a61114a2bc71c4db7d417d 100644
--- a/gcc/jit/jit-playback.cc
+++ b/gcc/jit/jit-playback.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_MUTEX
#include "libgccjit.h"
#include "system.h"
diff --git a/gcc/jit/jit-recording.cc b/gcc/jit/jit-recording.cc
index e39a10bacc33c4feb8dd26805d175913f30378f7..9434677ae3e3311ee794135264cba12f6620e6c7 100644
--- a/gcc/jit/jit-recording.cc
+++ b/gcc/jit/jit-recording.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_SSTREAM
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/json-parsing.cc b/gcc/json-parsing.cc
index 457d78f97cfab7cee8d95d6adc3e60ccbd5b6c0d..d3c2e527ca96dc2479f77a05c57925fbcce5f3d3 100644
--- a/gcc/json-parsing.cc
+++ b/gcc/json-parsing.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "json-parsing.h"
diff --git a/gcc/json.cc b/gcc/json.cc
index c55a3a56a987b051cea06b45e6fc4efe7830f54b..76517359cd079310109d73d2984391c6bb0f6e0c 100644
--- a/gcc/json.cc
+++ b/gcc/json.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "json.h"
diff --git a/gcc/json.h b/gcc/json.h
index 88c6b9ac498a505387b7c4fd31a211c935e6a459..af729463af5299de622620b04c904a249b50aa57 100644
--- a/gcc/json.h
+++ b/gcc/json.h
@@ -21,15 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_JSON_H
#define GCC_JSON_H
-/* This header uses std::unique_ptr, but <memory> can't be directly
- included due to issues with macros. Hence <memory> must be included
- from system.h by defining INCLUDE_MEMORY in any source file using
- json.h. */
-
-#ifndef INCLUDE_MEMORY
-# error "You must define INCLUDE_MEMORY before including system.h to use json.h"
-#endif
-
/* Implementation of JSON, a lightweight data-interchange format.
See http://www.json.org/
diff --git a/gcc/langhooks.cc b/gcc/langhooks.cc
index fe32be4495605bbc13794e8daa682cb5845056c7..54fc94e4364e461eaa09a404a9777491a5c39c48 100644
--- a/gcc/langhooks.cc
+++ b/gcc/langhooks.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/late-combine.cc b/gcc/late-combine.cc
index ba65e4a93b47f79801b1c70d429558ad469686fd..1311f76f4431b6b0acd22ffc736c54b1ac1f0fda 100644
--- a/gcc/late-combine.cc
+++ b/gcc/late-combine.cc
@@ -30,7 +30,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/lazy-diagnostic-path.cc b/gcc/lazy-diagnostic-path.cc
index 683388c1ca6f8957443cc66491ce3ad24fcdf1e8..debb102239d9d7609cd24205c82ea5684ac4288c 100644
--- a/gcc/lazy-diagnostic-path.cc
+++ b/gcc/lazy-diagnostic-path.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/libdiagnostics.cc b/gcc/libdiagnostics.cc
index c06d3bc722fdc4b87089fd616c65836d4dc6bba0..5037b87b3c0593df598bfa897b0052b8b0da6a11 100644
--- a/gcc/libdiagnostics.cc
+++ b/gcc/libdiagnostics.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/libsarifreplay.cc b/gcc/libsarifreplay.cc
index e726e101c61b2854bde2a8c7b88540f0c4d0f053..52286837a792aa48b13391eab25aeb1eb544d1d9 100644
--- a/gcc/libsarifreplay.cc
+++ b/gcc/libsarifreplay.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_VECTOR
#define INCLUDE_MAP
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-cgraph.cc b/gcc/lto-cgraph.cc
index b18d2b34e4682d22a977e6e0255f1fd7ddaf088f..d1d63fd90ea5d02db00937768b11e5ea906da4f0 100644
--- a/gcc/lto-cgraph.cc
+++ b/gcc/lto-cgraph.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-compress.cc b/gcc/lto-compress.cc
index 1895bb43345814140b24945ffb8dbb9dee09ab3a..bebf0277ef6724da1537a4f707f1ee01e94e53e9 100644
--- a/gcc/lto-compress.cc
+++ b/gcc/lto-compress.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-opts.cc b/gcc/lto-opts.cc
index 93ac83081f63c374196843c82557bd9b96fe9e81..a3a1d110329c9366e0733a9d64e4ad426c10cdb5 100644
--- a/gcc/lto-opts.cc
+++ b/gcc/lto-opts.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-section-in.cc b/gcc/lto-section-in.cc
index 22c203b2262585d24f1298aec0e42907683c8d96..fc2ba1906e19c6f1c37d6fcd2e951105736f2a27 100644
--- a/gcc/lto-section-in.cc
+++ b/gcc/lto-section-in.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-section-out.cc b/gcc/lto-section-out.cc
index c05e97133b744ad3042fc3f6cf95cff2bb8c53f3..d9c42653713fdfcf3d2160f8a42b6d73cc0e9b60 100644
--- a/gcc/lto-section-out.cc
+++ b/gcc/lto-section-out.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-streamer-in.cc b/gcc/lto-streamer-in.cc
index ccbafc9d0c291959e0c91b7f6d8fb62198d15a9d..4cce082068f7394c339dc220669ad7ea0969fa28 100644
--- a/gcc/lto-streamer-in.cc
+++ b/gcc/lto-streamer-in.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-streamer-out.cc b/gcc/lto-streamer-out.cc
index ec6d8a25bb0227824164576bd124275edcc6818b..6dc30daf76e62fc826d777efdd1b9201f15cf2fc 100644
--- a/gcc/lto-streamer-out.cc
+++ b/gcc/lto-streamer-out.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-streamer.cc b/gcc/lto-streamer.cc
index b69cead6301ad4eca0caa525f17584e417371ff5..a2e2ade1cc3cee364f0596fa11e3f3e45001db0c 100644
--- a/gcc/lto-streamer.cc
+++ b/gcc/lto-streamer.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto-wrapper.cc b/gcc/lto-wrapper.cc
index 40f7bd3414b3001c843d3a5f299602b020d36671..700da6cbbdb931047af865b06de878952692b0aa 100644
--- a/gcc/lto-wrapper.cc
+++ b/gcc/lto-wrapper.cc
@@ -37,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
./ccCJuXGv.lto.ltrans.o
*/
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.cc
index cc14cd7100f1a425ebb609ba606046969dd38ca9..86a309f92b40a772abee997f1ee511d72a2e8e0e 100644
--- a/gcc/lto/lto-common.cc
+++ b/gcc/lto/lto-common.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto/lto-dump.cc b/gcc/lto/lto-dump.cc
index be869c29431a40cb6ebd3cad87dd0b40a0543947..b570bccf8edde661d1589b8f9d057a7f01e14506 100644
--- a/gcc/lto/lto-dump.cc
+++ b/gcc/lto/lto-dump.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto/lto-partition.cc b/gcc/lto/lto-partition.cc
index 395831f96a6823f9706a72a836f7b24ec5c2e195..c4eeee94a680785c3d12f7be56ba0dfcb6eb8419 100644
--- a/gcc/lto/lto-partition.cc
+++ b/gcc/lto/lto-partition.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto/lto-symtab.cc b/gcc/lto/lto-symtab.cc
index a1589700be928211ef8434d2161eb6473059152a..2ca7d613bad8049c771aa6dc7e8d0091ff8fdf91 100644
--- a/gcc/lto/lto-symtab.cc
+++ b/gcc/lto/lto-symtab.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/lto/lto.cc b/gcc/lto/lto.cc
index e5b24f2437049f2d54f33b9cab04ee9fc167e871..1ee215d8f1d371955c2517c3230dfcc25e0a3571 100644
--- a/gcc/lto/lto.cc
+++ b/gcc/lto/lto.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/m2/gm2-gcc/gcc-consolidation.h b/gcc/m2/gm2-gcc/gcc-consolidation.h
index e0a94eeb279d833467b1094a83fa9c4054e806ee..637ec0bcc54ef213a3d92b9477fb30eda50059e0 100644
--- a/gcc/m2/gm2-gcc/gcc-consolidation.h
+++ b/gcc/m2/gm2-gcc/gcc-consolidation.h
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/m2/gm2-gcc/m2configure.cc b/gcc/m2/gm2-gcc/m2configure.cc
index d55d6c25e8fd682daad626705c0d1d94fba8d968..9e0e82f86c0178640dd1f1decdced3686dd6df99 100644
--- a/gcc/m2/gm2-gcc/m2configure.cc
+++ b/gcc/m2/gm2-gcc/m2configure.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "libiberty.h"
diff --git a/gcc/m2/mc-boot/GASCII.cc b/gcc/m2/mc-boot/GASCII.cc
index 76e1dd901eddbd7113ce8a6ba797da5adbe87e6a..a5c59fd3c4b827ac4853c6e327b4ba0e15926002 100644
--- a/gcc/m2/mc-boot/GASCII.cc
+++ b/gcc/m2/mc-boot/GASCII.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GASCII.h b/gcc/m2/mc-boot/GASCII.h
index 76c961a9d57ded87dc0efdde7b1fd9b678e8eb54..c157a8b7686ee3642a5153c8c0494a5609ea72af 100644
--- a/gcc/m2/mc-boot/GASCII.h
+++ b/gcc/m2/mc-boot/GASCII.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_ASCII_H)
# define _ASCII_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GArgs.cc b/gcc/m2/mc-boot/GArgs.cc
index 8fc16a4ebea119ad39c16613f7b4c4f2f533d613..182def800ea0a2f5f6d1d126369a93df1ca2ef2d 100644
--- a/gcc/m2/mc-boot/GArgs.cc
+++ b/gcc/m2/mc-boot/GArgs.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GArgs.h b/gcc/m2/mc-boot/GArgs.h
index 752345f691cf4c12f9889ee8275a716e22103b1c..1171cef8d72fa8b2c49e3a5237eab926431fedd4 100644
--- a/gcc/m2/mc-boot/GArgs.h
+++ b/gcc/m2/mc-boot/GArgs.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Args_H)
# define _Args_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GAssertion.cc b/gcc/m2/mc-boot/GAssertion.cc
index 34989b9737f0481762261956e60ed4ed902482ea..b6b47952108b1cdf7aa505d6dcfafa210f7c1df6 100644
--- a/gcc/m2/mc-boot/GAssertion.cc
+++ b/gcc/m2/mc-boot/GAssertion.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GAssertion.h b/gcc/m2/mc-boot/GAssertion.h
index c5bcdd98d370c341fa71626e8ffc4f91676d5b82..d909fdee7a37ea5e989e7771c1c8824a53316727 100644
--- a/gcc/m2/mc-boot/GAssertion.h
+++ b/gcc/m2/mc-boot/GAssertion.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Assertion_H)
# define _Assertion_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GBreak.cc b/gcc/m2/mc-boot/GBreak.cc
index ffbe2f172a5786d4a2b8dbd032a6b9900f9c9bf1..4fea839214bd2d68fce459b144b1e55ba1e4b718 100644
--- a/gcc/m2/mc-boot/GBreak.cc
+++ b/gcc/m2/mc-boot/GBreak.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GBreak.h b/gcc/m2/mc-boot/GBreak.h
index df0ee16b5eda4295a703f4a1ed5595572c2d50aa..bd2f1ccf6f1772e1b77e52a1d8cb10422816006d 100644
--- a/gcc/m2/mc-boot/GBreak.h
+++ b/gcc/m2/mc-boot/GBreak.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Break_H)
# define _Break_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GCOROUTINES.h b/gcc/m2/mc-boot/GCOROUTINES.h
index dff08a0c185a5ef75d5badc9670b603e62b7a7b6..a744d9c6ebe0c41cc95345bbb81b7aeb7edf50c2 100644
--- a/gcc/m2/mc-boot/GCOROUTINES.h
+++ b/gcc/m2/mc-boot/GCOROUTINES.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_COROUTINES_H)
# define _COROUTINES_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GCmdArgs.cc b/gcc/m2/mc-boot/GCmdArgs.cc
index 142708500da0103ff16e5c387cba5c3e929a026a..5fa39f058c96b4ef1fc6b87c61ce9465dfb6af20 100644
--- a/gcc/m2/mc-boot/GCmdArgs.cc
+++ b/gcc/m2/mc-boot/GCmdArgs.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GCmdArgs.h b/gcc/m2/mc-boot/GCmdArgs.h
index 852e8dc003706ed99728f074e863e84ac0a311f1..7f39815bc0935fdb1a012780c0cd13a298ab9761 100644
--- a/gcc/m2/mc-boot/GCmdArgs.h
+++ b/gcc/m2/mc-boot/GCmdArgs.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_CmdArgs_H)
# define _CmdArgs_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GDebug.cc b/gcc/m2/mc-boot/GDebug.cc
index ce0beaaccb1b12f94a93152e9eeac583ca83c025..dbb33cd5833a27d2027ded763007913542ffe042 100644
--- a/gcc/m2/mc-boot/GDebug.cc
+++ b/gcc/m2/mc-boot/GDebug.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GDebug.h b/gcc/m2/mc-boot/GDebug.h
index 582be90f877be346fa558cbfdc3745d8d63cc10c..395dcec8ee2d4ad0c7dac98bc1f7d3794689dc81 100644
--- a/gcc/m2/mc-boot/GDebug.h
+++ b/gcc/m2/mc-boot/GDebug.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Debug_H)
# define _Debug_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GDynamicStrings.cc b/gcc/m2/mc-boot/GDynamicStrings.cc
index 74f3948d9b92a11653cbc4920a9a615bf517a185..18f4a842aa44cde1f068bc49af2510c361fdf472 100644
--- a/gcc/m2/mc-boot/GDynamicStrings.cc
+++ b/gcc/m2/mc-boot/GDynamicStrings.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GDynamicStrings.h b/gcc/m2/mc-boot/GDynamicStrings.h
index fefce9d6f6bcd6241afa7f3a8b53643eaed78773..e0652a7d3bd09dc67420eb2acfcfadbd3f577857 100644
--- a/gcc/m2/mc-boot/GDynamicStrings.h
+++ b/gcc/m2/mc-boot/GDynamicStrings.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_DynamicStrings_H)
# define _DynamicStrings_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GEnvironment.cc b/gcc/m2/mc-boot/GEnvironment.cc
index 95dab816595b47e6ea6c219a6c501e8016f508c7..aad1bb46c010e9f964acb4b6786efa6ac65c3a53 100644
--- a/gcc/m2/mc-boot/GEnvironment.cc
+++ b/gcc/m2/mc-boot/GEnvironment.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GEnvironment.h b/gcc/m2/mc-boot/GEnvironment.h
index 2da03aeba753978c17624cc36d94226dbfc2f0cb..4f94d583334bd971cc14b562023b297aecf667d7 100644
--- a/gcc/m2/mc-boot/GEnvironment.h
+++ b/gcc/m2/mc-boot/GEnvironment.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Environment_H)
# define _Environment_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GFIO.cc b/gcc/m2/mc-boot/GFIO.cc
index 6ed932e9ee65f9ab6959e53230e0a586369d8493..a1fccf794a307793c27385f2373559b13cbfff5f 100644
--- a/gcc/m2/mc-boot/GFIO.cc
+++ b/gcc/m2/mc-boot/GFIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GFIO.h b/gcc/m2/mc-boot/GFIO.h
index 04cbc768505e956d3bd5add855140e3e6155c0b9..d82396449ffe89212206a3c8eae638dfa8a983a7 100644
--- a/gcc/m2/mc-boot/GFIO.h
+++ b/gcc/m2/mc-boot/GFIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_FIO_H)
# define _FIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GFormatStrings.cc b/gcc/m2/mc-boot/GFormatStrings.cc
index 3c92e6c771600ca9e4a177f126010836b4dd9f7c..7ac0810cff8bbd0be0a6ddf9dfb7e9bf2e9706f0 100644
--- a/gcc/m2/mc-boot/GFormatStrings.cc
+++ b/gcc/m2/mc-boot/GFormatStrings.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GFormatStrings.h b/gcc/m2/mc-boot/GFormatStrings.h
index 4208dcd8c5d74387c3ca1878f4ef9af385bf58df..b9e5b993ebd90527f1df5d959f3c7a2ea3ec710a 100644
--- a/gcc/m2/mc-boot/GFormatStrings.h
+++ b/gcc/m2/mc-boot/GFormatStrings.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_FormatStrings_H)
# define _FormatStrings_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GFpuIO.cc b/gcc/m2/mc-boot/GFpuIO.cc
index 18e3c2e0cda6c504d4cb218b1ab6200aea2f6125..98fdc797ce67fcde8e57b734ca383e59a7824c1f 100644
--- a/gcc/m2/mc-boot/GFpuIO.cc
+++ b/gcc/m2/mc-boot/GFpuIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GFpuIO.h b/gcc/m2/mc-boot/GFpuIO.h
index 1e0575b7f8264fd11e6569f402b3ec1e0d17aa77..5d830606130173b64283cd83f542b654dbbe0d0f 100644
--- a/gcc/m2/mc-boot/GFpuIO.h
+++ b/gcc/m2/mc-boot/GFpuIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_FpuIO_H)
# define _FpuIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GIO.cc b/gcc/m2/mc-boot/GIO.cc
index 363369f020781c50a27122d435d5d2a3a3316644..4b45e3b024cd90ab8dd7528f98f603a376924c32 100644
--- a/gcc/m2/mc-boot/GIO.cc
+++ b/gcc/m2/mc-boot/GIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GIO.h b/gcc/m2/mc-boot/GIO.h
index 3e58ea5cff26d00324cbf4042ba58ab0d6698815..4f4af9a59a028db08b6416831d968806a6b7aaa3 100644
--- a/gcc/m2/mc-boot/GIO.h
+++ b/gcc/m2/mc-boot/GIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_IO_H)
# define _IO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GIndexing.cc b/gcc/m2/mc-boot/GIndexing.cc
index 4dfccd2f9915993de9af0e220db125f6fe7884eb..dd314001108c8699445579f9c3d341927f46ca04 100644
--- a/gcc/m2/mc-boot/GIndexing.cc
+++ b/gcc/m2/mc-boot/GIndexing.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GIndexing.h b/gcc/m2/mc-boot/GIndexing.h
index e2e728c25667db89c0fcbfcc4cd17c801baf1e1e..b986469c331fdbf68d33b0b67cdc229ed3e928e2 100644
--- a/gcc/m2/mc-boot/GIndexing.h
+++ b/gcc/m2/mc-boot/GIndexing.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_Indexing_H)
# define _Indexing_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GM2Dependent.cc b/gcc/m2/mc-boot/GM2Dependent.cc
index c563a1ea85e35830697a885f68cd7413e84558d1..4864aa4e44d517845aa61bf26d52addd31ee0def 100644
--- a/gcc/m2/mc-boot/GM2Dependent.cc
+++ b/gcc/m2/mc-boot/GM2Dependent.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GM2Dependent.h b/gcc/m2/mc-boot/GM2Dependent.h
index 3b32e165a48f6cc51bc0440890837f2deccdc757..0353236f8c1c9bd33a7ebd64f8e0b5bcca807da9 100644
--- a/gcc/m2/mc-boot/GM2Dependent.h
+++ b/gcc/m2/mc-boot/GM2Dependent.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_M2Dependent_H)
# define _M2Dependent_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GM2EXCEPTION.cc b/gcc/m2/mc-boot/GM2EXCEPTION.cc
index af1218f922a6aa66df939d220fb0bb6262ee3890..97417cf6c82ae535ccebd91ceb324fd162ddef55 100644
--- a/gcc/m2/mc-boot/GM2EXCEPTION.cc
+++ b/gcc/m2/mc-boot/GM2EXCEPTION.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GM2EXCEPTION.h b/gcc/m2/mc-boot/GM2EXCEPTION.h
index fef5e2b1740e83bcf656965c1a72b883baac1264..4ee5404733c2cfa7aec80ea03affe148889b15e1 100644
--- a/gcc/m2/mc-boot/GM2EXCEPTION.h
+++ b/gcc/m2/mc-boot/GM2EXCEPTION.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_M2EXCEPTION_H)
# define _M2EXCEPTION_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GM2RTS.cc b/gcc/m2/mc-boot/GM2RTS.cc
index 5e93404572eb333b1ed34312f793807de9651db7..1395bb4e141bc966b3665fd956176a8a657caff8 100644
--- a/gcc/m2/mc-boot/GM2RTS.cc
+++ b/gcc/m2/mc-boot/GM2RTS.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GM2RTS.h b/gcc/m2/mc-boot/GM2RTS.h
index 88e21849c059a057981df33231edc7401dddf4e4..055cc95675ba911dc1db71d55407f882a7319b02 100644
--- a/gcc/m2/mc-boot/GM2RTS.h
+++ b/gcc/m2/mc-boot/GM2RTS.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_M2RTS_H)
# define _M2RTS_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GMemUtils.cc b/gcc/m2/mc-boot/GMemUtils.cc
index 04474ecbf39a80ca816ca27f4a2fe1a172747104..1d9feed27d60532c14ff592b7415c58d05dad577 100644
--- a/gcc/m2/mc-boot/GMemUtils.cc
+++ b/gcc/m2/mc-boot/GMemUtils.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GMemUtils.h b/gcc/m2/mc-boot/GMemUtils.h
index dea7aafda6ddd81a166b46a6bffde088c8576f8b..1d23091ce93addcf6a42821c9984171b7d979ae8 100644
--- a/gcc/m2/mc-boot/GMemUtils.h
+++ b/gcc/m2/mc-boot/GMemUtils.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_MemUtils_H)
# define _MemUtils_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GNumberIO.cc b/gcc/m2/mc-boot/GNumberIO.cc
index 15b3be191f0c75c19e1461bf25a13ac5035e9d7a..75720dd85e6e38acb47d9d25e2fb55ea797409be 100644
--- a/gcc/m2/mc-boot/GNumberIO.cc
+++ b/gcc/m2/mc-boot/GNumberIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GNumberIO.h b/gcc/m2/mc-boot/GNumberIO.h
index decd31b4dd84583a7818036ec3324efbc224f7c6..34aee3373836e728332d22916a1cbd499980787a 100644
--- a/gcc/m2/mc-boot/GNumberIO.h
+++ b/gcc/m2/mc-boot/GNumberIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_NumberIO_H)
# define _NumberIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GPushBackInput.cc b/gcc/m2/mc-boot/GPushBackInput.cc
index 5c50f967c18ed0a39e9b1774b4081f525b12c210..9bc2a83abd4522978afa953cf6bcb813444138e4 100644
--- a/gcc/m2/mc-boot/GPushBackInput.cc
+++ b/gcc/m2/mc-boot/GPushBackInput.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GPushBackInput.h b/gcc/m2/mc-boot/GPushBackInput.h
index 27c572b53e0ca15a86cb73f097f2dc81b56035dd..076b99657a07c62b94c7fb694d19c7b3303a0cfc 100644
--- a/gcc/m2/mc-boot/GPushBackInput.h
+++ b/gcc/m2/mc-boot/GPushBackInput.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_PushBackInput_H)
# define _PushBackInput_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GRTExceptions.cc b/gcc/m2/mc-boot/GRTExceptions.cc
index d42c1f311079c6e2a400d7d135b5ac652b865660..a0eff3ecc8af676edc79dda941ce828975cf3022 100644
--- a/gcc/m2/mc-boot/GRTExceptions.cc
+++ b/gcc/m2/mc-boot/GRTExceptions.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GRTExceptions.h b/gcc/m2/mc-boot/GRTExceptions.h
index b335d800ca6aee5629da1f318cd7275609900c8f..9e188bcbad4d3c637c82359f12f6e05d0bf51b69 100644
--- a/gcc/m2/mc-boot/GRTExceptions.h
+++ b/gcc/m2/mc-boot/GRTExceptions.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_RTExceptions_H)
# define _RTExceptions_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GRTco.h b/gcc/m2/mc-boot/GRTco.h
index 2e014d333cfedefd4fd0c2263b372b9171625463..778b75f3d2e2a7d3ba6d7f63c11f99ecb4b6ddee 100644
--- a/gcc/m2/mc-boot/GRTco.h
+++ b/gcc/m2/mc-boot/GRTco.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_RTco_H)
# define _RTco_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GRTentity.h b/gcc/m2/mc-boot/GRTentity.h
index 3eb8822fc9d52d0fc3a8515e016d51853833064c..9acb077557551064572a4a04f6c8bc77ed7aac44 100644
--- a/gcc/m2/mc-boot/GRTentity.h
+++ b/gcc/m2/mc-boot/GRTentity.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_RTentity_H)
# define _RTentity_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GRTint.cc b/gcc/m2/mc-boot/GRTint.cc
index 1a91769e03bac374f8e4e9fc9c91efc8a937d1b5..82454d0d3de59d5af6405ccb0a2d4b4311d35c2c 100644
--- a/gcc/m2/mc-boot/GRTint.cc
+++ b/gcc/m2/mc-boot/GRTint.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GRTint.h b/gcc/m2/mc-boot/GRTint.h
index a9fb9d182ec82e62586cf32583499ea82e956118..4f81546e8d61e762a1b0bb451f70d5c043b59f38 100644
--- a/gcc/m2/mc-boot/GRTint.h
+++ b/gcc/m2/mc-boot/GRTint.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_RTint_H)
# define _RTint_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSArgs.cc b/gcc/m2/mc-boot/GSArgs.cc
index 0c99f2d2594bc73e679a4ca2df1c24cb45bf1d02..93083a056dc3501e4d815e566969fcae540d32ba 100644
--- a/gcc/m2/mc-boot/GSArgs.cc
+++ b/gcc/m2/mc-boot/GSArgs.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GSArgs.h b/gcc/m2/mc-boot/GSArgs.h
index 6a12e7ec4f3e4424b5eaae5289f738e7ba5863ed..a7b10bf4a1f361b9a3706f699f796bf8aaeca40c 100644
--- a/gcc/m2/mc-boot/GSArgs.h
+++ b/gcc/m2/mc-boot/GSArgs.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_SArgs_H)
# define _SArgs_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSFIO.cc b/gcc/m2/mc-boot/GSFIO.cc
index 232d3f5883e32ab5e2f58d85b2129a3b260b791c..b568cce23ebf317ef7317119fbaeb1196cb1cc41 100644
--- a/gcc/m2/mc-boot/GSFIO.cc
+++ b/gcc/m2/mc-boot/GSFIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GSFIO.h b/gcc/m2/mc-boot/GSFIO.h
index bba25eb84367e347bcb69cc50379c1e475e387e2..108d8ea79f06b0a712ccf2bf850f55761c436869 100644
--- a/gcc/m2/mc-boot/GSFIO.h
+++ b/gcc/m2/mc-boot/GSFIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_SFIO_H)
# define _SFIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSYSTEM.h b/gcc/m2/mc-boot/GSYSTEM.h
index ff4b7b24ac3ba0a2c98181c798d8b3545ac6907f..a18a1765dc5386fa3b64ce11be5024f05941facb 100644
--- a/gcc/m2/mc-boot/GSYSTEM.h
+++ b/gcc/m2/mc-boot/GSYSTEM.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_SYSTEM_H)
# define _SYSTEM_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSelective.h b/gcc/m2/mc-boot/GSelective.h
index 17e926d1a448323a48858fce517ca52e40e69a51..67b7f0643f0585519f896febf32342ec3c3d3bc4 100644
--- a/gcc/m2/mc-boot/GSelective.h
+++ b/gcc/m2/mc-boot/GSelective.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Selective_H)
# define _Selective_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStdIO.cc b/gcc/m2/mc-boot/GStdIO.cc
index ddcb8ec040ab54ff644ca5a1b14115e1dc1d61c0..c9d3774ec0615dcaba812a73957cd325d14b190d 100644
--- a/gcc/m2/mc-boot/GStdIO.cc
+++ b/gcc/m2/mc-boot/GStdIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStdIO.h b/gcc/m2/mc-boot/GStdIO.h
index 3c84cede87b257ed2bacf5b4c9669d257f8110bf..0a45ebc7e345654f82671d8e306ae883bf27840c 100644
--- a/gcc/m2/mc-boot/GStdIO.h
+++ b/gcc/m2/mc-boot/GStdIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_StdIO_H)
# define _StdIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStorage.cc b/gcc/m2/mc-boot/GStorage.cc
index 24ced14ce6aaf7d7a97fc5746394571a0100ddd5..67e7a8b7274baf3266c47fa9e3a62ceb20d65e23 100644
--- a/gcc/m2/mc-boot/GStorage.cc
+++ b/gcc/m2/mc-boot/GStorage.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStorage.h b/gcc/m2/mc-boot/GStorage.h
index a119a8f6e58dbb1c821b7d1d443c67930e822ac7..8c26b465b2cb39e8bacbb20bf753b73116f7c4c9 100644
--- a/gcc/m2/mc-boot/GStorage.h
+++ b/gcc/m2/mc-boot/GStorage.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Storage_H)
# define _Storage_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStrCase.cc b/gcc/m2/mc-boot/GStrCase.cc
index 03993e5fbd68d550fca70724921d3cc1fdb9f409..9492774596ba47c43d95072d7b25b6c9d4ae8024 100644
--- a/gcc/m2/mc-boot/GStrCase.cc
+++ b/gcc/m2/mc-boot/GStrCase.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStrCase.h b/gcc/m2/mc-boot/GStrCase.h
index 9fd23285525cd379236b4f3eec8401690de0f7ea..c3f064728d8b48f94db73d3e45c6a162c3979aad 100644
--- a/gcc/m2/mc-boot/GStrCase.h
+++ b/gcc/m2/mc-boot/GStrCase.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_StrCase_H)
# define _StrCase_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStrIO.cc b/gcc/m2/mc-boot/GStrIO.cc
index 7e94ef521ea842c28fb94e806b9830de86fd7f37..d0c6e2085cd1123e3d0b81caee8e80d7ee4d9d22 100644
--- a/gcc/m2/mc-boot/GStrIO.cc
+++ b/gcc/m2/mc-boot/GStrIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStrIO.h b/gcc/m2/mc-boot/GStrIO.h
index 653e020d3999391b6a444fcf3f7c0c09a21eb762..2ed2ac33f1190cf767fe12458f790b9e7f202450 100644
--- a/gcc/m2/mc-boot/GStrIO.h
+++ b/gcc/m2/mc-boot/GStrIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_StrIO_H)
# define _StrIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStrLib.cc b/gcc/m2/mc-boot/GStrLib.cc
index 19ac230e9a461acbeb29d0306175a4a7599e6518..dc6d0ff2aa0717ea8478e9aa4361917ed4d71a13 100644
--- a/gcc/m2/mc-boot/GStrLib.cc
+++ b/gcc/m2/mc-boot/GStrLib.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStrLib.h b/gcc/m2/mc-boot/GStrLib.h
index ddd7457a6ffaf69568be4e6f2ab37348bdda9f1a..b292d8990a14b59b359d6c1a5715b57525f7628a 100644
--- a/gcc/m2/mc-boot/GStrLib.h
+++ b/gcc/m2/mc-boot/GStrLib.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_StrLib_H)
# define _StrLib_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStringConvert.cc b/gcc/m2/mc-boot/GStringConvert.cc
index 822813cd1417911a956f33ae60f620de96fd7c4b..80efd0c9fc48620f3f65d7c6e50882e6e68185f7 100644
--- a/gcc/m2/mc-boot/GStringConvert.cc
+++ b/gcc/m2/mc-boot/GStringConvert.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStringConvert.h b/gcc/m2/mc-boot/GStringConvert.h
index 3983d6cc375474850b2b309a43ed071769fa3437..284eef236cc8f6e3170352fcf663b131c0fc4266 100644
--- a/gcc/m2/mc-boot/GStringConvert.h
+++ b/gcc/m2/mc-boot/GStringConvert.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_StringConvert_H)
# define _StringConvert_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSysExceptions.h b/gcc/m2/mc-boot/GSysExceptions.h
index eee2631c8bead9cb1f980e68d554e4c3a0fe3809..00dd52117d1b127cedfed90839534ef08ba2e9a5 100644
--- a/gcc/m2/mc-boot/GSysExceptions.h
+++ b/gcc/m2/mc-boot/GSysExceptions.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_SysExceptions_H)
# define _SysExceptions_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSysStorage.cc b/gcc/m2/mc-boot/GSysStorage.cc
index fe06a5d87751be01043c1f05f89714bf43b759bc..1ef723074d464b81470ed87fd97a0ab18ba9e2de 100644
--- a/gcc/m2/mc-boot/GSysStorage.cc
+++ b/gcc/m2/mc-boot/GSysStorage.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GSysStorage.h b/gcc/m2/mc-boot/GSysStorage.h
index 2aa6f85aaffc1a801e429d720026cda0ec889eb2..639f6811e197556c079faeb8225e601c16bd0686 100644
--- a/gcc/m2/mc-boot/GSysStorage.h
+++ b/gcc/m2/mc-boot/GSysStorage.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_SysStorage_H)
# define _SysStorage_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GTimeString.cc b/gcc/m2/mc-boot/GTimeString.cc
index 37405659be0b465ba14722291c4603d8ab854c24..af7b7e40814e530d8cb5fa4b38a93ea815926afd 100644
--- a/gcc/m2/mc-boot/GTimeString.cc
+++ b/gcc/m2/mc-boot/GTimeString.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GTimeString.h b/gcc/m2/mc-boot/GTimeString.h
index 27d128769f5754f132ce7ca4f9868079f7acf885..7ba51f8081ea2b2b971b95e16ae6131d38819df7 100644
--- a/gcc/m2/mc-boot/GTimeString.h
+++ b/gcc/m2/mc-boot/GTimeString.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_TimeString_H)
# define _TimeString_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GUnixArgs.h b/gcc/m2/mc-boot/GUnixArgs.h
index 6c04a944825d1559c4598621be6011c2186891c0..cf9756ea177f8eab88158a01f82d6e116b9a2543 100644
--- a/gcc/m2/mc-boot/GUnixArgs.h
+++ b/gcc/m2/mc-boot/GUnixArgs.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_UnixArgs_H)
# define _UnixArgs_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Galists.cc b/gcc/m2/mc-boot/Galists.cc
index a2ad92238b79a602ae491ca8d10681bf6f4c402a..ca582f3ce43a98996a619a683efd2b234e70bc00 100644
--- a/gcc/m2/mc-boot/Galists.cc
+++ b/gcc/m2/mc-boot/Galists.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Galists.h b/gcc/m2/mc-boot/Galists.h
index 3bb6599422caf926d5008d87ba1a332bed040ba4..3ed524152f4275a4496774075167ef5fc715cc00 100644
--- a/gcc/m2/mc-boot/Galists.h
+++ b/gcc/m2/mc-boot/Galists.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_alists_H)
# define _alists_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gdecl.cc b/gcc/m2/mc-boot/Gdecl.cc
index 0878f7de29b40c8ea87c88002dc14fb9b6d64829..9af2842ca18de8d9e6ae5c14b037c0faed0acd19 100644
--- a/gcc/m2/mc-boot/Gdecl.cc
+++ b/gcc/m2/mc-boot/Gdecl.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gdecl.h b/gcc/m2/mc-boot/Gdecl.h
index 8b7aa91b38a3fa33fd02edb3e7c6b8aceac428a3..99d78087ae2ab8a41cf1c60647cab3b660266e92 100644
--- a/gcc/m2/mc-boot/Gdecl.h
+++ b/gcc/m2/mc-boot/Gdecl.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_decl_H)
# define _decl_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gdtoa.h b/gcc/m2/mc-boot/Gdtoa.h
index d06a03480f91b2cef5dea4efce337b482d72de5e..c1b3619ce47506e98693bdca57c3dc8cc8c9c661 100644
--- a/gcc/m2/mc-boot/Gdtoa.h
+++ b/gcc/m2/mc-boot/Gdtoa.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_dtoa_H)
# define _dtoa_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gerrno.h b/gcc/m2/mc-boot/Gerrno.h
index 9d315c3d2cef42bfd9b7ff893450642d358243d9..7f065ccb24d7985f18d72d453d712212b12d452e 100644
--- a/gcc/m2/mc-boot/Gerrno.h
+++ b/gcc/m2/mc-boot/Gerrno.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_errno_H)
# define _errno_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gkeyc.cc b/gcc/m2/mc-boot/Gkeyc.cc
index a56abc56ee34b989592799fbb5661f2eba7295ca..3a5dd5ccc1de44704d12f200c1717a76c5723748 100644
--- a/gcc/m2/mc-boot/Gkeyc.cc
+++ b/gcc/m2/mc-boot/Gkeyc.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
@@ -576,7 +575,6 @@ static void checkGccConfigSystem (mcPretty_pretty p)
if (! initializedGCC)
{
initializedGCC = true;
- mcPretty_print (p, (const char *) "#define INCLUDE_MEMORY\\n", 24);
mcPretty_print (p, (const char *) "#include \"config.h\"\\n", 21);
mcPretty_print (p, (const char *) "#include \"system.h\"\\n", 21);
checkGccTypes (p);
diff --git a/gcc/m2/mc-boot/Gkeyc.h b/gcc/m2/mc-boot/Gkeyc.h
index f0911ee8488ee8920b13c9b30484b1561cbdd870..afa945d03c0244ed845971e4e21c31baac9388f3 100644
--- a/gcc/m2/mc-boot/Gkeyc.h
+++ b/gcc/m2/mc-boot/Gkeyc.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_keyc_H)
# define _keyc_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gldtoa.h b/gcc/m2/mc-boot/Gldtoa.h
index a8f72ea4bd16911454d2649eb336e25a4dfde028..c4b4d904fb0c51d3787c147db3c009ecc1449798 100644
--- a/gcc/m2/mc-boot/Gldtoa.h
+++ b/gcc/m2/mc-boot/Gldtoa.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_ldtoa_H)
# define _ldtoa_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Glibc.h b/gcc/m2/mc-boot/Glibc.h
index 50384ecf8979129d882de274debb022ad7caec1e..def419fb3c9a8f35fa9c1b87941a4e0be7784025 100644
--- a/gcc/m2/mc-boot/Glibc.h
+++ b/gcc/m2/mc-boot/Glibc.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_libc_H)
# define _libc_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Glibm.h b/gcc/m2/mc-boot/Glibm.h
index 19ee9e599ce026b3b4fc33219d7449255b0ba921..d3c9415070c11c5ed09b51ec470f3b55a49928ed 100644
--- a/gcc/m2/mc-boot/Glibm.h
+++ b/gcc/m2/mc-boot/Glibm.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_libm_H)
# define _libm_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Glists.cc b/gcc/m2/mc-boot/Glists.cc
index d354e867e77891e077957122fd6f68c4bd5ac18c..e33c91d8500581513095667113d4860f2904890f 100644
--- a/gcc/m2/mc-boot/Glists.cc
+++ b/gcc/m2/mc-boot/Glists.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Glists.h b/gcc/m2/mc-boot/Glists.h
index e8414b080fe7c95b5d96fd877b28df127ac5292b..5cb8058415cc728ee1ff516d5e293235cab932c1 100644
--- a/gcc/m2/mc-boot/Glists.h
+++ b/gcc/m2/mc-boot/Glists.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_lists_H)
# define _lists_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcComment.cc b/gcc/m2/mc-boot/GmcComment.cc
index 6b27d93e6fa568c71b1ace270fdb9809ac20c5a7..4c7650283ec229b257c354dbd243ba122e4f7cf3 100644
--- a/gcc/m2/mc-boot/GmcComment.cc
+++ b/gcc/m2/mc-boot/GmcComment.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcComment.h b/gcc/m2/mc-boot/GmcComment.h
index 57952a1cec2ebddaacfc3553982708c6b0a2957e..39ba8c21595a9e6b01f484f2ac8e71f823a1e2d1 100644
--- a/gcc/m2/mc-boot/GmcComment.h
+++ b/gcc/m2/mc-boot/GmcComment.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcComment_H)
# define _mcComment_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcComp.cc b/gcc/m2/mc-boot/GmcComp.cc
index ca192aa7456bcc3ff34bac4276dd989e12d0b5fc..c941c618030d063eeb6b21cbb8924afb292018b0 100644
--- a/gcc/m2/mc-boot/GmcComp.cc
+++ b/gcc/m2/mc-boot/GmcComp.cc
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcComp.h b/gcc/m2/mc-boot/GmcComp.h
index 088b6636f96eeafc0ebf170a2729489e3869d5de..9ab78a54723c041e0abb98c736468fa4d6770340 100644
--- a/gcc/m2/mc-boot/GmcComp.h
+++ b/gcc/m2/mc-boot/GmcComp.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcComp_H)
# define _mcComp_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcDebug.cc b/gcc/m2/mc-boot/GmcDebug.cc
index 7ded4aee139fcc593988f7a5ea58676e51c2b63d..0085384f2c98262114519c041d6e43cf589d5039 100644
--- a/gcc/m2/mc-boot/GmcDebug.cc
+++ b/gcc/m2/mc-boot/GmcDebug.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcDebug.h b/gcc/m2/mc-boot/GmcDebug.h
index 8de6dc46e7e0b79cfaf16405cde5c45e3f96a6cb..e8ec34b2be4785a7a1fb02a4b3b0b61b8fe6fd38 100644
--- a/gcc/m2/mc-boot/GmcDebug.h
+++ b/gcc/m2/mc-boot/GmcDebug.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcDebug_H)
# define _mcDebug_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcError.cc b/gcc/m2/mc-boot/GmcError.cc
index 424670166f9a4be8b7d372218d4aa4c2e837bfc3..4816122c170f0fc3726564b12f6a0120cf670cdc 100644
--- a/gcc/m2/mc-boot/GmcError.cc
+++ b/gcc/m2/mc-boot/GmcError.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcError.h b/gcc/m2/mc-boot/GmcError.h
index 0c369b2d006807fd42f65f39f79d30a9afbf1665..6a62fcd540fa686e578c22790d1b282639499abc 100644
--- a/gcc/m2/mc-boot/GmcError.h
+++ b/gcc/m2/mc-boot/GmcError.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcError_H)
# define _mcError_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcFileName.cc b/gcc/m2/mc-boot/GmcFileName.cc
index f0f69129e06cf86a623308906bc413b0002e5281..3b516594c595e447de748ae00876a68b32b43364 100644
--- a/gcc/m2/mc-boot/GmcFileName.cc
+++ b/gcc/m2/mc-boot/GmcFileName.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcFileName.h b/gcc/m2/mc-boot/GmcFileName.h
index 42c05b970900fc9c087d15bf724220a711921060..a5a9afa8376c0c894af6f4d0f777dc7ffd77dfe1 100644
--- a/gcc/m2/mc-boot/GmcFileName.h
+++ b/gcc/m2/mc-boot/GmcFileName.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcFileName_H)
# define _mcFileName_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcLexBuf.cc b/gcc/m2/mc-boot/GmcLexBuf.cc
index 39860c25ff7e55e227137331c1c709f422ced669..4cbd54429d11aeef3916c04cc4160604e8d3ff70 100644
--- a/gcc/m2/mc-boot/GmcLexBuf.cc
+++ b/gcc/m2/mc-boot/GmcLexBuf.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcLexBuf.h b/gcc/m2/mc-boot/GmcLexBuf.h
index 714d0491b00a6adbf66f24d551853c2ac6ebd5a8..ca71dd83adb0e6ec108b40be8859e608ec0a75fa 100644
--- a/gcc/m2/mc-boot/GmcLexBuf.h
+++ b/gcc/m2/mc-boot/GmcLexBuf.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcLexBuf_H)
# define _mcLexBuf_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcMetaError.cc b/gcc/m2/mc-boot/GmcMetaError.cc
index 9298d0e4192721d32a6d1447ab80007307aa5099..af64604534e2f189df03a43405ba166b9862c42b 100644
--- a/gcc/m2/mc-boot/GmcMetaError.cc
+++ b/gcc/m2/mc-boot/GmcMetaError.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcMetaError.h b/gcc/m2/mc-boot/GmcMetaError.h
index 78dc1287905a93e7b511b45390951b39935a4819..a3c19c4c3a398f69bea6c5ac956ee7ac02e12e05 100644
--- a/gcc/m2/mc-boot/GmcMetaError.h
+++ b/gcc/m2/mc-boot/GmcMetaError.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcMetaError_H)
# define _mcMetaError_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcOptions.cc b/gcc/m2/mc-boot/GmcOptions.cc
index f6e4417b6593929b83ed18b8cf8a089029456f00..5a0606047092a46b3dbf6eaf62b7adc0355e469f 100644
--- a/gcc/m2/mc-boot/GmcOptions.cc
+++ b/gcc/m2/mc-boot/GmcOptions.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcOptions.h b/gcc/m2/mc-boot/GmcOptions.h
index b2ead1e4b41f7d40754f3b3b512ac9c4d26d51eb..4bb82ecfbe2bd375a39a940d7aed8c374ef9008a 100644
--- a/gcc/m2/mc-boot/GmcOptions.h
+++ b/gcc/m2/mc-boot/GmcOptions.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcOptions_H)
# define _mcOptions_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcPreprocess.cc b/gcc/m2/mc-boot/GmcPreprocess.cc
index 54d89bf33e75ac3931f13571832b1568e06c6485..741109ad7fbf40fd4dfe0fd035671a763807537a 100644
--- a/gcc/m2/mc-boot/GmcPreprocess.cc
+++ b/gcc/m2/mc-boot/GmcPreprocess.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcPreprocess.h b/gcc/m2/mc-boot/GmcPreprocess.h
index fcbd0c3dfd5937e97c66eac31b607585f923ecb3..f12c781d17383245b07c52dae1937f7484100fe7 100644
--- a/gcc/m2/mc-boot/GmcPreprocess.h
+++ b/gcc/m2/mc-boot/GmcPreprocess.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcPreprocess_H)
# define _mcPreprocess_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcPretty.cc b/gcc/m2/mc-boot/GmcPretty.cc
index c0be8c1e49915f0dd5c080573d5e35bed4b7d0bb..0bffa1ff6feb4025432e5dc2e01a4b550207c48c 100644
--- a/gcc/m2/mc-boot/GmcPretty.cc
+++ b/gcc/m2/mc-boot/GmcPretty.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcPretty.h b/gcc/m2/mc-boot/GmcPretty.h
index c1d59ced8cbd9f95a6cb82f2dc5d779addbbd78b..1a61c893261c7e29ec43973403bd2c4781572c30 100644
--- a/gcc/m2/mc-boot/GmcPretty.h
+++ b/gcc/m2/mc-boot/GmcPretty.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcPretty_H)
# define _mcPretty_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcPrintf.cc b/gcc/m2/mc-boot/GmcPrintf.cc
index dafa728437fdcd5c57c4677a5a680b43c85b9fbf..e91e55acc14c73501b25126b86c113da004dec81 100644
--- a/gcc/m2/mc-boot/GmcPrintf.cc
+++ b/gcc/m2/mc-boot/GmcPrintf.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcPrintf.h b/gcc/m2/mc-boot/GmcPrintf.h
index 1f242a885543c7376382b18d090028f3c01d6f77..46aeaacf888d6d906debc924dd9ac5227feed5b8 100644
--- a/gcc/m2/mc-boot/GmcPrintf.h
+++ b/gcc/m2/mc-boot/GmcPrintf.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcPrintf_H)
# define _mcPrintf_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcQuiet.cc b/gcc/m2/mc-boot/GmcQuiet.cc
index 3309f13d736c9ee5c3f9a0ed486328fc390e9021..d0f2f009b2a86ece8f6228f039d49ff60a524835 100644
--- a/gcc/m2/mc-boot/GmcQuiet.cc
+++ b/gcc/m2/mc-boot/GmcQuiet.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcQuiet.h b/gcc/m2/mc-boot/GmcQuiet.h
index be6f4eaa001978cbb8426075ae11c0e3035f7e12..9065ff9c578c4c6098df16f37d499e824ab68aac 100644
--- a/gcc/m2/mc-boot/GmcQuiet.h
+++ b/gcc/m2/mc-boot/GmcQuiet.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcQuiet_H)
# define _mcQuiet_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcReserved.cc b/gcc/m2/mc-boot/GmcReserved.cc
index 02132e48b4b8fbb007c12fc0880312f5c586cdc3..a42f1b1b0acb7a3b6124f98d418af8a43ea422e5 100644
--- a/gcc/m2/mc-boot/GmcReserved.cc
+++ b/gcc/m2/mc-boot/GmcReserved.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcReserved.h b/gcc/m2/mc-boot/GmcReserved.h
index b78170272499ba2e4951299f356f6fa92c0fe890..ab844ee5c93922046aac9efa5b6a3b6fa4b62677 100644
--- a/gcc/m2/mc-boot/GmcReserved.h
+++ b/gcc/m2/mc-boot/GmcReserved.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcReserved_H)
# define _mcReserved_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcSearch.cc b/gcc/m2/mc-boot/GmcSearch.cc
index 14d3e3fe0abd69b667377483be490cd447f828ae..e1a2aa63e29d99ff6df0db90998a1a3cb6b895f1 100644
--- a/gcc/m2/mc-boot/GmcSearch.cc
+++ b/gcc/m2/mc-boot/GmcSearch.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcSearch.h b/gcc/m2/mc-boot/GmcSearch.h
index 36ed6093637305a00f845b380a34982d07687f84..f4324a024364f2239b163eadf1573521847112ec 100644
--- a/gcc/m2/mc-boot/GmcSearch.h
+++ b/gcc/m2/mc-boot/GmcSearch.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcSearch_H)
# define _mcSearch_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcStack.cc b/gcc/m2/mc-boot/GmcStack.cc
index 8edae475e6de4d6afd9dba22bb47fbde547005ed..70f937b4299161810300f776a152506e5631e875 100644
--- a/gcc/m2/mc-boot/GmcStack.cc
+++ b/gcc/m2/mc-boot/GmcStack.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcStack.h b/gcc/m2/mc-boot/GmcStack.h
index 476ff65fe69d597d26cad68f0b9c6dc78417c81a..70b22be94f1db6e00675f5f4a52f07e1fcd9066a 100644
--- a/gcc/m2/mc-boot/GmcStack.h
+++ b/gcc/m2/mc-boot/GmcStack.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcStack_H)
# define _mcStack_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcStream.cc b/gcc/m2/mc-boot/GmcStream.cc
index 18430606d0faaf287924f11b87fd486379ab0c3e..da44d8f66a8e5afdcce214d0349f6c555d0e99ed 100644
--- a/gcc/m2/mc-boot/GmcStream.cc
+++ b/gcc/m2/mc-boot/GmcStream.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcStream.h b/gcc/m2/mc-boot/GmcStream.h
index 473b05df7ac1957edb40a81447b62731ad295df5..a156d880d540ef22da085619edc37530e910812c 100644
--- a/gcc/m2/mc-boot/GmcStream.h
+++ b/gcc/m2/mc-boot/GmcStream.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcStream_H)
# define _mcStream_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcflex.h b/gcc/m2/mc-boot/Gmcflex.h
index ff14f9fdfef9433896be0538604bb496d778c58c..9e6d4c48edfc86e1ac750b51a1d70bbc6d04f034 100644
--- a/gcc/m2/mc-boot/Gmcflex.h
+++ b/gcc/m2/mc-boot/Gmcflex.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcflex_H)
# define _mcflex_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp1.cc b/gcc/m2/mc-boot/Gmcp1.cc
index b0a4bb020dc3ac268676191024d3527c4ce423ea..03be328a9ad18a07f55b2ca4ff7e480b3492dac7 100644
--- a/gcc/m2/mc-boot/Gmcp1.cc
+++ b/gcc/m2/mc-boot/Gmcp1.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp1.h b/gcc/m2/mc-boot/Gmcp1.h
index 758d8c0ae3e08f8e5fce755cc57f5aacf05d7b01..878d1642c6251c758706e4c587a2c5465a07bbd9 100644
--- a/gcc/m2/mc-boot/Gmcp1.h
+++ b/gcc/m2/mc-boot/Gmcp1.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp1_H)
# define _mcp1_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp2.cc b/gcc/m2/mc-boot/Gmcp2.cc
index 5cdcd9ac5f6d923cb6ecf424c61b390a87494d4c..5f54798f7fc9f860aebcfb50b75e6d3490a0dd7d 100644
--- a/gcc/m2/mc-boot/Gmcp2.cc
+++ b/gcc/m2/mc-boot/Gmcp2.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp2.h b/gcc/m2/mc-boot/Gmcp2.h
index ec894e1ba265114e9e6a054d11911d9a4360e4d9..b483b2dc2485382dcd9b129ed51511db7646e466 100644
--- a/gcc/m2/mc-boot/Gmcp2.h
+++ b/gcc/m2/mc-boot/Gmcp2.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp2_H)
# define _mcp2_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp3.cc b/gcc/m2/mc-boot/Gmcp3.cc
index d7964c983f44d06c75518cb03b9bc4fc52ad0805..24ac0f51ad4e6b9a9828114aa73ed451aa66d102 100644
--- a/gcc/m2/mc-boot/Gmcp3.cc
+++ b/gcc/m2/mc-boot/Gmcp3.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp3.h b/gcc/m2/mc-boot/Gmcp3.h
index 87856ed51e1690e1baf851f1db01dcab56e0f774..0e00ddcdd9bef4e3f0a133a289ecb1d70516c818 100644
--- a/gcc/m2/mc-boot/Gmcp3.h
+++ b/gcc/m2/mc-boot/Gmcp3.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp3_H)
# define _mcp3_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp4.cc b/gcc/m2/mc-boot/Gmcp4.cc
index f9f4d3d4e4930c47e81993b37189fbef8c464dbc..4063d09727bb2bbf9f3106673e0067540c33e5b6 100644
--- a/gcc/m2/mc-boot/Gmcp4.cc
+++ b/gcc/m2/mc-boot/Gmcp4.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp4.h b/gcc/m2/mc-boot/Gmcp4.h
index c229beb3c20c9da5b1a094d67c6bb0f9ebc11cd4..643b939a63425339addad8bae0b3902e1e46a91e 100644
--- a/gcc/m2/mc-boot/Gmcp4.h
+++ b/gcc/m2/mc-boot/Gmcp4.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp4_H)
# define _mcp4_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp5.cc b/gcc/m2/mc-boot/Gmcp5.cc
index 134e7f2e25f2d5930c0f9a28782797a8283824f2..76cbd47298f9df311e6870241947a09f0bd376d8 100644
--- a/gcc/m2/mc-boot/Gmcp5.cc
+++ b/gcc/m2/mc-boot/Gmcp5.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp5.h b/gcc/m2/mc-boot/Gmcp5.h
index de3edb17922fbde76d7cc55f8e5a8d199c74f287..7989101e86ac7efe5262c80fc84e047c339779fb 100644
--- a/gcc/m2/mc-boot/Gmcp5.h
+++ b/gcc/m2/mc-boot/Gmcp5.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp5_H)
# define _mcp5_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GnameKey.cc b/gcc/m2/mc-boot/GnameKey.cc
index 8f4a330d0d905eb27710e5a0d69976e383a8d0e2..3e868886e293e58839fb4e751d5089ed44431f1c 100644
--- a/gcc/m2/mc-boot/GnameKey.cc
+++ b/gcc/m2/mc-boot/GnameKey.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GnameKey.h b/gcc/m2/mc-boot/GnameKey.h
index d4cce1b6bd36ed13fe97b81ddfdf5012d7882430..a2ea330b0634b3715989bb81e96a59c59f19c920 100644
--- a/gcc/m2/mc-boot/GnameKey.h
+++ b/gcc/m2/mc-boot/GnameKey.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_nameKey_H)
# define _nameKey_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GsymbolKey.cc b/gcc/m2/mc-boot/GsymbolKey.cc
index 50b8c8f56c3eb914c53362634a00387dc8f6d86d..17072597304b2a8b34f236ed39074ddb4e12b780 100644
--- a/gcc/m2/mc-boot/GsymbolKey.cc
+++ b/gcc/m2/mc-boot/GsymbolKey.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GsymbolKey.h b/gcc/m2/mc-boot/GsymbolKey.h
index 5d05977e50a0551f04e58f1e15702ad5c169e0bf..696709855161f0f0113edd5398d7819266c55c5f 100644
--- a/gcc/m2/mc-boot/GsymbolKey.h
+++ b/gcc/m2/mc-boot/GsymbolKey.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_symbolKey_H)
# define _symbolKey_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gtermios.h b/gcc/m2/mc-boot/Gtermios.h
index 70c0c49948e723cf2ff37567626c3c8ea8095173..acb7fcf0c76797b37a86ebc5944c58c48d0cc169 100644
--- a/gcc/m2/mc-boot/Gtermios.h
+++ b/gcc/m2/mc-boot/Gtermios.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_termios_H)
# define _termios_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gtop.cc b/gcc/m2/mc-boot/Gtop.cc
index 1a8597a0426365b7d92e0da15620825247f7f3fc..dfefe42c1da568a9edb4a2cf8ba266347c56a276 100644
--- a/gcc/m2/mc-boot/Gtop.cc
+++ b/gcc/m2/mc-boot/Gtop.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gvarargs.cc b/gcc/m2/mc-boot/Gvarargs.cc
index 32f984d24fcd4ee99ec87d90bd39e8d045056569..69f5f2c575648d9e05e1826af8b46fe82b10ae97 100644
--- a/gcc/m2/mc-boot/Gvarargs.cc
+++ b/gcc/m2/mc-boot/Gvarargs.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gvarargs.h b/gcc/m2/mc-boot/Gvarargs.h
index 8e3e91a1c426b8c51f720223a3d4c620b5c19115..82b5b753ba10907d42e885ca2075678c85c80ca7 100644
--- a/gcc/m2/mc-boot/Gvarargs.h
+++ b/gcc/m2/mc-boot/Gvarargs.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_varargs_H)
# define _varargs_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gwlists.cc b/gcc/m2/mc-boot/Gwlists.cc
index 9262329e77a0437875d15117b1fe74ad3d4e03a4..87daa42c3efd57ea33ba4db14e4a0d2d97e5ac17 100644
--- a/gcc/m2/mc-boot/Gwlists.cc
+++ b/gcc/m2/mc-boot/Gwlists.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gwlists.h b/gcc/m2/mc-boot/Gwlists.h
index 53bad73339a2bfa49a2f5a9704809794aaeef29a..05d65945b58955ead5002ee536b77275e20a3b66 100644
--- a/gcc/m2/mc-boot/Gwlists.h
+++ b/gcc/m2/mc-boot/Gwlists.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_wlists_H)
# define _wlists_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gwrapc.h b/gcc/m2/mc-boot/Gwrapc.h
index fdbeabcdadef5f6dcc8cb0b7d56658d47196baf7..e4db1e2a99f38ba04aadd29ff6763767feae6600 100644
--- a/gcc/m2/mc-boot/Gwrapc.h
+++ b/gcc/m2/mc-boot/Gwrapc.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_wrapc_H)
# define _wrapc_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/pge-boot/GIndexing.h b/gcc/m2/pge-boot/GIndexing.h
index 264e60ef4cfa29da6856082c8381225ce4518102..8e293aac9e218e19ae4203b8b4b449f46cffb49f 100644
--- a/gcc/m2/pge-boot/GIndexing.h
+++ b/gcc/m2/pge-boot/GIndexing.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Indexing_H)
# define _Indexing_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/pge-boot/GSEnvironment.h b/gcc/m2/pge-boot/GSEnvironment.h
index ccd96b7994d688dff6ae1be802d9e4ad4cf8ac5c..ba607238f32c5d5c373d9eca64c7f11a0537ae80 100644
--- a/gcc/m2/pge-boot/GSEnvironment.h
+++ b/gcc/m2/pge-boot/GSEnvironment.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_SEnvironment_H)
# define _SEnvironment_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/pge-boot/GScan.h b/gcc/m2/pge-boot/GScan.h
index ed3e780612b1cf29b5e740c9aa985c9a1425a842..e059cdc6473eb904ff1abff4f02319101c8eb15c 100644
--- a/gcc/m2/pge-boot/GScan.h
+++ b/gcc/m2/pge-boot/GScan.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_Scan_H)
# define _Scan_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/make-unique.h b/gcc/make-unique.h
index 5f7adf44b153ff23c0bf5c4f515e10740cb83db1..4909d0b165c4876eac7b1fc56e4438dd8c6afca4 100644
--- a/gcc/make-unique.h
+++ b/gcc/make-unique.h
@@ -20,15 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_MAKE_UNIQUE
#define GCC_MAKE_UNIQUE
-/* This header uses std::unique_ptr, but <memory> can't be directly
- included due to issues with macros. Hence <memory> must be included
- from system.h by defining INCLUDE_MEMORY in any source file using
- make-unique.h. */
-
-#ifndef INCLUDE_MEMORY
-# error "You must define INCLUDE_MEMORY before including system.h to use make-unique.h"
-#endif
-
#include <type_traits>
/* Minimal implementation of make_unique for C++11 compatibility
diff --git a/gcc/multiple_target.cc b/gcc/multiple_target.cc
index 0cceba68ce9ba88be29d66bc87484c253c92700a..c1e358dfc1eb026c0398c35811555d5f63ffed53 100644
--- a/gcc/multiple_target.cc
+++ b/gcc/multiple_target.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objc/objc-act.cc b/gcc/objc/objc-act.cc
index 02f84908eb0ddb11a720e30ebe7d2938969b92d3..909789bb124cefa9c56ec326a29f7602669da75e 100644
--- a/gcc/objc/objc-act.cc
+++ b/gcc/objc/objc-act.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objc/objc-encoding.cc b/gcc/objc/objc-encoding.cc
index ac951a21fdd6bcf0374e369c21f1b88cf52ef9ce..b91b5bb65150400b63aacc52ffabe5fe1a58753e 100644
--- a/gcc/objc/objc-encoding.cc
+++ b/gcc/objc/objc-encoding.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objc/objc-gnu-runtime-abi-01.cc b/gcc/objc/objc-gnu-runtime-abi-01.cc
index 1f504f437f5289b1a39c18564f7ae218289d86f2..2eca5f4446bb86af65500992e2187c85caa090a3 100644
--- a/gcc/objc/objc-gnu-runtime-abi-01.cc
+++ b/gcc/objc/objc-gnu-runtime-abi-01.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objc/objc-lang.cc b/gcc/objc/objc-lang.cc
index 430b6b2cb035ed4cb7f34766ed3b506fdce02b2c..ff36b6a7a4ace678984f69f243a64129b00d48f6 100644
--- a/gcc/objc/objc-lang.cc
+++ b/gcc/objc/objc-lang.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objc/objc-next-runtime-abi-01.cc b/gcc/objc/objc-next-runtime-abi-01.cc
index d4e8dd3a2d361faf99a8aaf1ead47f289f57f1ca..cd893fd0b4b19cd7f798699a3793619accc1d8b6 100644
--- a/gcc/objc/objc-next-runtime-abi-01.cc
+++ b/gcc/objc/objc-next-runtime-abi-01.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
of additions made for properties and optional protocol methods as
ABI=1 (module version 7). */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objc/objc-next-runtime-abi-02.cc b/gcc/objc/objc-next-runtime-abi-02.cc
index a9614e65dd3b1d4d2988b06d6f5364630c7b3393..248ef641281f12f54e2b5124e52628488c84a738 100644
--- a/gcc/objc/objc-next-runtime-abi-02.cc
+++ b/gcc/objc/objc-next-runtime-abi-02.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
This version is intended to match (logically) the output of Apple's
4.2.1 compiler. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objc/objc-runtime-shared-support.cc b/gcc/objc/objc-runtime-shared-support.cc
index bd40195a413c287fe7272bbf70ce114378ea54f6..21a88224a0a810ea5abb94fbd01c5ac1981309f1 100644
--- a/gcc/objc/objc-runtime-shared-support.cc
+++ b/gcc/objc/objc-runtime-shared-support.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objcp/objcp-decl.cc b/gcc/objcp/objcp-decl.cc
index ee213708036c875c4ffc8fd992f3fba235896e6b..4d28970a5738ce33ec1e60bef017fa29c88e4ea8 100644
--- a/gcc/objcp/objcp-decl.cc
+++ b/gcc/objcp/objcp-decl.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/objcp/objcp-lang.cc b/gcc/objcp/objcp-lang.cc
index 746b2eb9d7cbf66800d98635647e88ec82d1935a..c3445e4bbe11d55cd8c97a034d72fc37d3434c1f 100644
--- a/gcc/objcp/objcp-lang.cc
+++ b/gcc/objcp/objcp-lang.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/omp-expand.cc b/gcc/omp-expand.cc
index 80fb1843445d140b36c6e4ed932ce6be5ad6706c..8eb6f6f718cd9b8b4316a4ad8ad90c558bd20651 100644
--- a/gcc/omp-expand.cc
+++ b/gcc/omp-expand.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/omp-general.cc b/gcc/omp-general.cc
index c983f2b7ccd3f3cde300cb1f44b31e1c5c695ca6..2f1e117f4950f8ea58bd163fa2c894b0430cd290 100644
--- a/gcc/omp-general.cc
+++ b/gcc/omp-general.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc
index 32d252c6b39f12ca4b87b36914b246b6c7e7898a..33d81604cbe867004e06eb1358bdf705baab103d 100644
--- a/gcc/omp-low.cc
+++ b/gcc/omp-low.cc
@@ -22,7 +22,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/omp-oacc-neuter-broadcast.cc b/gcc/omp-oacc-neuter-broadcast.cc
index 651284ba35f34d4190b69830f0c0b67f1eceb702..64a596cf0eca975421efad183576305c725babb1 100644
--- a/gcc/omp-oacc-neuter-broadcast.cc
+++ b/gcc/omp-oacc-neuter-broadcast.cc
@@ -18,7 +18,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/omp-offload.cc b/gcc/omp-offload.cc
index 372b019f9d601e05f8c313d156780ad0724e72d9..f16a2921b4b970aeba0729a60086d03b348010f3 100644
--- a/gcc/omp-offload.cc
+++ b/gcc/omp-offload.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/omp-simd-clone.cc b/gcc/omp-simd-clone.cc
index 14a37f709482e6f9e8eb395dc2a52eb712346342..864586207ee89269b5a2cf136487440212d59695 100644
--- a/gcc/omp-simd-clone.cc
+++ b/gcc/omp-simd-clone.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/opt-problem.cc b/gcc/opt-problem.cc
index fc29333c331a7573c0ee0b7b40e2c0c6cdc9396e..941829eb6f4a049e82caaa00d80647c5e5e4226f 100644
--- a/gcc/opt-problem.cc
+++ b/gcc/opt-problem.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/optinfo-emit-json.cc b/gcc/optinfo-emit-json.cc
index 87a05a72dd3c0750a1e15f806764899133dc57d4..faae95fc232a06d11ef8acdc9fba45dade71dfef 100644
--- a/gcc/optinfo-emit-json.cc
+++ b/gcc/optinfo-emit-json.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/optinfo.cc b/gcc/optinfo.cc
index 48a270cbfea83685f300fe3b9f39e670ffdafcef..1978e228759c322ebc398d375dc8d0b34619dbe6 100644
--- a/gcc/optinfo.cc
+++ b/gcc/optinfo.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/optinfo.h b/gcc/optinfo.h
index db92294f3cab3678ec733df2ef16448f070849a1..812e39792c41fc9bd0f6becbf6c26baf33a9f275 100644
--- a/gcc/optinfo.h
+++ b/gcc/optinfo.h
@@ -21,15 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_OPTINFO_H
#define GCC_OPTINFO_H
-/* This header uses std::unique_ptr, but <memory> can't be directly
- included due to issues with macros. Hence <memory> must be included
- from system.h by defining INCLUDE_MEMORY in any source file using
- optinfo.h. */
-
-#ifndef INCLUDE_MEMORY
-# error "You must define INCLUDE_MEMORY before including system.h to use optinfo.h"
-#endif
-
/* An "optinfo" is a bundle of information describing part of an
optimization, which can be emitted to zero or more of several
destinations, such as:
diff --git a/gcc/opts-common.cc b/gcc/opts-common.cc
index 6ab26051297bf58f558c152dc08749383fcf0bfe..2594e5a564326b6cc718e2cfbe8b1b1f4a6bad94 100644
--- a/gcc/opts-common.cc
+++ b/gcc/opts-common.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/opts-diagnostic.cc b/gcc/opts-diagnostic.cc
index 2c7e95260f70ddece4ef27ba5db726028168be63..b4532c6684a0ff1780845cab1521ccd5efcb7812 100644
--- a/gcc/opts-diagnostic.cc
+++ b/gcc/opts-diagnostic.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ARRAY
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
diff --git a/gcc/opts-global.cc b/gcc/opts-global.cc
index cbf4018b1202e1e2c45a2b3758369e8e0d0dae7a..385018fcf88e8e5c8389018dde0e39879138055a 100644
--- a/gcc/opts-global.cc
+++ b/gcc/opts-global.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/opts.cc b/gcc/opts.cc
index 64d130c46c0e5215a01d50d2ad83bee89bbfcf1a..826a822af080a8c9548b6ab78c31f533c82f8380 100644
--- a/gcc/opts.cc
+++ b/gcc/opts.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "intl.h"
diff --git a/gcc/pair-fusion.cc b/gcc/pair-fusion.cc
index ff84c169b91c6408a1a013d22d94fed21704f6d6..ccbb5511e9d17aed5e5b523afb3e96be92bdaf78 100644
--- a/gcc/pair-fusion.cc
+++ b/gcc/pair-fusion.cc
@@ -20,7 +20,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
#define INCLUDE_LIST
-#define INCLUDE_MEMORY
#define INCLUDE_TYPE_TRAITS
#define INCLUDE_ARRAY
#include "config.h"
diff --git a/gcc/passes.cc b/gcc/passes.cc
index d1e6fe3b91a3f5e0c2db342a312d4f286c2ecaed..ae80f40b96a56cce426dd90c7474d8ee77852807 100644
--- a/gcc/passes.cc
+++ b/gcc/passes.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
in the proper order, and counts the time used by each.
Error messages and low-level interface to malloc also handled here. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/pointer-query.cc b/gcc/pointer-query.cc
index 602cd5c2da1a12689b6527066c122678b4e521fe..dcef074d8a20a478e8dcc38c253bbd0a611e102f 100644
--- a/gcc/pointer-query.cc
+++ b/gcc/pointer-query.cc
@@ -18,7 +18,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/predict.cc b/gcc/predict.cc
index 1f8dc7402f5bad59f69acbd877883cedac880588..dab981121d6544d442e521897a3e376e5b946f58 100644
--- a/gcc/predict.cc
+++ b/gcc/predict.cc
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
[3] "Corpus-based Static Branch Prediction"
Calder, Grunwald, Lindsay, Martin, Mozer, and Zorn; PLDI '95. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/pretty-print.cc b/gcc/pretty-print.cc
index a3f369132dd0449470fb66309761baeab95986a5..0482ca189b70cfb64bc95ce3736658c26c7bf8ef 100644
--- a/gcc/pretty-print.cc
+++ b/gcc/pretty-print.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h
index 14a6e9b4f5a1443ebae68b95f1203f71c9863d41..1568870f82a902c2c2483909215902c3d74715a3 100644
--- a/gcc/pretty-print.h
+++ b/gcc/pretty-print.h
@@ -21,14 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_PRETTY_PRINT_H
#define GCC_PRETTY_PRINT_H
-/* This header uses std::unique_ptr, but <memory> can't be directly
- included due to issues with macros. Hence it must be included from
- system.h by defining INCLUDE_MEMORY in any source file using it. */
-
-#ifndef INCLUDE_MEMORY
-# error "You must define INCLUDE_MEMORY before including system.h to use pretty-print.h"
-#endif
-
#include "obstack.h"
#include "rich-location.h"
#include "diagnostic-url.h"
diff --git a/gcc/print-rtl.cc b/gcc/print-rtl.cc
index 1688d4ec5c8febc876987c0c5bce192885fe96d1..69c2e196e041bca4cbb2c821526984fe010b02f5 100644
--- a/gcc/print-rtl.cc
+++ b/gcc/print-rtl.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#endif
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "tm.h"
diff --git a/gcc/print-tree.cc b/gcc/print-tree.cc
index d313a2adfaf7a051eb8cbcf63232e0e6a90229b6..0dda09a99e3f0b7e1492def01703284962f1462c 100644
--- a/gcc/print-tree.cc
+++ b/gcc/print-tree.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/profile-count.cc b/gcc/profile-count.cc
index 0f30fa2615380cbc4f8558629409a16ef69efe20..b26f38e33e474583affe18ded37bc820c50f3863 100644
--- a/gcc/profile-count.cc
+++ b/gcc/profile-count.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/range-op-float.cc b/gcc/range-op-float.cc
index a42bca0280f73ae177138ed848bd8240e10274d3..2754dd875682952312f0ec0873e1a183acd4c35b 100644
--- a/gcc/range-op-float.cc
+++ b/gcc/range-op-float.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/range-op-ptr.cc b/gcc/range-op-ptr.cc
index ccce05035b9687878cc80083d07c336e73569fb2..56189ff128183b9d8746c9cac47c9410ed8efacc 100644
--- a/gcc/range-op-ptr.cc
+++ b/gcc/range-op-ptr.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/range-op.cc b/gcc/range-op.cc
index 5a1eb59f3cd40da9262b722a32288ff559473fae..a2c5c9ac24759b5940d574fc14aecb9bdddec2fc 100644
--- a/gcc/range-op.cc
+++ b/gcc/range-op.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/range.cc b/gcc/range.cc
index 3b56556c87e38e13b560c37e6f59b2ad627956ea..5ee0edc54f6badc832b9d5d82087169204147888 100644
--- a/gcc/range.cc
+++ b/gcc/range.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/read-rtl-function.cc b/gcc/read-rtl-function.cc
index 51dc11928d05a448af2a7a19e554a95f11926ac5..fa1aeb53759caceedf9249aef25fbd92554164c9 100644
--- a/gcc/read-rtl-function.cc
+++ b/gcc/read-rtl-function.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/rtl-error.cc b/gcc/rtl-error.cc
index 0a92a1ad2c0f327730ec8c523fc258f27a84e9b1..6d05f0b96268c31465c1a39afdaffb0f54123f80 100644
--- a/gcc/rtl-error.cc
+++ b/gcc/rtl-error.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/rtl-ssa/accesses.cc b/gcc/rtl-ssa/accesses.cc
index 9fa7fee621c6498d5b8a23958574168de49382dc..ef99759871aa2a1a1dffb8d024cdaff22d1fb800 100644
--- a/gcc/rtl-ssa/accesses.cc
+++ b/gcc/rtl-ssa/accesses.cc
@@ -19,7 +19,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/rtl-ssa/blocks.cc b/gcc/rtl-ssa/blocks.cc
index 780a241cab67048dd2c3d9ba95cf9329ab36812a..dfc4e7d0610d0d0e3db317cddf6f69a877ad3522 100644
--- a/gcc/rtl-ssa/blocks.cc
+++ b/gcc/rtl-ssa/blocks.cc
@@ -19,7 +19,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/rtl-ssa/changes.cc b/gcc/rtl-ssa/changes.cc
index 5f3a0f0f0ecc297aa2a278f8ed0336465003b552..4159a9798f08bbb6af08adce3ea0b30eaf6b9459 100644
--- a/gcc/rtl-ssa/changes.cc
+++ b/gcc/rtl-ssa/changes.cc
@@ -19,7 +19,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/rtl-ssa/functions.cc b/gcc/rtl-ssa/functions.cc
index b14fb076da0cc4e57573c672c1c60c2e2bec5600..bffccc57aabc9a59474db9d2fdc7c68b06e4bc2c 100644
--- a/gcc/rtl-ssa/functions.cc
+++ b/gcc/rtl-ssa/functions.cc
@@ -19,7 +19,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/rtl-ssa/insns.cc b/gcc/rtl-ssa/insns.cc
index 4af79bee7b9ab04ecb2af3e3da2f646c0199ff39..e6f06b26f2225d87440fc8a023e0223248f7ded1 100644
--- a/gcc/rtl-ssa/insns.cc
+++ b/gcc/rtl-ssa/insns.cc
@@ -19,7 +19,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/rtl-ssa/movement.cc b/gcc/rtl-ssa/movement.cc
index c34c70da1944571a6a1b0ec3a650d41ec5313722..38432119f334645fb309fa4c5615e5d4b3468c72 100644
--- a/gcc/rtl-ssa/movement.cc
+++ b/gcc/rtl-ssa/movement.cc
@@ -19,7 +19,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_FUNCTIONAL
-#define INCLUDE_MEMORY
#define INCLUDE_ARRAY
#include "config.h"
#include "system.h"
diff --git a/gcc/rtl-tests.cc b/gcc/rtl-tests.cc
index ef717cc22f32bb970fb56c9bff3f40d66bb7a536..4569770a238b2d2a3385c21659eecec6569d9536 100644
--- a/gcc/rtl-tests.cc
+++ b/gcc/rtl-tests.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.cc b/gcc/rust/resolve/rust-ast-resolve-expr.cc
index 74f11dd215c98d5a543507030bf76a146b4b5ffd..5520dc2350170162deb75a1353a8e203b4ce46eb 100644
--- a/gcc/rust/resolve/rust-ast-resolve-expr.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-expr.cc
@@ -16,7 +16,6 @@
// along with GCC; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-#define INCLUDE_MEMORY
#include "rust-ast-resolve-expr.h"
#include "rust-ast-resolve-stmt.h"
#include "rust-ast-resolve-struct-expr-field.h"
diff --git a/gcc/rust/rust-attribs.cc b/gcc/rust/rust-attribs.cc
index ddcef72f07eb024bf259a3bcb0fc4a94f16d0950..86d5b3dfeb9ffc8d58560d72f9485af29cab3d1b 100644
--- a/gcc/rust/rust-attribs.cc
+++ b/gcc/rust/rust-attribs.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/rust/rust-system.h b/gcc/rust/rust-system.h
index 1833b93542d17315a6680f8f41fc6c01b856c6ba..2382e5b1fb4e28eae5c5b067fefdd6102d836991 100644
--- a/gcc/rust/rust-system.h
+++ b/gcc/rust/rust-system.h
@@ -21,7 +21,6 @@
#define RUST_SYSTEM_H
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#include "config.h"
/* Define this so that inttypes.h defines the PRI?64 macros even
diff --git a/gcc/sanopt.cc b/gcc/sanopt.cc
index 0d79a0271f736967310cb4894d0813f37c4bdcc4..604db6b3912a6a21bb9c29dd531799cf057d666a 100644
--- a/gcc/sanopt.cc
+++ b/gcc/sanopt.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/sched-rgn.cc b/gcc/sched-rgn.cc
index 4f511b3ca504005466edd3b462cf710a5a2eb82a..3d8cff76aaf952246a31e6059aa02ce98c1e4755 100644
--- a/gcc/sched-rgn.cc
+++ b/gcc/sched-rgn.cc
@@ -43,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
priorities are computed, and (3) block level: insns in the block
are actually scheduled. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/selftest-diagnostic-path.cc b/gcc/selftest-diagnostic-path.cc
index 1b0ba2c1a3fb7701155330765ad01e0ca48154bc..6d21f2e55999c6b8f3a70677f6cb4723dcaf6130 100644
--- a/gcc/selftest-diagnostic-path.cc
+++ b/gcc/selftest-diagnostic-path.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/selftest-diagnostic.cc b/gcc/selftest-diagnostic.cc
index 0c23085b9ec4fbcb891e06eee5303449d11139ca..7e2d1c227aafd607298b1fae2bd76bdd79b24419 100644
--- a/gcc/selftest-diagnostic.cc
+++ b/gcc/selftest-diagnostic.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/selftest-json.cc b/gcc/selftest-json.cc
index 4f52a87538ae9c0f798c25e0daa4988153016a8b..1480ded6ba00f34d915202e7facd4a99eb5f5389 100644
--- a/gcc/selftest-json.cc
+++ b/gcc/selftest-json.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "diagnostic.h"
diff --git a/gcc/sese.cc b/gcc/sese.cc
index fce6855207d17440966799d7ac2e86977685bc18..0b55f0ad0bd7a09119a100d8ec6742d92e89d7f3 100644
--- a/gcc/sese.cc
+++ b/gcc/sese.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/simple-diagnostic-path.cc b/gcc/simple-diagnostic-path.cc
index f92ea169a213a4f6313e6aea9f1913dde59e98b9..14cf83d92220491b8baf3abc983622c62dbc690e 100644
--- a/gcc/simple-diagnostic-path.cc
+++ b/gcc/simple-diagnostic-path.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/splay-tree-utils.cc b/gcc/splay-tree-utils.cc
index eb99b6b0e4b4304b164464cdda854a2d9775019c..6437a5a98fa69adb0c53172ef79445966a16e04f 100644
--- a/gcc/splay-tree-utils.cc
+++ b/gcc/splay-tree-utils.cc
@@ -19,7 +19,6 @@
#define INCLUDE_ALGORITHM
#define INCLUDE_ARRAY
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/sreal.cc b/gcc/sreal.cc
index b9f049748ef3577c37979c09dd8e04989a7c89fe..be557e7de803ad14e96b809ac4fdccfaab6a6bcf 100644
--- a/gcc/sreal.cc
+++ b/gcc/sreal.cc
@@ -47,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
sig == 0 && exp == -SREAL_MAX_EXP
*/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <math.h>
diff --git a/gcc/stmt.cc b/gcc/stmt.cc
index bb9cdf2cc951fd0503ce35ebdece732903ca8302..1a76e05de2dbee04e2dcfc13ff6f94e3d147a40e 100644
--- a/gcc/stmt.cc
+++ b/gcc/stmt.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
The functions whose names start with `expand_' are called by the
expander to generate RTL instructions for various kinds of constructs. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/substring-locations.cc b/gcc/substring-locations.cc
index 96224d3c8d0075485acb2253a933299d5e670a69..156c12134baf4bf1d31b49f865b1af24f0123a46 100644
--- a/gcc/substring-locations.cc
+++ b/gcc/substring-locations.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/symtab-clones.cc b/gcc/symtab-clones.cc
index 79c93125af50329e84312878abfcfca000cf229c..d50a95ebec60de412c8143032e4d242a602fcddb 100644
--- a/gcc/symtab-clones.cc
+++ b/gcc/symtab-clones.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/symtab-thunks.cc b/gcc/symtab-thunks.cc
index f754a8a96e20f388af927a9bd9b96d0cfd590618..c7ca06ff479846e2ece770a931264edacae57b7f 100644
--- a/gcc/symtab-thunks.cc
+++ b/gcc/symtab-thunks.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/symtab.cc b/gcc/symtab.cc
index 762a6236ca1e199ab0b5aa78ba51624d72900ecd..5be463ff7682a39e25a6346c5bbfd2f76b1f1af3 100644
--- a/gcc/symtab.cc
+++ b/gcc/symtab.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/system.h b/gcc/system.h
index c18c7c5ec58d861e92b16a468ef7e79b5983d462..c209871df72d3046c0b881539815ff220f937bea 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -222,6 +222,7 @@ extern int fprintf_unlocked (FILE *, const char *, ...);
#ifdef INCLUDE_FUNCTIONAL
# include <functional>
#endif
+# include <memory>
# include <cstring>
# include <initializer_list>
# include <new>
@@ -758,13 +759,6 @@ private:
#define LIKELY(x) (__builtin_expect ((x), 1))
#define UNLIKELY(x) (__builtin_expect ((x), 0))
-/* Some of the headers included by <memory> can use "abort" within a
- namespace, e.g. "_VSTD::abort();", which fails after we use the
- preprocessor to redefine "abort" as "fancy_abort" below. */
-
-#ifdef INCLUDE_MEMORY
-# include <memory>
-#endif
#ifdef INCLUDE_MUTEX
# include <mutex>
diff --git a/gcc/targhooks.cc b/gcc/targhooks.cc
index 304b35ed77244aeab5be96e007ae77bff68876da..8a69051ac4a09f30382a4886d73e3fe11c957eec 100644
--- a/gcc/targhooks.cc
+++ b/gcc/targhooks.cc
@@ -47,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
comment can thus be removed at that point. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "target.h"
diff --git a/gcc/text-art/box-drawing.cc b/gcc/text-art/box-drawing.cc
index e6092735bbe505a221ee54436a7ab34b964e90e4..7057a4eac60ddfc435a6f4d8bcf677e846b01eb5 100644
--- a/gcc/text-art/box-drawing.cc
+++ b/gcc/text-art/box-drawing.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/canvas.cc b/gcc/text-art/canvas.cc
index b2315d96d0df250d3f3d9fde1bedc53b91f4cb86..8e5d96808d8c2ae3f8e46d6fbf67fdd7c6906a9b 100644
--- a/gcc/text-art/canvas.cc
+++ b/gcc/text-art/canvas.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/ruler.cc b/gcc/text-art/ruler.cc
index 2abc36fc7c9c4803cab699f387872bf7a615ffd6..f80d9bb8758cb31e4ffccb01bd92366331648ce5 100644
--- a/gcc/text-art/ruler.cc
+++ b/gcc/text-art/ruler.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/selftests.cc b/gcc/text-art/selftests.cc
index 3c72c9439296709c214d40f407195e79938964a4..2b113b6b0177899e9b3977837fcc98cb5ec68475 100644
--- a/gcc/text-art/selftests.cc
+++ b/gcc/text-art/selftests.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/style.cc b/gcc/text-art/style.cc
index e5e9bdfdf7b7b242e8e644841426e7df407deefd..e1128394c7adbaa6e6bbf4cb14c34c0dcf880438 100644
--- a/gcc/text-art/style.cc
+++ b/gcc/text-art/style.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/styled-string.cc b/gcc/text-art/styled-string.cc
index 988fe8a742aa6276a793e0dba483e27ebdfb72c5..e6139399fb8e26d3a2b2e0782e392752a9323c5b 100644
--- a/gcc/text-art/styled-string.cc
+++ b/gcc/text-art/styled-string.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/table.cc b/gcc/text-art/table.cc
index 53f7126abce19753535aa0a13e690f6e37369599..92bab6a11768970debd924cdd5031d082b5b2fe3 100644
--- a/gcc/text-art/table.cc
+++ b/gcc/text-art/table.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/theme.cc b/gcc/text-art/theme.cc
index 580c931aef2c02ae5ef870703e17dc6e4076fe63..e51b8ef7a84cee23f1fbe70c00e82d05c6b60cb2 100644
--- a/gcc/text-art/theme.cc
+++ b/gcc/text-art/theme.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/tree-widget.cc b/gcc/text-art/tree-widget.cc
index 69282e46a44c3b2db771efca667fb836c53b80d9..0758063ffda4439479295c65a4aac16f69b08b26 100644
--- a/gcc/text-art/tree-widget.cc
+++ b/gcc/text-art/tree-widget.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/text-art/widget.cc b/gcc/text-art/widget.cc
index 38df5ad540c24a603036e8e1c76f5e0e9f695b33..7cc9bad4fe2537410d68fdd2bafb4cb71ecb5587 100644
--- a/gcc/text-art/widget.cc
+++ b/gcc/text-art/widget.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/timevar.cc b/gcc/timevar.cc
index e12775e6ff3ae6356009ee9d80538fdb9740204f..29c0152c6158c335a7df62de60ba7f494fd5c90b 100644
--- a/gcc/timevar.cc
+++ b/gcc/timevar.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "timevar.h"
diff --git a/gcc/toplev.cc b/gcc/toplev.cc
index 779049674b4f4d551236e82e8c1c00b480c40d52..1bb94db3916fe7bc0e2f53899f48c6ae56d03317 100644
--- a/gcc/toplev.cc
+++ b/gcc/toplev.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
Error messages and low-level interface to malloc also handled here. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/trans-mem.cc b/gcc/trans-mem.cc
index e9139b5fe5345450a611e5e6108bfed9f1c8d3f6..3668a2744e4ccf3338c6ad7c595e6f1a05f98821 100644
--- a/gcc/trans-mem.cc
+++ b/gcc/trans-mem.cc
@@ -19,7 +19,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-affine.cc b/gcc/tree-affine.cc
index 1373664dff1c37bafe24638f842f621e0f5e5cc4..76117aa4fd6dc1ff27d82e3b4c0011b81fe18fcb 100644
--- a/gcc/tree-affine.cc
+++ b/gcc/tree-affine.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-assume.cc b/gcc/tree-assume.cc
index 5c6e0832028e227eae73581e162657578dd36a80..883338bcef1e41e15a67fd015834d74319ca11af 100644
--- a/gcc/tree-assume.cc
+++ b/gcc/tree-assume.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-call-cdce.cc b/gcc/tree-call-cdce.cc
index 077d6fda6e8b47139eae01ada0d57bd8ccca9eb7..befe6acf178a78e9349ae38cb66e340a8151ab24 100644
--- a/gcc/tree-call-cdce.cc
+++ b/gcc/tree-call-cdce.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc
index c2100a51a7a56dce2075ee2729440934d1c1ddeb..9ac8304e6769e6f179c9e88174682b73160b8e93 100644
--- a/gcc/tree-cfg.cc
+++ b/gcc/tree-cfg.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-chrec.cc b/gcc/tree-chrec.cc
index 0c9776f29997d3bf8e90121e2916261e2c040c39..9b272074a2ed34b06ad3b557278e689f0760f66b 100644
--- a/gcc/tree-chrec.cc
+++ b/gcc/tree-chrec.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
variables.
*/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-data-ref.cc b/gcc/tree-data-ref.cc
index 1fdfef282c7234c8bcb3fb9a94e64a1846a65466..cc499102617958bc923054dada96e2d983a642b3 100644
--- a/gcc/tree-data-ref.cc
+++ b/gcc/tree-data-ref.cc
@@ -74,7 +74,6 @@ along with GCC; see the file COPYING3. If not see
*/
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-dfa.cc b/gcc/tree-dfa.cc
index 96719463e69055a733139c4ffd6ad0d2c2d1e976..77e119a6b1b2b2ee46d9ea7317bc93c9e9eca4bc 100644
--- a/gcc/tree-dfa.cc
+++ b/gcc/tree-dfa.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-diagnostic-client-data-hooks.cc b/gcc/tree-diagnostic-client-data-hooks.cc
index d966cf50f0d3d9220e18f489339b016a4e11807f..3bc4ad2f2bc5c75db6411d01dc6f84dde2d17c5e 100644
--- a/gcc/tree-diagnostic-client-data-hooks.cc
+++ b/gcc/tree-diagnostic-client-data-hooks.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "version.h"
diff --git a/gcc/tree-diagnostic.cc b/gcc/tree-diagnostic.cc
index 84e7ae7721fca7e4c15ec09fa6754f6e7334a7bc..6a5eccdd765b81a4bced5ba50aa3e2f162659019 100644
--- a/gcc/tree-diagnostic.cc
+++ b/gcc/tree-diagnostic.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-dump.cc b/gcc/tree-dump.cc
index 46908780ad6230113bc0a5976572d913ba431830..ba3cf1a2fe3b95e1c8eb18db7a39cc1971df9c1d 100644
--- a/gcc/tree-dump.cc
+++ b/gcc/tree-dump.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc
index f1a1f8fd0d3513f6e0bbe9090e04ccd6fc98344f..1d3deac54a7e554e4475e3054a9743eede975d0f 100644
--- a/gcc/tree-if-conv.cc
+++ b/gcc/tree-if-conv.cc
@@ -81,7 +81,6 @@ along with GCC; see the file COPYING3. If not see
*/
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-inline.cc b/gcc/tree-inline.cc
index d89b7ce74aaace5c0fa5746b4413b8f0db658119..8f86fb72328873d4ba7f580771b08ec49becaff7 100644
--- a/gcc/tree-inline.cc
+++ b/gcc/tree-inline.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-into-ssa.cc b/gcc/tree-into-ssa.cc
index 4e80ffaedf3fd343266808d54efe80461fad59a2..df1fb1869628bfda8b7f8617f736bee96bae9410 100644
--- a/gcc/tree-into-ssa.cc
+++ b/gcc/tree-into-ssa.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-logical-location.cc b/gcc/tree-logical-location.cc
index 5967e13e1ff9582fd807f045c119782424d89c97..ca8b34a42d36bcd6a14ac0f4f06457ef47b9bc0c 100644
--- a/gcc/tree-logical-location.cc
+++ b/gcc/tree-logical-location.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-loop-distribution.cc b/gcc/tree-loop-distribution.cc
index c912dce62233024802010257f3576b052fcdf56a..59d3cb20180307199693de0466738dcbef8a57cf 100644
--- a/gcc/tree-loop-distribution.cc
+++ b/gcc/tree-loop-distribution.cc
@@ -90,7 +90,6 @@ along with GCC; see the file COPYING3. If not see
data reuse. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-nested.cc b/gcc/tree-nested.cc
index cece04fea2ee85fbf5f77b1d87729ed7883c20b6..baa960c053440e610b68668234d0ccae8d58bd61 100644
--- a/gcc/tree-nested.cc
+++ b/gcc/tree-nested.cc
@@ -17,7 +17,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-nrv.cc b/gcc/tree-nrv.cc
index aa01b96c953cb9b4e69fec96be1f1dfd9edb7ed3..0a8f359790a82fd378e458135baa4fc79738fb0c 100644
--- a/gcc/tree-nrv.cc
+++ b/gcc/tree-nrv.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc
index 6413ebcca37c72f2a20cd2a8620438fd637647c7..b7add09fdbbea9f83cf6cb105d38a2a6be037a53 100644
--- a/gcc/tree-object-size.cc
+++ b/gcc/tree-object-size.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-outof-ssa.cc b/gcc/tree-outof-ssa.cc
index f203c8e70056e2b7278da2bcc9ec2ef664f8965f..3df8054a729942bdb22eae94c4dac508a4ee590f 100644
--- a/gcc/tree-outof-ssa.cc
+++ b/gcc/tree-outof-ssa.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-parloops.cc b/gcc/tree-parloops.cc
index ea4cabc5ce41b444717029a8daae489b7e5c0618..13d8e84bc8f3a1d9d6936257acc9f385fb3b69ff 100644
--- a/gcc/tree-parloops.cc
+++ b/gcc/tree-parloops.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-predcom.cc b/gcc/tree-predcom.cc
index e29c0536ad1829426dc584806e00b9ea3fc3fe2c..31d359ea8287ef9614cf081b55d2de3bc56053ff 100644
--- a/gcc/tree-predcom.cc
+++ b/gcc/tree-predcom.cc
@@ -205,7 +205,6 @@ along with GCC; see the file COPYING3. If not see
i * i with ii_last + 2 * i + 1), to generalize strength reduction. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-pretty-print.cc b/gcc/tree-pretty-print.cc
index cacef9457e65b0be275ca32327326ee6301112e1..1582a4ebc3d7c58763b98d870af835fb92df3321 100644
--- a/gcc/tree-pretty-print.cc
+++ b/gcc/tree-pretty-print.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-profile.cc b/gcc/tree-profile.cc
index 91a14927cdc4a69724c35172f96ce5efb4ea4248..153c9323040a331bb942cb001b1756ccafb37fb3 100644
--- a/gcc/tree-profile.cc
+++ b/gcc/tree-profile.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
/* Generate basic block profile instrumentation and auxiliary files.
Tree-based version. See profile.cc for overview. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-scalar-evolution.cc b/gcc/tree-scalar-evolution.cc
index 357e21013e11b09daef0d21bc59521f33bea2e82..abb2bad777375889d6c980b54d60699672fd5742 100644
--- a/gcc/tree-scalar-evolution.cc
+++ b/gcc/tree-scalar-evolution.cc
@@ -253,7 +253,6 @@ along with GCC; see the file COPYING3. If not see
at: http://cri.ensmp.fr/~pop/gcc/20040604/gccsummit-lno-spop.pdf
*/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-sra.cc b/gcc/tree-sra.cc
index 41102f6b50ab722808309b79a2dcf1303037bc58..6ad095c52673cfc8399c8a3136627b19d254d240 100644
--- a/gcc/tree-sra.cc
+++ b/gcc/tree-sra.cc
@@ -71,7 +71,6 @@ along with GCC; see the file COPYING3. If not see
Finally, if a parameter got scalarized, the scalar replacements are
initialized with values from respective parameter aggregates. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-address.cc b/gcc/tree-ssa-address.cc
index 61f54ec0776871010de774408d2250cbbfb20d0b..c4dfa371bb8cf6f42b2b1fe93a29928c76765aaa 100644
--- a/gcc/tree-ssa-address.cc
+++ b/gcc/tree-ssa-address.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
/* Utility functions for manipulation with TARGET_MEM_REFs -- tree expressions
that directly map to addressing modes of the target. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-alias.cc b/gcc/tree-ssa-alias.cc
index 8ad6a02ddc92d124c789958a125c6584e6c21ec3..386ad3340700a6b76adb47a6c26648b520559000 100644
--- a/gcc/tree-ssa-alias.cc
+++ b/gcc/tree-ssa-alias.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-ccp.cc b/gcc/tree-ssa-ccp.cc
index fcb91c583352c9ea8abc9d8d6fe34c6f13e9c074..21c5440c9a25d844f9ccba2f70dca277e65ef446 100644
--- a/gcc/tree-ssa-ccp.cc
+++ b/gcc/tree-ssa-ccp.cc
@@ -118,7 +118,6 @@ along with GCC; see the file COPYING3. If not see
Advanced Compiler Design and Implementation,
Steven Muchnick, Morgan Kaufmann, 1997, Section 12.6 */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-coalesce.cc b/gcc/tree-ssa-coalesce.cc
index 50ca82b06777f5a608e5d1ff9ddaf870d4d7236f..2203a7b320edce4e2c6e0a1f91c93d142b92d029 100644
--- a/gcc/tree-ssa-coalesce.cc
+++ b/gcc/tree-ssa-coalesce.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-copy.cc b/gcc/tree-ssa-copy.cc
index 6cbf59412e772a51dc00f1ab6801f4a2d2ab337c..9c9ec47adcaa221e9614d61ca8c04ee94b0aefcf 100644
--- a/gcc/tree-ssa-copy.cc
+++ b/gcc/tree-ssa-copy.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-dce.cc b/gcc/tree-ssa-dce.cc
index 70e3843cabfd651d15dbf0a0c81b9872456f753e..ad3ac2785cf76e05492f19446cfa1d48082b80a2 100644
--- a/gcc/tree-ssa-dce.cc
+++ b/gcc/tree-ssa-dce.cc
@@ -42,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
giving values to operands in necessary statements; and
3. Removing dead statements. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc
index 1c73966bf8a3d4501b3cf278e9529a1cf8d85448..8cc07bfb11923e9a7b36aa4433e440d1b312aac7 100644
--- a/gcc/tree-ssa-dom.cc
+++ b/gcc/tree-ssa-dom.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-dse.cc b/gcc/tree-ssa-dse.cc
index 63bf4491cf6d0521ce48c427a6985ee6923dae6c..c5b42507b38a9a9bd9364cbdf17ae09b41ae2ef8 100644
--- a/gcc/tree-ssa-dse.cc
+++ b/gcc/tree-ssa-dse.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-forwprop.cc b/gcc/tree-ssa-forwprop.cc
index 8088cc190d11a2203950369b3d0313e3cfe15471..7cae08f0d798d1c8874cb1eb2d771a4320ea62ec 100644
--- a/gcc/tree-ssa-forwprop.cc
+++ b/gcc/tree-ssa-forwprop.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-ifcombine.cc b/gcc/tree-ssa-ifcombine.cc
index 9b9dc10cd2202a6c8511f90610e8e27d67e8b7ab..9a4c6a3f4d1db578cf6c01b90e615dd6442102b6 100644
--- a/gcc/tree-ssa-ifcombine.cc
+++ b/gcc/tree-ssa-ifcombine.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-live.cc b/gcc/tree-ssa-live.cc
index 484698899cfeda3cbf89d66778f370bb5291172c..d5dc0ec519bff691b8d0f453d0b019e18a1e6cbf 100644
--- a/gcc/tree-ssa-live.cc
+++ b/gcc/tree-ssa-live.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-loop-ch.cc b/gcc/tree-ssa-loop-ch.cc
index 0ce8a56642aa5bbd1b9141c6f7a5e4a7e1b2fe96..d03052c39e40648b3b8aa9231e726b5627a62028 100644
--- a/gcc/tree-ssa-loop-ch.cc
+++ b/gcc/tree-ssa-loop-ch.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-loop-im.cc b/gcc/tree-ssa-loop-im.cc
index 7a9055f478581ee147e4dec8ac68dcc35a25dfe4..538a0588d332ee13338507a12a1913618b82f11c 100644
--- a/gcc/tree-ssa-loop-im.cc
+++ b/gcc/tree-ssa-loop-im.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.cc b/gcc/tree-ssa-loop-ivcanon.cc
index 48b126dfcf8e57723de91df26b7ae1b14cf0cf02..0d496d738304aa73f2f64937aaf8f77006cc6dc3 100644
--- a/gcc/tree-ssa-loop-ivcanon.cc
+++ b/gcc/tree-ssa-loop-ivcanon.cc
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
info). */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-loop-ivopts.cc b/gcc/tree-ssa-loop-ivopts.cc
index 023bd645df21b40447b1e084942594dfb0e740ba..b38bc6971a8ebfa16c30329bc69d8e3add77f8d0 100644
--- a/gcc/tree-ssa-loop-ivopts.cc
+++ b/gcc/tree-ssa-loop-ivopts.cc
@@ -90,7 +90,6 @@ along with GCC; see the file COPYING3. If not see
profitable. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-loop-manip.cc b/gcc/tree-ssa-loop-manip.cc
index 326119383fd5197916d4e901bf95780a7c5965bf..213f069c440c6c3808bcf19bba74b0760eca40ed 100644
--- a/gcc/tree-ssa-loop-manip.cc
+++ b/gcc/tree-ssa-loop-manip.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-loop-niter.cc b/gcc/tree-ssa-loop-niter.cc
index 1be4b552206621eb5aa53c7d660dc5bde2f465c1..2d70bf7e8f6119633e53d9293c9a849a4875dd65 100644
--- a/gcc/tree-ssa-loop-niter.cc
+++ b/gcc/tree-ssa-loop-niter.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-loop-prefetch.cc b/gcc/tree-ssa-loop-prefetch.cc
index 56233f7c43c24ec2a95a37224a9b734699b96bac..971bbae9581503259f00eca8ee63bbdda4c29e37 100644
--- a/gcc/tree-ssa-loop-prefetch.cc
+++ b/gcc/tree-ssa-loop-prefetch.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-loop-split.cc b/gcc/tree-ssa-loop-split.cc
index 49267fbeab2e86d4c742f91ba64aca9a6e571e90..48d153d794a9b807585d11bb453360c1405dbdc9 100644
--- a/gcc/tree-ssa-loop-split.cc
+++ b/gcc/tree-ssa-loop-split.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-loop-unswitch.cc b/gcc/tree-ssa-loop-unswitch.cc
index 88516fdb0a1f1f3d1beef274f65cc91ef3d1d5cd..e37d5268194edf4cff5f27d5be24b204360431ed 100644
--- a/gcc/tree-ssa-loop-unswitch.cc
+++ b/gcc/tree-ssa-loop-unswitch.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-math-opts.cc b/gcc/tree-ssa-math-opts.cc
index 5f521aa6fef04208843e034fd35c88e1bd52c5b7..292eb852f2de27d37e34c5c3bb1b6558eb2272d9 100644
--- a/gcc/tree-ssa-math-opts.cc
+++ b/gcc/tree-ssa-math-opts.cc
@@ -84,7 +84,6 @@ along with GCC; see the file COPYING3. If not see
The data structures would be more complex in order to work on all the
variables in a single pass. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-operands.cc b/gcc/tree-ssa-operands.cc
index a01aa51f1cc6072cb8aa1bcf5b59e1f62871fc0d..1dbf6b9c7c49d4add58d383233485d5b4da28156 100644
--- a/gcc/tree-ssa-operands.cc
+++ b/gcc/tree-ssa-operands.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc
index 8a970b59c6bb24038c1eb24b9865010410831420..0d9bc3eb4499139bd30e105f9ee71fb1cb7e60f6 100644
--- a/gcc/tree-ssa-phiopt.cc
+++ b/gcc/tree-ssa-phiopt.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-phiprop.cc b/gcc/tree-ssa-phiprop.cc
index ded0a4e6fb3969aeabeebe2b780defa27384da6a..2a1cdae46d2755e8ca4570d03ae5b005bf3fb627 100644
--- a/gcc/tree-ssa-phiprop.cc
+++ b/gcc/tree-ssa-phiprop.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-pre.cc b/gcc/tree-ssa-pre.cc
index 11d18a0db1b57993f5a3aa00050b1f806629d551..c696111690f1e62ad2d60f51e7da2663f327c223 100644
--- a/gcc/tree-ssa-pre.cc
+++ b/gcc/tree-ssa-pre.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-propagate.cc b/gcc/tree-ssa-propagate.cc
index 0d3950658af215801542239958cf1df2bf47e935..05291ad88b317aec6ef9897f0f7f50e6825d17f0 100644
--- a/gcc/tree-ssa-propagate.cc
+++ b/gcc/tree-ssa-propagate.cc
@@ -18,7 +18,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-reassoc.cc b/gcc/tree-ssa-reassoc.cc
index ba2a1804052193fe61d76c440d44cc2406c53d36..bae46224adb389538fc7318a749e77c2cd244f68 100644
--- a/gcc/tree-ssa-reassoc.cc
+++ b/gcc/tree-ssa-reassoc.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc
index e93acb44200e8a171f9b0f02907d21b48fa511b4..7ef0bd01d3c9aed6c32e55b553c7c3755ea686ba 100644
--- a/gcc/tree-ssa-sccvn.cc
+++ b/gcc/tree-ssa-sccvn.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-scopedtables.cc b/gcc/tree-ssa-scopedtables.cc
index dedfed54454336d9d6351311f585d7bb11fb84a1..5891ebf84cbd87c946869c0b8b3b7ff0eedf5b2e 100644
--- a/gcc/tree-ssa-scopedtables.cc
+++ b/gcc/tree-ssa-scopedtables.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-sink.cc b/gcc/tree-ssa-sink.cc
index 740f239a4a70eb499b81978829d432eaf593f7c2..65e263b2c705485525e6b4654c23761d2340b2d1 100644
--- a/gcc/tree-ssa-sink.cc
+++ b/gcc/tree-ssa-sink.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-strlen.cc b/gcc/tree-ssa-strlen.cc
index 4048747cbc620a41ee7a79ce2994dab5acff3149..5249af064bfbadfae35e02a22d0deb618c97becd 100644
--- a/gcc/tree-ssa-strlen.cc
+++ b/gcc/tree-ssa-strlen.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-structalias.cc b/gcc/tree-ssa-structalias.cc
index 6424f7e7ad2f723bcb67b8b936afbabc7ed934d3..325e90bb95a737751b1bae294d2193f5230c051a 100644
--- a/gcc/tree-ssa-structalias.cc
+++ b/gcc/tree-ssa-structalias.cc
@@ -18,7 +18,6 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-ter.cc b/gcc/tree-ssa-ter.cc
index 890ad01108411fd9d6de3000482f0c2636d1a630..9b338bd26956a44b7464cef71d0878b74367beba 100644
--- a/gcc/tree-ssa-ter.cc
+++ b/gcc/tree-ssa-ter.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssa-threadbackward.cc b/gcc/tree-ssa-threadbackward.cc
index 4bc72ec23755836aa995f9898ff0e303e6b69a1c..ea8d7b882d0823559880176e3691e9f2191c0695 100644
--- a/gcc/tree-ssa-threadbackward.cc
+++ b/gcc/tree-ssa-threadbackward.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-threadupdate.cc b/gcc/tree-ssa-threadupdate.cc
index c88cc1d6aac93a5112484549f8fc4f185d1870d9..fa61ba9512b75fbd8b005c72988cfc2f31a54f60 100644
--- a/gcc/tree-ssa-threadupdate.cc
+++ b/gcc/tree-ssa-threadupdate.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-ssa-uninit.cc b/gcc/tree-ssa-uninit.cc
index 9c3c6878ac961d40d5287d98dcdabd2202e2ad28..726684e472aaab88fa42ffb1d61344c25949ec42 100644
--- a/gcc/tree-ssa-uninit.cc
+++ b/gcc/tree-ssa-uninit.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#define INCLUDE_STRING
#include "config.h"
#include "system.h"
diff --git a/gcc/tree-ssa.cc b/gcc/tree-ssa.cc
index c03f0b4eb39a48f5bd90f4f1907b2a0d0bf12e1d..94d51d94b08c6e28a88f9f2489fd957c79275cc7 100644
--- a/gcc/tree-ssa.cc
+++ b/gcc/tree-ssa.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-ssanames.cc b/gcc/tree-ssanames.cc
index d138c1fe521557c2a45b5709359fb4a880260f08..ae6a0cd48fe66d221b6fe543dc6b8caa3836568a 100644
--- a/gcc/tree-ssanames.cc
+++ b/gcc/tree-ssanames.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-stdarg.cc b/gcc/tree-stdarg.cc
index 1eee1f2444db76f000330637cbb09deae444f142..d780d62ee12131e382e1dbef91c6d73a59ea218e 100644
--- a/gcc/tree-stdarg.cc
+++ b/gcc/tree-stdarg.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-streamer-in.cc b/gcc/tree-streamer-in.cc
index bf9df99efad573defb1b9d62d31cd84a71e1e7f1..2fa998d37f85d5bd1014fcf4788e53ca1bbc71ad 100644
--- a/gcc/tree-streamer-in.cc
+++ b/gcc/tree-streamer-in.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-streamer-out.cc b/gcc/tree-streamer-out.cc
index 93ef90542cec61a1f7d395fb42311baaa175e27c..2fdd914b16632cf6cd3c0fc684ebe277a8e82797 100644
--- a/gcc/tree-streamer-out.cc
+++ b/gcc/tree-streamer-out.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-streamer.cc b/gcc/tree-streamer.cc
index 0a80af774d6a10e888ccfa34d03abcde897903de..72e967a9861b943f705caf0df1c567368b7bbea0 100644
--- a/gcc/tree-streamer.cc
+++ b/gcc/tree-streamer.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-switch-conversion.cc b/gcc/tree-switch-conversion.cc
index 852419b2f4becc6407007a1aca4d9984b8c8a095..3436c2a8b98ce6c5495450d9f9398e94c8d5ddc0 100644
--- a/gcc/tree-switch-conversion.cc
+++ b/gcc/tree-switch-conversion.cc
@@ -22,7 +22,6 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
/* This file handles the lowering of GIMPLE_SWITCH to an indexed
load, or a series of bit-test-and-branch expressions. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-tailcall.cc b/gcc/tree-tailcall.cc
index d188da79aaf229677b955d0e184680ffe05fb546..1901b1a13f9989ff92f988b008fb4f6e42e11e32 100644
--- a/gcc/tree-tailcall.cc
+++ b/gcc/tree-tailcall.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-vect-data-refs.cc b/gcc/tree-vect-data-refs.cc
index 35c946ab2d4e2ac1cd5bb05d5fb9e685fe592032..164352a0a1d22c8caa73e2c381f816b4ed0a5dbd 100644
--- a/gcc/tree-vect-data-refs.cc
+++ b/gcc/tree-vect-data-refs.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-vect-generic.cc b/gcc/tree-vect-generic.cc
index b40e3d7457908f4e7a22d807b13c953a2b82b42f..78f6e552cc7ba36b61a560b4ba4f759ec54019d6 100644
--- a/gcc/tree-vect-generic.cc
+++ b/gcc/tree-vect-generic.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-vect-loop-manip.cc b/gcc/tree-vect-loop-manip.cc
index c8dc71532985c52c5966bd2bf6696f844d5873e7..54b29540eb5aba428f21fbcb9b6d2180fb6f6b97 100644
--- a/gcc/tree-vect-loop-manip.cc
+++ b/gcc/tree-vect-loop-manip.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc
index bf4e35e56619ef700b201e2c052472f3ce81a1d9..8c9be48ef0f1d19406103559d9c56a08c1209711 100644
--- a/gcc/tree-vect-loop.cc
+++ b/gcc/tree-vect-loop.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree-vect-patterns.cc b/gcc/tree-vect-patterns.cc
index b3b16ea23898e5db0ce9b3ff06c145dda832d2ae..eaf495cd190ce21c6c6893942d78ebd383281754 100644
--- a/gcc/tree-vect-patterns.cc
+++ b/gcc/tree-vect-patterns.cc
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-vect-slp-patterns.cc b/gcc/tree-vect-slp-patterns.cc
index 2535d46db3e84700d7591cc8d1bae3b0d098a803..b5a25dd7cbfa9fc82dc4f2b0c351d97fa9d89ff7 100644
--- a/gcc/tree-vect-slp-patterns.cc
+++ b/gcc/tree-vect-slp-patterns.cc
@@ -18,7 +18,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc
index d029ae580098e4b0d5bc8367285872d2c2126386..ec986cc3f686dc68ead57fc79c626107a7cd3d2d 100644
--- a/gcc/tree-vect-slp.cc
+++ b/gcc/tree-vect-slp.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#define INCLUDE_ALGORITHM
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc
index e500902a8be986c9be693784ed2bc73833997707..17c05fb546f8d0bebcacf4f5c3189aad98a98f5c 100644
--- a/gcc/tree-vect-stmts.cc
+++ b/gcc/tree-vect-stmts.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-vectorizer.cc b/gcc/tree-vectorizer.cc
index 16fa0ec1bb77765b5f27760c1affcc8853dcaedb..9a068a408647ddd23fc1f7c8f29c0549c8f78029 100644
--- a/gcc/tree-vectorizer.cc
+++ b/gcc/tree-vectorizer.cc
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
*/
#include "config.h"
-#define INCLUDE_MEMORY
#include "system.h"
#include "coretypes.h"
#include "backend.h"
diff --git a/gcc/tree-vrp.cc b/gcc/tree-vrp.cc
index f40bd6cdf5a4341b0583a125f3951ed03797e134..284ffe251337613d5b10bc5caa1a090f450f7f63 100644
--- a/gcc/tree-vrp.cc
+++ b/gcc/tree-vrp.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/tree.cc b/gcc/tree.cc
index 6350dd427796b4dc8086c26f498b9fa1c15cc5f3..125f38b1cfab674af1bc9c7504c03ef2845e9390 100644
--- a/gcc/tree.cc
+++ b/gcc/tree.cc
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
It is intended to be language-independent but can occasionally
calls language-dependent routines. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/ubsan.cc b/gcc/ubsan.cc
index 9dd65bfccb6a35aa3c131ff39229ece7001e8ec9..b858795aaf724bb909a0cb7bd36ef0418a972fc7 100644
--- a/gcc/ubsan.cc
+++ b/gcc/ubsan.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/value-pointer-equiv.cc b/gcc/value-pointer-equiv.cc
index 3e415c5efea4537d99faa88741120f09db2f0899..cfb53ab4eeef9b423413f3170f71838822ee2dbe 100644
--- a/gcc/value-pointer-equiv.cc
+++ b/gcc/value-pointer-equiv.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/value-prof.cc b/gcc/value-prof.cc
index a5023c1ddbf4f46aa68115a712fd667ec28e87bc..0708b1935d9b651692bb2c1ee7ba2d5622cfa34e 100644
--- a/gcc/value-prof.cc
+++ b/gcc/value-prof.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/value-query.cc b/gcc/value-query.cc
index d68ac5d489621a2714d3df65c0945823c4b49af2..34499da1a9870fa6a3ea11f95360afd5b32b601f 100644
--- a/gcc/value-query.cc
+++ b/gcc/value-query.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/value-range-pretty-print.cc b/gcc/value-range-pretty-print.cc
index cbd7bc5d5e1609c168c78b8a40ce45cff702a335..b11d64947741939ef3bf516b5b9517d66f7e4281 100644
--- a/gcc/value-range-pretty-print.cc
+++ b/gcc/value-range-pretty-print.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/value-range-storage.cc b/gcc/value-range-storage.cc
index b74ae7f0ad7b1b9d38a25c5958e33147325cc1c5..d3d98f98d7b19aceaadde527e6b3f1732fd335d5 100644
--- a/gcc/value-range-storage.cc
+++ b/gcc/value-range-storage.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/value-range.cc b/gcc/value-range.cc
index 775e97da11ceed0be99d0abe7dfb67a41d381b6d..3046232bbca2c1a54d04490835df79d18d7f41bf 100644
--- a/gcc/value-range.cc
+++ b/gcc/value-range.cc
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/value-relation.cc b/gcc/value-relation.cc
index 5c7986e23fb01a70a1f0f5b8e9c1cf4150512d1a..d8a2ed920a82ed83d22079f358629a945767fb82 100644
--- a/gcc/value-relation.cc
+++ b/gcc/value-relation.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/var-tracking.cc b/gcc/var-tracking.cc
index 5f1358c1ac2542d0cfd5e454df2fdba8f2324cc5..08174669c2692d572f528dbb7cf763a7b3f2548e 100644
--- a/gcc/var-tracking.cc
+++ b/gcc/var-tracking.cc
@@ -85,7 +85,6 @@
*/
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/varpool.cc b/gcc/varpool.cc
index 3bc491f767d7eea708bd1f63ec27d37282503725..db2bcacbd46bc69aacbffa0724efa6338e04a97b 100644
--- a/gcc/varpool.cc
+++ b/gcc/varpool.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/vr-values.cc b/gcc/vr-values.cc
index 6db17042a34a34b16054e030374bfe08b85c0474..cf273a3fc623117c9403fabdd3eaa41a57648d26 100644
--- a/gcc/vr-values.cc
+++ b/gcc/vr-values.cc
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"
diff --git a/gcc/wide-int-print.cc b/gcc/wide-int-print.cc
index c4ee7791bc36ec873015b95becee781a721c2736..3e02ee123089cedafdc55614ba296c4cdd33e22d 100644
--- a/gcc/wide-int-print.cc
+++ b/gcc/wide-int-print.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include "coretypes.h"