Remove extraneous #defines, no functional change.

This change removes the #define statements at the start of many
modules that simply define the module name. They are obsolete.

127 files changed, 0 insertions, 238 deletions

diff --git a/source/components/dispatcher/dsargs.c b/source/components/dispatcher/dsargs.c
index 78013413b..d70b6a97f 100644
--- a/source/components/dispatcher/dsargs.c
+++ b/source/components/dispatcher/dsargs.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __DSARGS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/dispatcher/dscontrol.c b/source/components/dispatcher/dscontrol.c
index 6ed6010db..85df0e3eb 100644
--- a/source/components/dispatcher/dscontrol.c
+++ b/source/components/dispatcher/dscontrol.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __DSCONTROL_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "amlcode.h"
diff --git a/source/components/dispatcher/dsfield.c b/source/components/dispatcher/dsfield.c
index ccf786f70..d14434b23 100644
--- a/source/components/dispatcher/dsfield.c
+++ b/source/components/dispatcher/dsfield.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSFIELD_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "amlcode.h"
diff --git a/source/components/dispatcher/dsinit.c b/source/components/dispatcher/dsinit.c
index 22ed601fe..f68c66ebc 100644
--- a/source/components/dispatcher/dsinit.c
+++ b/source/components/dispatcher/dsinit.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSINIT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acdispat.h"
diff --git a/source/components/dispatcher/dsmethod.c b/source/components/dispatcher/dsmethod.c
index 5d1985ad2..d8d823018 100644
--- a/source/components/dispatcher/dsmethod.c
+++ b/source/components/dispatcher/dsmethod.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSMETHOD_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acdispat.h"
diff --git a/source/components/dispatcher/dsmthdat.c b/source/components/dispatcher/dsmthdat.c
index 9b664bc8c..7f943251b 100644
--- a/source/components/dispatcher/dsmthdat.c
+++ b/source/components/dispatcher/dsmthdat.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSMTHDAT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acdispat.h"
diff --git a/source/components/dispatcher/dsobject.c b/source/components/dispatcher/dsobject.c
index d6260b5df..59d465658 100644
--- a/source/components/dispatcher/dsobject.c
+++ b/source/components/dispatcher/dsobject.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSOBJECT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/dispatcher/dsopcode.c b/source/components/dispatcher/dsopcode.c
index 83d482d49..c1f265daa 100644
--- a/source/components/dispatcher/dsopcode.c
+++ b/source/components/dispatcher/dsopcode.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSOPCODE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/dispatcher/dsutils.c b/source/components/dispatcher/dsutils.c
index 2553ad2af..81d73cb8c 100644
--- a/source/components/dispatcher/dsutils.c
+++ b/source/components/dispatcher/dsutils.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSUTILS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/dispatcher/dswexec.c b/source/components/dispatcher/dswexec.c
index afa707d57..877d30f4f 100644
--- a/source/components/dispatcher/dswexec.c
+++ b/source/components/dispatcher/dswexec.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __DSWEXEC_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/dispatcher/dswload.c b/source/components/dispatcher/dswload.c
index 7f811dd84..de70dee40 100644
--- a/source/components/dispatcher/dswload.c
+++ b/source/components/dispatcher/dswload.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSWLOAD_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/dispatcher/dswload2.c b/source/components/dispatcher/dswload2.c
index bef85cb8a..4fc148591 100644
--- a/source/components/dispatcher/dswload2.c
+++ b/source/components/dispatcher/dswload2.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSWLOAD2_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/dispatcher/dswscope.c b/source/components/dispatcher/dswscope.c
index 62f259655..7caa3010f 100644
--- a/source/components/dispatcher/dswscope.c
+++ b/source/components/dispatcher/dswscope.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSWSCOPE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acdispat.h"
diff --git a/source/components/dispatcher/dswstate.c b/source/components/dispatcher/dswstate.c
index 9c2f2ec6c..4d24d2cfb 100644
--- a/source/components/dispatcher/dswstate.c
+++ b/source/components/dispatcher/dswstate.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __DSWSTATE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/events/evhandler.c b/source/components/events/evhandler.c
index 7df392b5d..b67ba3e80 100644
--- a/source/components/events/evhandler.c
+++ b/source/components/events/evhandler.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EVHANDLER_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acevents.h"
diff --git a/source/components/events/evregion.c b/source/components/events/evregion.c
index 029a45555..ec681daa2 100644
--- a/source/components/events/evregion.c
+++ b/source/components/events/evregion.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EVREGION_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acevents.h"
diff --git a/source/components/events/evrgnini.c b/source/components/events/evrgnini.c
index b35ddbc49..d439c3198 100644
--- a/source/components/events/evrgnini.c
+++ b/source/components/events/evrgnini.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EVRGNINI_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acevents.h"
diff --git a/source/components/events/evxface.c b/source/components/events/evxface.c
index 27fe6f24d..9b8a1ceec 100644
--- a/source/components/events/evxface.c
+++ b/source/components/events/evxface.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EVXFACE_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/events/evxfevnt.c b/source/components/events/evxfevnt.c
index 225ef5880..caa38102c 100644
--- a/source/components/events/evxfevnt.c
+++ b/source/components/events/evxfevnt.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EVXFEVNT_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c
index 98a797d3c..5da1775bf 100644
--- a/source/components/events/evxfgpe.c
+++ b/source/components/events/evxfgpe.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EVXFGPE_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/events/evxfregn.c b/source/components/events/evxfregn.c
index 014e3757f..a305e3fc5 100644
--- a/source/components/events/evxfregn.c
+++ b/source/components/events/evxfregn.c
@@ -114,7 +114,6 @@
  *
  *****************************************************************************/
 
-#define __EVXFREGN_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/executer/exconfig.c b/source/components/executer/exconfig.c
index 98caa14c9..2fd6e36c7 100644
--- a/source/components/executer/exconfig.c
+++ b/source/components/executer/exconfig.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __EXCONFIG_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exconvrt.c b/source/components/executer/exconvrt.c
index f674893e0..00f0310dd 100644
--- a/source/components/executer/exconvrt.c
+++ b/source/components/executer/exconvrt.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXCONVRT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/excreate.c b/source/components/executer/excreate.c
index 8f7b9e72d..90a389a8e 100644
--- a/source/components/executer/excreate.c
+++ b/source/components/executer/excreate.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __EXCREATE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exdebug.c b/source/components/executer/exdebug.c
index 45fca3141..eb1daad19 100644
--- a/source/components/executer/exdebug.c
+++ b/source/components/executer/exdebug.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXDEBUG_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exdump.c b/source/components/executer/exdump.c
index 68a005404..4d6a18676 100644
--- a/source/components/executer/exdump.c
+++ b/source/components/executer/exdump.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXDUMP_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exfield.c b/source/components/executer/exfield.c
index f0bfb1117..e33f82ce1 100644
--- a/source/components/executer/exfield.c
+++ b/source/components/executer/exfield.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXFIELD_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acdispat.h"
diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c
index 6db8f05d8..e29ae6657 100644
--- a/source/components/executer/exfldio.c
+++ b/source/components/executer/exfldio.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXFLDIO_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exmisc.c b/source/components/executer/exmisc.c
index b78425c9c..94053d561 100644
--- a/source/components/executer/exmisc.c
+++ b/source/components/executer/exmisc.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __EXMISC_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exmutex.c b/source/components/executer/exmutex.c
index a613c5456..962b9c1cf 100644
--- a/source/components/executer/exmutex.c
+++ b/source/components/executer/exmutex.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXMUTEX_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exnames.c b/source/components/executer/exnames.c
index e8dc00c0d..67f79303a 100644
--- a/source/components/executer/exnames.c
+++ b/source/components/executer/exnames.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXNAMES_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exoparg1.c b/source/components/executer/exoparg1.c
index 30fc50488..8ce761054 100644
--- a/source/components/executer/exoparg1.c
+++ b/source/components/executer/exoparg1.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXOPARG1_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c
index 84c44f4ac..2519dca42 100644
--- a/source/components/executer/exoparg2.c
+++ b/source/components/executer/exoparg2.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXOPARG2_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/executer/exoparg3.c b/source/components/executer/exoparg3.c
index 97df20765..4e6842b9f 100644
--- a/source/components/executer/exoparg3.c
+++ b/source/components/executer/exoparg3.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __EXOPARG3_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exoparg6.c b/source/components/executer/exoparg6.c
index 515fc5994..9cd26e0f0 100644
--- a/source/components/executer/exoparg6.c
+++ b/source/components/executer/exoparg6.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __EXOPARG6_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c
index 276a77abd..dc764bb6c 100644
--- a/source/components/executer/exprep.c
+++ b/source/components/executer/exprep.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXPREP_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exregion.c b/source/components/executer/exregion.c
index 4056f08be..544412eca 100644
--- a/source/components/executer/exregion.c
+++ b/source/components/executer/exregion.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXREGION_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exresnte.c b/source/components/executer/exresnte.c
index 323f9db5d..7640a01dc 100644
--- a/source/components/executer/exresnte.c
+++ b/source/components/executer/exresnte.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXRESNTE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acdispat.h"
diff --git a/source/components/executer/exresolv.c b/source/components/executer/exresolv.c
index e035918a6..35bb6bb8a 100644
--- a/source/components/executer/exresolv.c
+++ b/source/components/executer/exresolv.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXRESOLV_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "amlcode.h"
diff --git a/source/components/executer/exresop.c b/source/components/executer/exresop.c
index aafc1dce5..6dc28aa61 100644
--- a/source/components/executer/exresop.c
+++ b/source/components/executer/exresop.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXRESOP_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "amlcode.h"
diff --git a/source/components/executer/exstore.c b/source/components/executer/exstore.c
index 97b8be82d..cf476214a 100644
--- a/source/components/executer/exstore.c
+++ b/source/components/executer/exstore.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXSTORE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acdispat.h"
diff --git a/source/components/executer/exstoren.c b/source/components/executer/exstoren.c
index d1fc09f79..82944c5a5 100644
--- a/source/components/executer/exstoren.c
+++ b/source/components/executer/exstoren.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __EXSTOREN_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exstorob.c b/source/components/executer/exstorob.c
index dc64e92c1..f36e9fc01 100644
--- a/source/components/executer/exstorob.c
+++ b/source/components/executer/exstorob.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXSTOROB_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exsystem.c b/source/components/executer/exsystem.c
index fcf3a7f13..0bce72ac1 100644
--- a/source/components/executer/exsystem.c
+++ b/source/components/executer/exsystem.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXSYSTEM_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/executer/exutils.c b/source/components/executer/exutils.c
index 1a4a94311..63bfb847c 100644
--- a/source/components/executer/exutils.c
+++ b/source/components/executer/exutils.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __EXUTILS_C__
-
 /*
  * DEFINE_AML_GLOBALS is tested in amlcode.h
  * to determine whether certain global names should be "defined" or only
diff --git a/source/components/hardware/hwacpi.c b/source/components/hardware/hwacpi.c
index 1facc203a..0dff876e2 100644
--- a/source/components/hardware/hwacpi.c
+++ b/source/components/hardware/hwacpi.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __HWACPI_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/hardware/hwpci.c b/source/components/hardware/hwpci.c
index 24b7c01e9..4470b5ccc 100644
--- a/source/components/hardware/hwpci.c
+++ b/source/components/hardware/hwpci.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __HWPCI_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/hardware/hwregs.c b/source/components/hardware/hwregs.c
index 24b4cf4cf..7df29fde7 100644
--- a/source/components/hardware/hwregs.c
+++ b/source/components/hardware/hwregs.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __HWREGS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acevents.h"
diff --git a/source/components/hardware/hwvalid.c b/source/components/hardware/hwvalid.c
index 511a6313f..dbbb3bb65 100644
--- a/source/components/hardware/hwvalid.c
+++ b/source/components/hardware/hwvalid.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __HWVALID_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/namespace/nsaccess.c b/source/components/namespace/nsaccess.c
index 4c8bd30b3..37f69138e 100644
--- a/source/components/namespace/nsaccess.c
+++ b/source/components/namespace/nsaccess.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSACCESS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "amlcode.h"
diff --git a/source/components/namespace/nsalloc.c b/source/components/namespace/nsalloc.c
index ae855e957..c4a08cd87 100644
--- a/source/components/namespace/nsalloc.c
+++ b/source/components/namespace/nsalloc.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSALLOC_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsconvert.c b/source/components/namespace/nsconvert.c
index 5bd686819..722691738 100644
--- a/source/components/namespace/nsconvert.c
+++ b/source/components/namespace/nsconvert.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSCONVERT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsdump.c b/source/components/namespace/nsdump.c
index 482304654..5631cabd3 100644
--- a/source/components/namespace/nsdump.c
+++ b/source/components/namespace/nsdump.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSDUMP_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsdumpdv.c b/source/components/namespace/nsdumpdv.c
index ed1b8a996..8510eb2e4 100644
--- a/source/components/namespace/nsdumpdv.c
+++ b/source/components/namespace/nsdumpdv.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSDUMPDV_C__
-
 #include "acpi.h"
 
 
diff --git a/source/components/namespace/nseval.c b/source/components/namespace/nseval.c
index 227a10326..2f32e5e7e 100644
--- a/source/components/namespace/nseval.c
+++ b/source/components/namespace/nseval.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSEVAL_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/namespace/nsinit.c b/source/components/namespace/nsinit.c
index b5be1f4ee..2c4db995a 100644
--- a/source/components/namespace/nsinit.c
+++ b/source/components/namespace/nsinit.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSXFINIT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsload.c b/source/components/namespace/nsload.c
index 7d68af7cc..e15e6a4df 100644
--- a/source/components/namespace/nsload.c
+++ b/source/components/namespace/nsload.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSLOAD_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsnames.c b/source/components/namespace/nsnames.c
index f345d9032..2dc5d7b5f 100644
--- a/source/components/namespace/nsnames.c
+++ b/source/components/namespace/nsnames.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSNAMES_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "amlcode.h"
diff --git a/source/components/namespace/nsobject.c b/source/components/namespace/nsobject.c
index c9b7b32b0..7a0d8ef36 100644
--- a/source/components/namespace/nsobject.c
+++ b/source/components/namespace/nsobject.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSOBJECT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsparse.c b/source/components/namespace/nsparse.c
index 847e61b28..f8802079c 100644
--- a/source/components/namespace/nsparse.c
+++ b/source/components/namespace/nsparse.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSPARSE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsrepair.c b/source/components/namespace/nsrepair.c
index 11a43b1d0..cf3c41179 100644
--- a/source/components/namespace/nsrepair.c
+++ b/source/components/namespace/nsrepair.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSREPAIR_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsrepair2.c b/source/components/namespace/nsrepair2.c
index ea7c0be46..ffba45773 100644
--- a/source/components/namespace/nsrepair2.c
+++ b/source/components/namespace/nsrepair2.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSREPAIR2_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nssearch.c b/source/components/namespace/nssearch.c
index 1632f2e0e..916986607 100644
--- a/source/components/namespace/nssearch.c
+++ b/source/components/namespace/nssearch.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSSEARCH_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsutils.c b/source/components/namespace/nsutils.c
index cf4214e47..b2373904f 100644
--- a/source/components/namespace/nsutils.c
+++ b/source/components/namespace/nsutils.c
@@ -114,8 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSUTILS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nswalk.c b/source/components/namespace/nswalk.c
index 23e5fd19e..bcbed650e 100644
--- a/source/components/namespace/nswalk.c
+++ b/source/components/namespace/nswalk.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __NSWALK_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/namespace/nsxfeval.c b/source/components/namespace/nsxfeval.c
index 259a187f1..5425a54df 100644
--- a/source/components/namespace/nsxfeval.c
+++ b/source/components/namespace/nsxfeval.c
@@ -114,7 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSXFEVAL_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/namespace/nsxfname.c b/source/components/namespace/nsxfname.c
index 475491cb0..f45a2bd1c 100644
--- a/source/components/namespace/nsxfname.c
+++ b/source/components/namespace/nsxfname.c
@@ -114,7 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSXFNAME_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/namespace/nsxfobj.c b/source/components/namespace/nsxfobj.c
index 409f23387..763e044a4 100644
--- a/source/components/namespace/nsxfobj.c
+++ b/source/components/namespace/nsxfobj.c
@@ -114,7 +114,6 @@
  *
  *****************************************************************************/
 
-#define __NSXFOBJ_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/parser/psargs.c b/source/components/parser/psargs.c
index 5e2e43414..ad86a1fc3 100644
--- a/source/components/parser/psargs.c
+++ b/source/components/parser/psargs.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __PSARGS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/parser/pstree.c b/source/components/parser/pstree.c
index 45c6fc2a7..fc2477b02 100644
--- a/source/components/parser/pstree.c
+++ b/source/components/parser/pstree.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __PSTREE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/parser/psxface.c b/source/components/parser/psxface.c
index 65758fcdc..8930af00e 100644
--- a/source/components/parser/psxface.c
+++ b/source/components/parser/psxface.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __PSXFACE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acparser.h"
diff --git a/source/components/resources/rsaddr.c b/source/components/resources/rsaddr.c
index d29307d9f..9c7f2aa5c 100644
--- a/source/components/resources/rsaddr.c
+++ b/source/components/resources/rsaddr.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSADDR_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rscalc.c b/source/components/resources/rscalc.c
index b2742ae71..2b6a4f9d0 100644
--- a/source/components/resources/rscalc.c
+++ b/source/components/resources/rscalc.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSCALC_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rscreate.c b/source/components/resources/rscreate.c
index 03298f424..deaaba52e 100644
--- a/source/components/resources/rscreate.c
+++ b/source/components/resources/rscreate.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSCREATE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsdump.c b/source/components/resources/rsdump.c
index 4fc7d4a73..34b4abf38 100644
--- a/source/components/resources/rsdump.c
+++ b/source/components/resources/rsdump.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSDUMP_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsdumpinfo.c b/source/components/resources/rsdumpinfo.c
index 929043c71..bb41c71c1 100644
--- a/source/components/resources/rsdumpinfo.c
+++ b/source/components/resources/rsdumpinfo.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSDUMPINFO_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsinfo.c b/source/components/resources/rsinfo.c
index 05f02a85d..da2cb5d9a 100644
--- a/source/components/resources/rsinfo.c
+++ b/source/components/resources/rsinfo.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSINFO_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsio.c b/source/components/resources/rsio.c
index b0e6f1dc9..a641c0c37 100644
--- a/source/components/resources/rsio.c
+++ b/source/components/resources/rsio.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSIO_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsirq.c b/source/components/resources/rsirq.c
index 1bd887b6b..33f400f62 100644
--- a/source/components/resources/rsirq.c
+++ b/source/components/resources/rsirq.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSIRQ_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rslist.c b/source/components/resources/rslist.c
index 71e31645f..ea2d1d531 100644
--- a/source/components/resources/rslist.c
+++ b/source/components/resources/rslist.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSLIST_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsmemory.c b/source/components/resources/rsmemory.c
index 727d3ee7c..ae94a1fef 100644
--- a/source/components/resources/rsmemory.c
+++ b/source/components/resources/rsmemory.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSMEMORY_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsmisc.c b/source/components/resources/rsmisc.c
index a6976028f..8de7ca5f1 100644
--- a/source/components/resources/rsmisc.c
+++ b/source/components/resources/rsmisc.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSMISC_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsserial.c b/source/components/resources/rsserial.c
index 2eee1a2a1..b71dcadea 100644
--- a/source/components/resources/rsserial.c
+++ b/source/components/resources/rsserial.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSIRQ_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/resources/rsutils.c b/source/components/resources/rsutils.c
index b05338cf7..42ff2a3e0 100644
--- a/source/components/resources/rsutils.c
+++ b/source/components/resources/rsutils.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSUTILS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/resources/rsxface.c b/source/components/resources/rsxface.c
index 8dbb30122..9e9af3a24 100644
--- a/source/components/resources/rsxface.c
+++ b/source/components/resources/rsxface.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __RSXFACE_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/tables/tbdata.c b/source/components/tables/tbdata.c
index 1e4cbcd48..10924aba1 100644
--- a/source/components/tables/tbdata.c
+++ b/source/components/tables/tbdata.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBDATA_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/tables/tbfadt.c b/source/components/tables/tbfadt.c
index 8cb69a9c0..f3f27cd63 100644
--- a/source/components/tables/tbfadt.c
+++ b/source/components/tables/tbfadt.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBFADT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "actables.h"
diff --git a/source/components/tables/tbfind.c b/source/components/tables/tbfind.c
index 42ce18189..56b4e8a39 100644
--- a/source/components/tables/tbfind.c
+++ b/source/components/tables/tbfind.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBFIND_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "actables.h"
diff --git a/source/components/tables/tbinstal.c b/source/components/tables/tbinstal.c
index ab0e87942..38de06c4f 100644
--- a/source/components/tables/tbinstal.c
+++ b/source/components/tables/tbinstal.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBINSTAL_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "actables.h"
diff --git a/source/components/tables/tbprint.c b/source/components/tables/tbprint.c
index 553daf918..d4bba4526 100644
--- a/source/components/tables/tbprint.c
+++ b/source/components/tables/tbprint.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBPRINT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "actables.h"
diff --git a/source/components/tables/tbutils.c b/source/components/tables/tbutils.c
index 438f92fac..ec1843cf7 100644
--- a/source/components/tables/tbutils.c
+++ b/source/components/tables/tbutils.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBUTILS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "actables.h"
diff --git a/source/components/tables/tbxface.c b/source/components/tables/tbxface.c
index cbdede520..df4e40261 100644
--- a/source/components/tables/tbxface.c
+++ b/source/components/tables/tbxface.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBXFACE_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/tables/tbxfload.c b/source/components/tables/tbxfload.c
index 77c1be6df..88834db4a 100644
--- a/source/components/tables/tbxfload.c
+++ b/source/components/tables/tbxfload.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBXFLOAD_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/tables/tbxfroot.c b/source/components/tables/tbxfroot.c
index 23ab8210c..8354e943f 100644
--- a/source/components/tables/tbxfroot.c
+++ b/source/components/tables/tbxfroot.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __TBXFROOT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "actables.h"
diff --git a/source/components/utilities/utaddress.c b/source/components/utilities/utaddress.c
index 750f47c79..864c0c3dd 100644
--- a/source/components/utilities/utaddress.c
+++ b/source/components/utilities/utaddress.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTADDRESS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/utalloc.c b/source/components/utilities/utalloc.c
index 00345fcff..dd7c8d670 100644
--- a/source/components/utilities/utalloc.c
+++ b/source/components/utilities/utalloc.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTALLOC_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acdebug.h"
diff --git a/source/components/utilities/utbuffer.c b/source/components/utilities/utbuffer.c
index 608e8d4aa..cc2d769d2 100644
--- a/source/components/utilities/utbuffer.c
+++ b/source/components/utilities/utbuffer.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTBUFFER_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utcache.c b/source/components/utilities/utcache.c
index 1bd2c542a..cb8116eeb 100644
--- a/source/components/utilities/utcache.c
+++ b/source/components/utilities/utcache.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTCACHE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c
index 214373b61..13f33dcd7 100644
--- a/source/components/utilities/utclib.c
+++ b/source/components/utilities/utclib.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __CMCLIB_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utcopy.c b/source/components/utilities/utcopy.c
index e6a71a7b0..ea70d137f 100644
--- a/source/components/utilities/utcopy.c
+++ b/source/components/utilities/utcopy.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTCOPY_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/utdebug.c b/source/components/utilities/utdebug.c
index ddc0c3864..5c86223ca 100644
--- a/source/components/utilities/utdebug.c
+++ b/source/components/utilities/utdebug.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTDEBUG_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/utilities/utdecode.c b/source/components/utilities/utdecode.c
index 61826fe2f..fcd6393df 100644
--- a/source/components/utilities/utdecode.c
+++ b/source/components/utilities/utdecode.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTDECODE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/utdelete.c b/source/components/utilities/utdelete.c
index d42d8a755..e6825cacd 100644
--- a/source/components/utilities/utdelete.c
+++ b/source/components/utilities/utdelete.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTDELETE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/utilities/uterror.c b/source/components/utilities/uterror.c
index b590af75a..5d7dfcae9 100644
--- a/source/components/utilities/uterror.c
+++ b/source/components/utilities/uterror.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTERROR_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/uteval.c b/source/components/utilities/uteval.c
index b3a734149..00f148348 100644
--- a/source/components/utilities/uteval.c
+++ b/source/components/utilities/uteval.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTEVAL_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/utexcep.c b/source/components/utilities/utexcep.c
index 5455f87bd..2c046c4c2 100644
--- a/source/components/utilities/utexcep.c
+++ b/source/components/utilities/utexcep.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTEXCEP_C__
 #define EXPORT_ACPI_INTERFACES
 
 #define ACPI_DEFINE_EXCEPTION_TABLE
diff --git a/source/components/utilities/utglobal.c b/source/components/utilities/utglobal.c
index be14ea296..34438c8ba 100644
--- a/source/components/utilities/utglobal.c
+++ b/source/components/utilities/utglobal.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTGLOBAL_C__
 #define EXPORT_ACPI_INTERFACES
 #define DEFINE_ACPI_GLOBALS
 
diff --git a/source/components/utilities/uthex.c b/source/components/utilities/uthex.c
index ba2b2593e..80ad2bac9 100644
--- a/source/components/utilities/uthex.c
+++ b/source/components/utilities/uthex.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTHEX_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utids.c b/source/components/utilities/utids.c
index 4cf84e8ed..5f15f6280 100644
--- a/source/components/utilities/utids.c
+++ b/source/components/utilities/utids.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTIDS_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acinterp.h"
diff --git a/source/components/utilities/utinit.c b/source/components/utilities/utinit.c
index af29d7adf..7c0b67b54 100644
--- a/source/components/utilities/utinit.c
+++ b/source/components/utilities/utinit.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTINIT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/utlock.c b/source/components/utilities/utlock.c
index b3e4cb4e3..1d7dadc15 100644
--- a/source/components/utilities/utlock.c
+++ b/source/components/utilities/utlock.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTLOCK_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utmath.c b/source/components/utilities/utmath.c
index 22f5a21e0..95a9d728b 100644
--- a/source/components/utilities/utmath.c
+++ b/source/components/utilities/utmath.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTMATH_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utmisc.c b/source/components/utilities/utmisc.c
index 68f85f484..5e86e0a81 100644
--- a/source/components/utilities/utmisc.c
+++ b/source/components/utilities/utmisc.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTMISC_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/utmutex.c b/source/components/utilities/utmutex.c
index fcca4a408..1537422d7 100644
--- a/source/components/utilities/utmutex.c
+++ b/source/components/utilities/utmutex.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTMUTEX_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utobject.c b/source/components/utilities/utobject.c
index 0fdef14e1..4c64061c0 100644
--- a/source/components/utilities/utobject.c
+++ b/source/components/utilities/utobject.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTOBJECT_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/utosi.c b/source/components/utilities/utosi.c
index a001d06bd..3b49ded6a 100644
--- a/source/components/utilities/utosi.c
+++ b/source/components/utilities/utosi.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTOSI_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utownerid.c b/source/components/utilities/utownerid.c
index ba191fa27..1ae139829 100644
--- a/source/components/utilities/utownerid.c
+++ b/source/components/utilities/utownerid.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTOWNERID_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/utpredef.c b/source/components/utilities/utpredef.c
index d20e90583..ab275ee6f 100644
--- a/source/components/utilities/utpredef.c
+++ b/source/components/utilities/utpredef.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTPREDEF_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acpredef.h"
diff --git a/source/components/utilities/utresrc.c b/source/components/utilities/utresrc.c
index 2c31f2a69..0c6199e82 100644
--- a/source/components/utilities/utresrc.c
+++ b/source/components/utilities/utresrc.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTRESRC_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/source/components/utilities/utstate.c b/source/components/utilities/utstate.c
index 0d1f2bf28..cf96d8e3e 100644
--- a/source/components/utilities/utstate.c
+++ b/source/components/utilities/utstate.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTSTATE_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utstring.c b/source/components/utilities/utstring.c
index d4e5f4599..2d218c374 100644
--- a/source/components/utilities/utstring.c
+++ b/source/components/utilities/utstring.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTSTRING_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/source/components/utilities/uttrack.c b/source/components/utilities/uttrack.c
index df04aa3a5..43a993aca 100644
--- a/source/components/utilities/uttrack.c
+++ b/source/components/utilities/uttrack.c
@@ -124,8 +124,6 @@
  * occurs in the body of AcpiUtFree.
  */
 
-#define __UTTRACK_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utuuid.c b/source/components/utilities/utuuid.c
index f5c2e40c0..65338cca1 100644
--- a/source/components/utilities/utuuid.c
+++ b/source/components/utilities/utuuid.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTUUID_C__
-
 #include "acpi.h"
 #include "accommon.h"
 
diff --git a/source/components/utilities/utxface.c b/source/components/utilities/utxface.c
index bf22cf56f..7f2752c38 100644
--- a/source/components/utilities/utxface.c
+++ b/source/components/utilities/utxface.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTXFACE_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/utilities/utxferror.c b/source/components/utilities/utxferror.c
index 081bfd917..7b11f4c05 100644
--- a/source/components/utilities/utxferror.c
+++ b/source/components/utilities/utxferror.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTXFERROR_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/utilities/utxfinit.c b/source/components/utilities/utxfinit.c
index e27a77d8f..a50cc55e4 100644
--- a/source/components/utilities/utxfinit.c
+++ b/source/components/utilities/utxfinit.c
@@ -113,7 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTXFINIT_C__
 #define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
diff --git a/source/components/utilities/utxfmutex.c b/source/components/utilities/utxfmutex.c
index 52ca318db..5fc2b32c7 100644
--- a/source/components/utilities/utxfmutex.c
+++ b/source/components/utilities/utxfmutex.c
@@ -113,8 +113,6 @@
  *
  *****************************************************************************/
 
-#define __UTXFMUTEX_C__
-
 #include "acpi.h"
 #include "accommon.h"
 #include "acnamesp.h"