From d55a2b74ac2661515a21ae1ac9627bf27c8d676a Mon Sep 17 00:00:00 2001
From: "Darryl L. Miles" <darryl.miles@darrylmiles.org>
Date: Wed, 16 Oct 2024 07:38:41 +0100
Subject: [PATCH] header file #ifndef guard namespace consistency (global
 change)

This add an effective namespace prefix to the guard ifndef
---
 bplane/bpEnum.h        | 6 +++---
 bplane/bpOpaque.h      | 6 +++---
 bplane/bplane.h        | 6 +++---
 bplane/bplaneInt.h     | 6 +++---
 calma/calma.h          | 6 +++---
 calma/calmaInt.h       | 6 +++---
 cif/CIFint.h           | 6 +++---
 cif/CIFread.h          | 6 +++---
 cif/cif.h              | 6 +++---
 cmwind/cmwind.h        | 6 +++---
 commands/commands.h    | 6 +++---
 database/database.h.in | 4 ++--
 database/databaseInt.h | 6 +++---
 database/fonts.h       | 6 +++---
 dbwind/dbwind.h        | 6 +++---
 dbwind/dbwtech.h       | 6 +++---
 debug/debug.h          | 6 +++---
 drc/drc.h              | 6 +++---
 ext2spice/ext2spice.h  | 6 +++---
 extflat/EFint.h        | 6 +++---
 extflat/extflat.h      | 6 +++---
 extract/extract.h      | 6 +++---
 extract/extractInt.h   | 6 +++---
 garouter/gaInternal.h  | 6 +++---
 garouter/garouter.h    | 6 +++---
 gcr/gcr.h              | 6 +++---
 graphics/glyphs.h      | 6 +++---
 graphics/graphics.h    | 6 +++---
 graphics/graphicsInt.h | 6 +++---
 graphics/wind3d.h      | 6 +++---
 grouter/grouter.h      | 6 +++---
 irouter/irInternal.h   | 6 +++---
 irouter/irouter.h      | 6 +++---
 lef/lef.h              | 6 +++---
 lef/lefInt.h           | 6 +++---
 mzrouter/mzInternal.h  | 6 +++---
 mzrouter/mzrouter.h    | 6 +++---
 netmenu/netmenu.h      | 6 +++---
 netmenu/nmInt.h        | 6 +++---
 oa/oa.h                | 6 +++---
 plot/plot.h            | 6 +++---
 plot/plotInt.h         | 6 +++---
 plow/plow.h            | 6 +++---
 plow/plowInt.h         | 6 +++---
 resis/resis.h          | 6 +++---
 router/router.h        | 6 +++---
 router/routerInt.h     | 6 +++---
 router/rtrDcmpose.h    | 6 +++---
 select/selInt.h        | 6 +++---
 select/select.h        | 6 +++---
 sim/sim.h              | 6 +++---
 tcltk/tclmagic.h       | 6 +++---
 textio/textio.h        | 6 +++---
 textio/textioInt.h     | 6 +++---
 textio/txcommands.h    | 6 +++---
 tiles/tile.h           | 6 +++---
 utils/dqueue.h         | 6 +++---
 utils/geometry.h       | 6 +++---
 utils/hash.h           | 6 +++---
 utils/heap.h           | 6 +++---
 utils/ihash.h          | 6 +++---
 utils/list.h           | 6 +++---
 utils/macros.h         | 6 +++---
 utils/magic.h          | 6 +++---
 utils/magic_alloca.h   | 6 +++---
 utils/magic_assert.h   | 6 +++---
 utils/magsgtty.h       | 6 +++---
 utils/main.h           | 6 +++---
 utils/malloc.h         | 6 +++---
 utils/maxrect.h        | 6 +++---
 utils/netlist.h        | 6 +++---
 utils/paths.h          | 6 +++---
 utils/pathvisit.h      | 6 +++---
 utils/runstats.h       | 6 +++---
 utils/signals.h        | 6 +++---
 utils/stack.h          | 6 +++---
 utils/styles.h         | 6 +++---
 utils/tech.h           | 6 +++---
 utils/touchingtypes.h  | 6 +++---
 utils/undo.h           | 6 +++---
 utils/utils.h          | 6 +++---
 windows/windInt.h      | 6 +++---
 windows/windows.h      | 6 +++---
 wiring/wireInt.h       | 6 +++---
 wiring/wiring.h        | 6 +++---
 85 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/bplane/bpEnum.h b/bplane/bpEnum.h
index 1d44a5df..3323b57a 100644
--- a/bplane/bpEnum.h
+++ b/bplane/bpEnum.h
@@ -25,8 +25,8 @@
 //
 // ************************************************************************
 
-#ifndef _BPENUM_H
-#define _BPENUM_H
+#ifndef _MAGIC__BPLANE__BPENUM_H
+#define _MAGIC__BPLANE__BPENUM_H
 
 /* bpEnum.h --
  *
@@ -534,4 +534,4 @@ static __inline__ void *BPEnumNext(BPEnum *bpe)
   }
 }
 
-#endif /* _BPENUM_H */
+#endif /* _MAGIC__BPLANE__BPENUM_H */
diff --git a/bplane/bpOpaque.h b/bplane/bpOpaque.h
index 5a013d59..c4185b43 100644
--- a/bplane/bpOpaque.h
+++ b/bplane/bpOpaque.h
@@ -27,8 +27,8 @@
 
 
 
-#ifndef _BPOPAQUE_H
-#define _BPOPAQUE_H
+#ifndef _MAGIC__BPLANE__BPOPAQUE_H
+#define _MAGIC__BPLANE__BPOPAQUE_H
 
 #ifndef _IHASH_H
 #include "utils/ihash.h"
@@ -192,4 +192,4 @@ typedef struct bpenum
   BPStack bpe_stack[10000];    /* stack for tree traversal during enum */
 } BPEnum;
 
-#endif /* _BPOPAQUE_H */
+#endif /* _MAGIC__BPLANE__BPOPAQUE_H */
diff --git a/bplane/bplane.h b/bplane/bplane.h
index 4269e9a4..87a0d5a7 100644
--- a/bplane/bplane.h
+++ b/bplane/bplane.h
@@ -27,8 +27,8 @@
 
 
 
-#ifndef _BPLANE_H
-#define _BPLANE_H
+#ifndef _MAGIC__BPLANE__BPLANE_H
+#define _MAGIC__BPLANE__BPLANE_H
 
 /*
  * bplane.h --
@@ -232,4 +232,4 @@ BPStat(BPlane *bp,
        int *totUnbinned,     /* ret tot num of e's not binned */
        int *maxDepth);       /* ret max bin array depth */
 
-#endif /* _BPLANE_H */
+#endif /* _MAGIC__BPLANE__BPLANE_H */
diff --git a/bplane/bplaneInt.h b/bplane/bplaneInt.h
index 6f0a38bf..185dcd89 100644
--- a/bplane/bplaneInt.h
+++ b/bplane/bplaneInt.h
@@ -33,8 +33,8 @@
  * This file defines constants and datastructures used internally by the
  * bplane module, but not exported to the rest of the world.
  */
-#ifndef _BPLANEINT_H
-#define _BPLANEINT_H
+#ifndef _MAGIC__BPLANE__BPLANEINT_H
+#define _MAGIC__BPLANE__BPLANEINT_H
 
 /* Tcl linked Parameters */
 extern int bpMinBAPop;         /* don't sub(bin) when count less than this
@@ -79,4 +79,4 @@ extern Plane *bpTestSnowTile(int size, bool trace);
 
 extern int bpRand(int min, int max);
 
-#endif /* _BPLANEINT_H */
+#endif /* _MAGIC__BPLANE__BPLANEINT_H */
diff --git a/calma/calma.h b/calma/calma.h
index 14e8f73b..a2730b80 100644
--- a/calma/calma.h
+++ b/calma/calma.h
@@ -19,8 +19,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/calma/calma.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _CALMA_H
-#define _CALMA_H
+#ifndef _MAGIC__CALMA__CALMA_H
+#define _MAGIC__CALMA__CALMA_H
 
 #include "utils/magic.h"
 
@@ -97,4 +97,4 @@ extern bool CalmaWriteZ(CellDef *rootDef, gzFile f);
 extern bool CalmaGenerateArrayZ(gzFile f, TileType type, int llx, int lly, int pitch, int cols, int rows);
 #endif
 
-#endif /* _CALMA_H */
+#endif /* _MAGIC__CALMA__CALMA_H */
diff --git a/calma/calmaInt.h b/calma/calmaInt.h
index 72fa6bf1..7acde49c 100644
--- a/calma/calmaInt.h
+++ b/calma/calmaInt.h
@@ -19,8 +19,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/calma/calmaInt.h,v 1.2 2010/06/24 12:37:15 tim Exp $
  */
 
-#ifndef _CALMAINT_H
-#define _CALMAINT_H
+#ifndef _MAGIC__CALMA__CALMAINT_H
+#define _MAGIC__CALMA__CALMAINT_H
 
 #include "utils/magic.h"
 #include "database/database.h"
@@ -274,4 +274,4 @@ extern Plane **cifCurReadPlanes;
 extern HashTable CifCellTable;
 extern Plane *cifEditCellPlanes[];
 
-#endif /* _CALMAINT_H */
+#endif /* _MAGIC__CALMA__CALMAINT_H */
diff --git a/cif/CIFint.h b/cif/CIFint.h
index 559daec8..c7522b94 100644
--- a/cif/CIFint.h
+++ b/cif/CIFint.h
@@ -19,8 +19,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/cif/CIFint.h,v 1.3 2008/12/04 17:10:29 tim Exp $"
  */
 
-#ifndef _CIFINT_H
-#define _CIFINT_H
+#ifndef _MAGIC__CIF__CIFINT_H
+#define _MAGIC__CIF__CIFINT_H
 
 #include "database/database.h"
 
@@ -396,4 +396,4 @@ extern void CIFError(Rect *area, char *message);
 #define CIF_SOLIDTYPE 1
 extern TileTypeBitMask CIFSolidBits;
 
-#endif /* _CIFINT_H */
+#endif /* _MAGIC__CIF__CIFINT_H */
diff --git a/cif/CIFread.h b/cif/CIFread.h
index 2a3a2ac6..43d3957a 100644
--- a/cif/CIFread.h
+++ b/cif/CIFread.h
@@ -21,8 +21,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/cif/CIFread.h,v 1.3 2010/08/25 17:33:55 tim Exp $
  */
 
-#ifndef _CIFREAD_H
-#define _CIFREAD_H
+#ifndef _MAGIC__CIF__CIFREAD_H
+#define _MAGIC__CIF__CIFREAD_H
 
 #include "cif/CIFint.h"
 
@@ -221,4 +221,4 @@ extern int cifParseLaChar;
 		? (cifParseLaAvail = FALSE, cifParseLaChar) \
 		: (cifParseLaChar = getc(cifInputFile)))
 
-#endif /* _CIFREAD_H */
+#endif /* _MAGIC__CIF__CIFREAD_H */
diff --git a/cif/cif.h b/cif/cif.h
index cefcbe1e..29ca3bb7 100644
--- a/cif/cif.h
+++ b/cif/cif.h
@@ -20,8 +20,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/cif/cif.h,v 1.4 2010/06/24 12:37:15 tim Exp $
  */
 
-#ifndef _CIF_H
-#define _CIF_H
+#ifndef _MAGIC__CIF__CIF_H
+#define _MAGIC__CIF__CIF_H
 
 #include "database/database.h"
 
@@ -95,4 +95,4 @@ extern LinkedRect *PaintPolygon(Point *pointlist, int number, Plane *plane, Pain
 /* C99 compat */
 extern int CIFGetContactSize(TileType type, int *edge, int *spacing, int *border);
 
-#endif /* _CIF_H */
+#endif /* _MAGIC__CIF__CIF_H */
diff --git a/cmwind/cmwind.h b/cmwind/cmwind.h
index 031c1c99..9aec52d6 100644
--- a/cmwind/cmwind.h
+++ b/cmwind/cmwind.h
@@ -19,8 +19,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/cmwind/cmwind.h,v 1.2 2009/09/10 20:32:51 tim Exp $
  */
 
-#ifndef _CMWIND_H
-#define _CMWIND_H
+#ifndef _MAGIC__CMWIND__CMWIND_H
+#define _MAGIC__CMWIND__CMWIND_H
 
 #include "windows/windows.h"
 #include "textio/txcommands.h"
@@ -81,4 +81,4 @@ extern bool CMWCheckWritten(void);
 extern void CMWinit(void);
 
 
-#endif /* _CMWIND_H */
+#endif /* _MAGIC__CMWIND__CMWIND_H */
diff --git a/commands/commands.h b/commands/commands.h
index 7e65acc4..d4f279c0 100644
--- a/commands/commands.h
+++ b/commands/commands.h
@@ -20,8 +20,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/commands/commands.h,v 1.3 2009/01/19 15:43:03 tim Exp $
  */
 
-#ifndef _COMMANDS_H
-#define	_COMMANDS_H
+#ifndef _MAGIC__COMMANDS__COMMANDS_H
+#define	_MAGIC__COMMANDS__COMMANDS_H
 
 #include "windows/windows.h"
 #include "database/database.h"
@@ -75,4 +75,4 @@ extern void CmdInit(void);
 extern void CmdDoProperty(CellDef *def, TxCommand *cmd, int argstart);
 extern void CmdPaintEraseButton(MagWindow *w, Point *refPoint, bool isPaint, bool isScreen);
 
-#endif /* _COMMANDS_H */
+#endif /* _MAGIC__COMMANDS__COMMANDS_H */
diff --git a/database/database.h.in b/database/database.h.in
index 83cb6940..20da7615 100644
--- a/database/database.h.in
+++ b/database/database.h.in
@@ -22,8 +22,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/database/database.h.in,v 1.8 2010/08/25 17:33:55 tim Exp $"
  */
 
-#ifndef _DATABASE_H
-#define	_DATABASE_H
+#ifndef _MAGIC__DATABASE__DATABASE_H
+#define _MAGIC__DATABASE__DATABASE_H
 
 #ifndef	_TILES_H
 #include "tiles/tile.h"
diff --git a/database/databaseInt.h b/database/databaseInt.h
index a4b975c1..556e573d 100644
--- a/database/databaseInt.h
+++ b/database/databaseInt.h
@@ -20,8 +20,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/database/databaseInt.h,v 1.3 2010/06/24 12:37:15 tim Exp $
  */
 
-#ifndef _DATABASEINT_H
-#define _DATABASEINT_H
+#ifndef _MAGIC__DATABASE__DATABASEINT_H
+#define _MAGIC__DATABASE__DATABASEINT_H
 
 #include "database/database.h"
 
@@ -247,4 +247,4 @@ extern TileTypeBitMask dbNotDefaultPaintTbl[];
 #define	ERASEAFFECTS(t, s) \
 	((t) != TT_SPACE && DBStdEraseEntry((t), (s), DBPlane(t)) != (t))
 
-#endif /* _DATABASEINT_H */
+#endif /* _MAGIC__DATABASE__DATABASEINT_H */
diff --git a/database/fonts.h b/database/fonts.h
index bee3e5ec..67f3d093 100644
--- a/database/fonts.h
+++ b/database/fonts.h
@@ -10,8 +10,8 @@
  * rcsid "$$"
  */
 
-#ifndef _FONTS_H
-#define	_FONTS_H
+#ifndef _MAGIC__DATABASE__FONTS_H
+#define _MAGIC__DATABASE__FONTS_H
 
 #ifndef	_TILES_H
 #include "tiles/tile.h"
@@ -39,4 +39,4 @@ typedef struct
 extern MagicFont **DBFontList;	/* List of loaded font vectors	*/
 extern int DBNumFonts;		/* Number of loaded fonts	*/
 
-#endif /* _FONTS_H */
+#endif /* _MAGIC__DATABASE__FONTS_H */
diff --git a/dbwind/dbwind.h b/dbwind/dbwind.h
index bb1be123..9348a0ba 100644
--- a/dbwind/dbwind.h
+++ b/dbwind/dbwind.h
@@ -20,8 +20,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/dbwind/dbwind.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _DBWIND_H
-#define _DBWIND_H
+#ifndef _MAGIC__DBWIND__DBWIND_H
+#define _MAGIC__DBWIND__DBWIND_H
 
 #include "database/database.h"
 #include "windows/windows.h"
@@ -261,4 +261,4 @@ extern void dbwElementInit();
 extern void dbwCrosshairInit();
 
 
-#endif /* _DBWIND_H */
+#endif /* _MAGIC__DBWIND__DBWIND_H */
diff --git a/dbwind/dbwtech.h b/dbwind/dbwtech.h
index b1912a83..cd328f0c 100644
--- a/dbwind/dbwtech.h
+++ b/dbwind/dbwtech.h
@@ -8,8 +8,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/dbwind/dbwtech.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _DBWTECH_H
-#define	_DBWTECH_H
+#ifndef _MAGIC__DBWIND__DBWTECH_H
+#define	_MAGIC__DBWIND__DBWTECH_H
 
 extern TileTypeBitMask	*DBWStyleToTypesTbl;
 
@@ -23,4 +23,4 @@ extern void DBWElementStyle();
 extern void DBWElementText();
 extern void DBWSetCrosshair();
 
-#endif /* _DBWTECH_H */
+#endif /* _MAGIC__DBWIND__DBWTECH_H */
diff --git a/debug/debug.h b/debug/debug.h
index 548ce094..0e16d5f8 100644
--- a/debug/debug.h
+++ b/debug/debug.h
@@ -21,8 +21,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/debug/debug.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _DEBUG_H
-#define _DEBUG_H
+#ifndef _MAGIC__DEBUG__DEBUG_H
+#define _MAGIC__DEBUG__DEBUG_H
 
 #include "utils/magic.h"
 
@@ -76,4 +76,4 @@ extern int DebugAddFlag(ClientData clientID, const char *name);
 extern void DebugShow(ClientData clientID);
 extern void DebugSet(ClientData clientID, int argc, char *argv[], int value);
 
-#endif /* _DEBUG_H */
+#endif /* _MAGIC__DEBUG__DEBUG_H */
diff --git a/drc/drc.h b/drc/drc.h
index 7ba1e434..c62b8019 100644
--- a/drc/drc.h
+++ b/drc/drc.h
@@ -20,8 +20,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/drc/drc.h,v 1.6 2010/09/20 21:13:22 tim Exp $
  */
 
-#ifndef _DRC_H
-#define	_DRC_H
+#ifndef _MAGIC__DRC__DRC_H
+#define	_MAGIC__DRC__DRC_H
 
 #include "database/database.h"
 
@@ -323,4 +323,4 @@ extern long drcCifPointToSegment();
 #define DRCHasWork ((DRCPendingRoot != NULL) && (DRCBackGround != DRC_SET_OFF))
 #endif
 
-#endif /* _DRC_H */
+#endif /* _MAGIC__DRC__DRC_H */
diff --git a/ext2spice/ext2spice.h b/ext2spice/ext2spice.h
index 3b320bcb..01c8ff09 100644
--- a/ext2spice/ext2spice.h
+++ b/ext2spice/ext2spice.h
@@ -3,8 +3,8 @@
  *	Definitions for ext2spice.c and ext2hier.c
  */
 
-#ifndef _EXTTOSPICE_H
-#define _EXTTOSPICE_H
+#ifndef _MAGIC__EXT2SPICE__EXT2SPICE_H
+#define _MAGIC__EXT2SPICE__EXT2SPICE_H
 
 /* cache list used to find parallel devs */
 typedef struct _devMerge {
@@ -196,4 +196,4 @@ typedef struct {
 
 extern int esFreeNodeClient(nodeClient *client);
 
-#endif  /* _EXTTOSPICE_H */
+#endif  /* _MAGIC__EXT2SPICE__EXT2SPICE_H */
diff --git a/extflat/EFint.h b/extflat/EFint.h
index 506818cb..8ef63242 100644
--- a/extflat/EFint.h
+++ b/extflat/EFint.h
@@ -19,8 +19,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/extflat/EFint.h,v 1.6 2010/12/16 18:59:03 tim Exp $
  */
 
-#ifndef _EFINT_H
-#define _EFINT_H
+#ifndef _MAGIC__EXTFLAT__EFINT_H
+#define _MAGIC__EXTFLAT__EFINT_H
 
 #include "utils/magic.h"
 
@@ -319,4 +319,4 @@ extern void efBuildResistor();
 extern void efBuildCap();
 extern HierContext *EFFlatBuildOneLevel();
 
-#endif /* _EFINT_H */
+#endif /* _MAGIC__EXTFLAT__EFINT_H */
diff --git a/extflat/extflat.h b/extflat/extflat.h
index d02830c1..90929d69 100644
--- a/extflat/extflat.h
+++ b/extflat/extflat.h
@@ -19,8 +19,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/extflat/extflat.h,v 1.2 2008/12/03 14:12:09 tim Exp $
  */
 
-#ifndef _EXTFLAT_H
-#define _EXTFLAT_H
+#ifndef _MAGIC__EXTFLAT__EXTFLAT_H
+#define _MAGIC__EXTFLAT__EXTFLAT_H
 
 #include "utils/magic.h"
 
@@ -418,4 +418,4 @@ extern int  EFHierVisitResists();
 extern int  EFHierVisitCaps();
 extern int  EFHierVisitNodes();
 
-#endif /* _EXTFLAT_H */
+#endif /* _MAGIC__EXTFLAT__EXTFLAT_H */
diff --git a/extract/extract.h b/extract/extract.h
index b5a2e90a..4d993a3d 100644
--- a/extract/extract.h
+++ b/extract/extract.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _EXTRACT_H
-#define _EXTRACT_H
+#ifndef _MAGIC__EXTRACT__EXTRACT_H
+#define _MAGIC__EXTRACT__EXTRACT_H
 
 #include "utils/magic.h"
 #include "database/database.h"  /* TileTypeBitMask */
@@ -147,4 +147,4 @@ extern void ExtLabelOneRegion();
 extern void ExtInit();
 extern bool ExtGetDevInfo();
 
-#endif /* _EXTRACT_H */
+#endif /* _MAGIC__EXTRACT__EXTRACT_H */
diff --git a/extract/extractInt.h b/extract/extractInt.h
index 0d1571eb..33f2396a 100644
--- a/extract/extractInt.h
+++ b/extract/extractInt.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _EXTRACTINT_H
-#define _EXTRACTINT_H
+#ifndef _MAGIC__EXTRACT__EXTRACTINT_H
+#define _MAGIC__EXTRACT__EXTRACTINT_H
 
 #include "database/database.h"
 
@@ -1118,4 +1118,4 @@ extern int  extMakeUnique();
 
 #include "extDebugInt.h"
 
-#endif /* _EXTRACTINT_H */
+#endif /* _MAGIC__EXTRACT__EXTRACTINT_H */
diff --git a/garouter/gaInternal.h b/garouter/gaInternal.h
index da8fb002..62bacb31 100644
--- a/garouter/gaInternal.h
+++ b/garouter/gaInternal.h
@@ -29,8 +29,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/garouter/gaInternal.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _GAINTERNAL_H
-#define _GAINTERNAL_H
+#ifndef _MAGIC__GAROUTER__GAINTERNAL_H
+#define _MAGIC__GAROUTER__GAINTERNAL_H
 
 #include "database/database.h"
 
@@ -108,4 +108,4 @@ extern bool gaStemSimpleRoute();
 extern bool gaStemSimpleRoute();
 extern int  gaBuildNetList();
 
-#endif /* _GAINTERNAL_H */
+#endif /* _MAGIC__GAROUTER__GAINTERNAL_H */
diff --git a/garouter/garouter.h b/garouter/garouter.h
index 241391d2..c1a27619 100644
--- a/garouter/garouter.h
+++ b/garouter/garouter.h
@@ -18,8 +18,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/garouter/garouter.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _GAROUTER_H
-#define _GAROUTER_H
+#ifndef _MAGIC__GAROUTER__GAROUTER_H
+#define _MAGIC__GAROUTER__GAROUTER_H
 
 #include "grouter/grouter.h"
 #include "utils/netlist.h"      /* NLTermLoc */
@@ -108,4 +108,4 @@ extern void GATest();
 /* Exported variables */
 extern bool GAStemWarn;
 
-#endif /* _GAROUTER_H */
+#endif /* _MAGIC__GAROUTER__GAROUTER_H */
diff --git a/gcr/gcr.h b/gcr/gcr.h
index bcebd989..8e045ee8 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.h
@@ -19,8 +19,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/gcr/gcr.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _GCR_H
-#define _GCR_H
+#ifndef _MAGIC__GCR__GCR_H
+#define _MAGIC__GCR__GCR_H
 
 #include "utils/magic.h"
 
@@ -377,4 +377,4 @@ extern int  gcrTryRun();
 extern void gcrUncollapse();
 extern void gcrVacate();
 
-#endif /* _GCR_H */
+#endif /* _MAGIC__GCR__GCR_H */
diff --git a/graphics/glyphs.h b/graphics/glyphs.h
index af101c8d..e33b8f49 100644
--- a/graphics/glyphs.h
+++ b/graphics/glyphs.h
@@ -20,8 +20,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/graphics/glyphs.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _GLYPHS_H
-#define _GLYPHS_H
+#ifndef _MAGIC__GRAPHICS__GLYPHS_H
+#define _MAGIC__GRAPHICS__GLYPHS_H
 
 #include "utils/geometry.h"
 
@@ -54,4 +54,4 @@ extern void GrFreeGlyphs();
 
 extern GrGlyphs *windGlyphs;
 
-#endif /* _GLYPHS_H */
+#endif /* _MAGIC__GRAPHICS__GLYPHS_H */
diff --git a/graphics/graphics.h b/graphics/graphics.h
index 1dc8486b..331681c5 100644
--- a/graphics/graphics.h
+++ b/graphics/graphics.h
@@ -19,8 +19,8 @@
 
 /* rcsid "$Header: /usr/cvsroot/magic-8.0/graphics/graphics.h,v 1.3 2010/06/24 12:37:18 tim Exp $" */
 
-#ifndef _GRAPHICS_H
-#define	_GRAPHICS_H
+#ifndef _MAGIC__GRAPHICS__GRAPHICS_H
+#define	_MAGIC__GRAPHICS__GRAPHICS_H
 
 #include "utils/magic.h"
 #include "utils/geometry.h"
@@ -233,4 +233,4 @@ extern unsigned char GrDisplayStatus;
 /* Special full-screen access for window manager only */
 #define GR_LOCK_SCREEN	(MagWindow *)(-1)
 
-#endif /* _GRAPHICS_H */
+#endif /* _MAGIC__GRAPHICS__GRAPHICS_H */
diff --git a/graphics/graphicsInt.h b/graphics/graphicsInt.h
index 36429843..87cd74b9 100644
--- a/graphics/graphicsInt.h
+++ b/graphics/graphicsInt.h
@@ -19,8 +19,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/graphics/graphicsInt.h,v 1.3 2010/06/24 12:37:18 tim Exp $"
  */
 
-#ifndef _GRAPHICSINT_H
-#define _GRAPHICSINT_H
+#ifndef _MAGIC__GRAPHICS__GRAPHICSINT_H
+#define _MAGIC__GRAPHICS__GRAPHICSINT_H
 
 #include "windows/windows.h"
 #include "utils/magic.h"
@@ -103,4 +103,4 @@ extern bool groglPreLoadFont();
 extern bool grtcairoLoadFont();
 #endif
 
-#endif /* _GRAPHICSINT_H */
+#endif /* _MAGIC__GRAPHICS__GRAPHICSINT_H */
diff --git a/graphics/wind3d.h b/graphics/wind3d.h
index 9a9362e0..57efee05 100644
--- a/graphics/wind3d.h
+++ b/graphics/wind3d.h
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef _WIND3D_H
-#define _WIND3D_H
+#ifndef _MAGIC__GRAPHICS__WIND3D_H
+#define _MAGIC__GRAPHICS__WIND3D_H
 
 #include "windows/windows.h"
 
@@ -67,4 +67,4 @@ extern void w3dCutBox();
 
 extern WindClient W3DclientID;
 
-#endif /* _WIND3D_H */
+#endif /* _MAGIC__GRAPHICS__WIND3D_H */
diff --git a/grouter/grouter.h b/grouter/grouter.h
index ec8e6d99..4128c0a9 100644
--- a/grouter/grouter.h
+++ b/grouter/grouter.h
@@ -19,8 +19,8 @@
  * sccsid "@(#)grouter.h	4.5 MAGIC (Berkeley) 10/31/85"
  */
 
-#ifndef _GROUTER_H
-#define _GROUTER_H
+#ifndef _MAGIC__GROUTER__GROUTER_H
+#define _MAGIC__GROUTER__GROUTER_H
 
 #include "router/router.h"
 #include "gcr/gcr.h"
@@ -299,4 +299,4 @@ extern bool glInitialized;	/* TRUE if registered with debug module */
 extern ClientData glDebugID;	/* Our identity with the debugging module */
 #include "grouteDebug.h"	/* Can add flags without total recompile */
 
-#endif /* _GROUTER_H */
+#endif /* _MAGIC__GROUTER__GROUTER_H */
diff --git a/irouter/irInternal.h b/irouter/irInternal.h
index e26b8636..f4090905 100644
--- a/irouter/irInternal.h
+++ b/irouter/irInternal.h
@@ -30,8 +30,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/irouter/irInternal.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _IRINTERNAL_H
-#define _IRINTERNAL_H
+#ifndef _MAGIC__IROUTER__IRINTERNAL_H
+#define _MAGIC__IROUTER__IRINTERNAL_H
 
 #include "irouter/irouter.h"
 #include "mzrouter/mzrouter.h"
@@ -75,4 +75,4 @@ extern int irRouteWid;		/* Reference window for subcell expansion
 #define DT_RECT		3
 #define DT_SELECTION	4
 
-#endif /* _IRINTERNAL_H */
+#endif /* _MAGIC__IROUTER__IRINTERNAL_H */
diff --git a/irouter/irouter.h b/irouter/irouter.h
index d87bb43d..5e7b54ab 100644
--- a/irouter/irouter.h
+++ b/irouter/irouter.h
@@ -21,8 +21,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/irouter/irouter.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _IROUTER_H
-#define _IROUTER_H
+#ifndef _MAGIC__IROUTER__IROUTER_H
+#define _MAGIC__IROUTER__IROUTER_H
 
 #include "utils/magic.h"
 
@@ -53,4 +53,4 @@ extern bool IRDRCLine();
 extern int  irRoute();
 extern void IRCommand();
 
-#endif /* _IROUTER_H */
+#endif /* _MAGIC__IROUTER__IROUTER_H */
diff --git a/lef/lef.h b/lef/lef.h
index 1d64c5e6..3daac472 100644
--- a/lef/lef.h
+++ b/lef/lef.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef _LEF_H
-#define _LEF_H
+#ifndef _MAGIC__LEF__LEF_H
+#define _MAGIC__LEF__LEF_H
 
 #include "utils/magic.h"
 
@@ -22,4 +22,4 @@ extern void LefTechSetDefaults(void);
 
 extern void LefInit(void);
 
-#endif /* _LEF_H */
+#endif /* _MAGIC__LEF__LEF_H */
diff --git a/lef/lefInt.h b/lef/lefInt.h
index 5aeebd1e..7c1f4a5c 100644
--- a/lef/lefInt.h
+++ b/lef/lefInt.h
@@ -7,8 +7,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/lef/lefInt.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _LEFINT_H
-#define _LEFINT_H
+#ifndef _MAGIC__LEF__LEFINT_H
+#define _MAGIC__LEF__LEFINT_H
 
 #include "utils/magic.h"
 
@@ -192,4 +192,4 @@ extern void lefRemoveGeneratedVias(void);
 #define DEF_INFO	6
 #define DEF_SUMMARY	7
 
-#endif /* _LEFINT_H */
+#endif /* _MAGIC__LEF__LEFINT_H */
diff --git a/mzrouter/mzInternal.h b/mzrouter/mzInternal.h
index 514282ea..943e0d87 100644
--- a/mzrouter/mzInternal.h
+++ b/mzrouter/mzInternal.h
@@ -23,8 +23,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/mzrouter/mzInternal.h,v 1.2 2008/06/01 18:37:44 tim Exp $
  */
 
-#ifndef _MZINTERNAL_H
-#define _MZINTERNAL_H
+#ifndef _MAGIC__MZROUTER__MZINTERNAL_H
+#define _MAGIC__MZROUTER__MZINTERNAL_H
 
 /*
  * Structures etc. that are exported by the mzrouter are defined in
@@ -504,4 +504,4 @@ extern void mzWalkUDContact();
 #define RC_WALKLRC	1024
 #define RC_DONE		2048
 
-#endif /* _MZINTERNAL_H */
+#endif /* _MAGIC__MZROUTER__MZINTERNAL_H */
diff --git a/mzrouter/mzrouter.h b/mzrouter/mzrouter.h
index 35b5a815..fcc9d6cd 100644
--- a/mzrouter/mzrouter.h
+++ b/mzrouter/mzrouter.h
@@ -20,8 +20,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/mzrouter/mzrouter.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _MZROUTER_H
-#define _MZROUTER_H
+#ifndef _MAGIC__MZROUTER__MZROUTER_H
+#define _MAGIC__MZROUTER__MZROUTER_H
 
 #include "database/database.h"
 #include "utils/geometry.h"
@@ -345,4 +345,4 @@ extern void MZAttachHintPlanes();
 /* Major cost unit */
 extern int mzMajorCostUnit;
 
-#endif /* _MZROUTER_H */
+#endif /* _MAGIC__MZROUTER__MZROUTER_H */
diff --git a/netmenu/netmenu.h b/netmenu/netmenu.h
index 67493703..32072e0a 100644
--- a/netmenu/netmenu.h
+++ b/netmenu/netmenu.h
@@ -21,8 +21,8 @@
  * rcsid = "$Header: /usr/cvsroot/magic-8.0/netmenu/netmenu.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $";
  */
 
-#ifndef _NETMENU_H
-#define _NETMENU_H
+#ifndef _MAGIC__NETMENU__NETMENU_H
+#define _MAGIC__NETMENU__NETMENU_H
 
 #include "utils/magic.h"
 
@@ -60,4 +60,4 @@ extern void NMMeasureAll();
 extern void nmGetNums();
 
 
-#endif /* _NETMENU_H */
+#endif /* _MAGIC__NETMENU__NETMENU_H */
diff --git a/netmenu/nmInt.h b/netmenu/nmInt.h
index 1869321f..c4529320 100644
--- a/netmenu/nmInt.h
+++ b/netmenu/nmInt.h
@@ -20,8 +20,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/netmenu/nmInt.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _NMINT_H
-#define _NMINT_H
+#ifndef _MAGIC__NETMENU__NMINT_H
+#define _MAGIC__NETMENU__NMINT_H
 
 #include "windows/windows.h"
 
@@ -153,4 +153,4 @@ extern char * NMCurNetName;
 #define NMUE_SELECT 3
 #define NMUE_NETLIST 4
 
-#endif /* _NMINT_H */
+#endif /* _MAGIC__NETMENU__NMINT_H */
diff --git a/oa/oa.h b/oa/oa.h
index 476889ba..d7ec69cb 100644
--- a/oa/oa.h
+++ b/oa/oa.h
@@ -7,8 +7,8 @@
 /* MultiGiG, Inc., Scotts Valley, CA				*/
 /*--------------------------------------------------------------*/
 
-#ifndef _OA_H
-#define _OA_H
+#ifndef _MAGIC__OA__OA_H
+#define _MAGIC__OA__OA_H
 
 /* Header file is wrapped in ifdef so include statements don't	*/
 /* need to be.							*/
@@ -20,4 +20,4 @@ extern int oaTreeCellSrFunc();		/* see DBcellsrch.c */
 
 #endif	/* OPENACCESS */
 
-#endif /* _OA_H */
+#endif /* _MAGIC__OA__OA_H */
diff --git a/plot/plot.h b/plot/plot.h
index 38ddaafb..3819db10 100644
--- a/plot/plot.h
+++ b/plot/plot.h
@@ -19,8 +19,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/plot/plot.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _PLOT_H
-#define _PLOT_H
+#ifndef _MAGIC__PLOT__PLOT_H
+#define _MAGIC__PLOT__PLOT_H
 
 #include "utils/magic.h"
 
@@ -50,4 +50,4 @@ extern void PlotPNM();
 extern void PlotSetParam();
 extern void PlotPrintParams();
 
-#endif /* _PLOT_H */
+#endif /* _MAGIC__PLOT__PLOT_H */
diff --git a/plot/plotInt.h b/plot/plotInt.h
index 8da2edfe..5f5a874d 100644
--- a/plot/plotInt.h
+++ b/plot/plotInt.h
@@ -19,8 +19,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/plot/plotInt.h,v 1.2 2010/03/08 13:33:33 tim Exp $
  */
 
-#ifndef _PLOTINT_H
-#define _PLOTINT_H
+#ifndef _MAGIC__PLOT__PLOTINT_H
+#define _MAGIC__PLOT__PLOTINT_H
 
 #include "utils/magic.h"
 #include "utils/geometry.h"
@@ -250,4 +250,4 @@ extern void PlotPNM();
 extern void PlotPNM();
 extern int  PlotRTLCompress();
 
-#endif /* _PLOTINT_H */
+#endif /* _MAGIC__PLOT__PLOTINT_H */
diff --git a/plow/plow.h b/plow/plow.h
index 6ee61ffd..b38c0f8d 100644
--- a/plow/plow.h
+++ b/plow/plow.h
@@ -18,8 +18,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/plow/plow.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _PLOW_H
-#define _PLOW_H
+#ifndef _MAGIC__PLOW__PLOW_H
+#define _MAGIC__PLOW__PLOW_H
 
 #include "utils/magic.h"
 
@@ -59,4 +59,4 @@ extern void DRCPlowScale();
 extern void PlowInit();
 extern void PlowAfterTech();
 
-#endif /* _PLOW_H */
+#endif /* _MAGIC__PLOW__PLOW_H */
diff --git a/plow/plowInt.h b/plow/plowInt.h
index 5c165086..a01c8548 100644
--- a/plow/plowInt.h
+++ b/plow/plowInt.h
@@ -20,8 +20,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/plow/plowInt.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _PLOWINT_H
-#define	_PLOWINT_H
+#ifndef _MAGIC__PLOW__PLOWINT_H
+#define	_MAGIC__PLOW__PLOWINT_H
 
 #include "tiles/tile.h"
 
@@ -293,4 +293,4 @@ extern void plowShowTime();
  */
 #include "plowDebugInt.h"
 
-#endif	/* _PLOWINT_H */
+#endif	/* _MAGIC__PLOW__PLOWINT_H */
diff --git a/resis/resis.h b/resis/resis.h
index bb110b39..f9129a3d 100644
--- a/resis/resis.h
+++ b/resis/resis.h
@@ -6,8 +6,8 @@
    refer to both before and after processing.
 */
 
-#ifndef _RESIS_H
-#define _RESIS_H
+#ifndef _MAGIC__RESIS__RESIS_H
+#define _MAGIC__RESIS__RESIS_H
 
 #define LAYERS_PER_CONTACT 4
 #define TILES_PER_JUNCTION 2
@@ -737,4 +737,4 @@ extern int  resWalkup();
 	pX_->portList = rp; \
 }
 
-#endif /* _RESIS_H */
+#endif /* _MAGIC__RESIS__RESIS_H */
diff --git a/router/router.h b/router/router.h
index c7d45528..972a6a25 100644
--- a/router/router.h
+++ b/router/router.h
@@ -20,8 +20,8 @@
  * rcsid="$Header: /usr/cvsroot/magic-8.0/router/router.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _ROUTER_H
-#define _ROUTER_H
+#ifndef _MAGIC__ROUTER__ROUTER_H
+#define _MAGIC__ROUTER__ROUTER_H
 
 #include "database/database.h"
 #include "utils/geometry.h"
@@ -212,4 +212,4 @@ extern void RtrPaintStats();
 extern CellDef *RtrFindChannelDef();
 extern struct pin *RtrPointToPin();
 
-#endif /* _ROUTER_H */
+#endif /* _MAGIC__ROUTER__ROUTER_H */
diff --git a/router/routerInt.h b/router/routerInt.h
index a3049646..a3ef3d3e 100644
--- a/router/routerInt.h
+++ b/router/routerInt.h
@@ -23,8 +23,8 @@
  *	but global to all source files within the router module.
  */
 
-#ifndef _ROUTERINT_H
-#define _ROUTERINT_H
+#ifndef _MAGIC__ROUTER__ROUTERINT_H
+#define _MAGIC__ROUTER__ROUTERINT_H
 
 extern int	rtrTarget;			/* Via minimization, target type	*/
 extern int	rtrReplace;			/* Via minimization, replacement type	*/
@@ -46,4 +46,4 @@ extern int  rtrSrTraverse();
 extern int  rtrListVia();
 extern void rtrListArea();
 
-#endif /* _ROUTERINT_H */
+#endif /* _MAGIC__ROUTER__ROUTERINT_H */
diff --git a/router/rtrDcmpose.h b/router/rtrDcmpose.h
index 6a3b3f1d..703ff89a 100644
--- a/router/rtrDcmpose.h
+++ b/router/rtrDcmpose.h
@@ -18,8 +18,8 @@
  * rcsid="$Header: /usr/cvsroot/magic-8.0/router/rtrDcmpose.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _RTRDECOMPOSE_H
-#define _RTRDECOMPOSE_H
+#ifndef _MAGIC__ROUTER__RTRDCMPOSE_H
+#define _MAGIC__ROUTER__RTRDCMPOSE_H
 
 #define rtrNW 1	/* Corner codes :	*/
 #define rtrSW 2  /*  NW=1 ______ NE=8	*/
@@ -72,4 +72,4 @@ int rtrSrFunc();
 /* Exported Procedures */
 CellDef * RtrDecompose();
 
-#endif /* _RTRDECOMPOSE_H */
+#endif /* _MAGIC__ROUTER__RTRDCMPOSE_H */
diff --git a/select/selInt.h b/select/selInt.h
index f6fcaad0..329a7f92 100644
--- a/select/selInt.h
+++ b/select/selInt.h
@@ -20,8 +20,8 @@
  * rcsid="$Header: /usr/cvsroot/magic-8.0/select/selInt.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _SELINT_H
-#define _SELINT_H
+#ifndef _MAGIC__SELECT__SELINT_H
+#define _MAGIC__SELECT__SELINT_H
 
 #include "utils/magic.h"
 #include "database/database.h"
@@ -43,4 +43,4 @@ extern CellDef *Select2Def;
 
 extern CellUse *selectLastUse;
 
-#endif /* _SELINT_H */
+#endif /* _MAGIC__SELECT__SELINT_H */
diff --git a/select/select.h b/select/select.h
index ef6f2a68..f4f920e9 100644
--- a/select/select.h
+++ b/select/select.h
@@ -20,8 +20,8 @@
  * rcsid="$Header: /usr/cvsroot/magic-8.0/select/select.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _SELECT_H
-#define _SELECT_H
+#ifndef _MAGIC__SELECT__SELECT_H
+#define _MAGIC__SELECT__SELECT_H
 
 #include "utils/magic.h"
 #include "database/database.h"
@@ -84,4 +84,4 @@ extern CellDef *SelectRootDef;
 extern CellDef *SelectDef;
 extern CellUse *SelectUse;
 
-#endif /* _SELECT_H */
+#endif /* _MAGIC__SELECT__SELECT_H */
diff --git a/sim/sim.h b/sim/sim.h
index a5495bf8..08c7fcc5 100644
--- a/sim/sim.h
+++ b/sim/sim.h
@@ -1,5 +1,5 @@
-#ifndef _SIM_H
-#define _SIM_H
+#ifndef _MAGIC__SIM__SIM_H
+#define _MAGIC__SIM__SIM_H
 
 #include "utils/magic.h"
 #include "textio/txcommands.h"	/* TxCommand */
@@ -49,4 +49,4 @@ extern bool SimSelection(const char *cmd);
 extern void SimRsimMouse(MagWindow *w);
 extern int SimFillBuffer(char *buffHead, char **pLastChar, int *charCount);
 
-#endif /* _SIM_H */
+#endif /* _MAGIC__SIM__SIM_H */
diff --git a/tcltk/tclmagic.h b/tcltk/tclmagic.h
index c2dcbc61..fb94dab4 100644
--- a/tcltk/tclmagic.h
+++ b/tcltk/tclmagic.h
@@ -6,8 +6,8 @@
  *	the definition for "ClientData" is in conflict.
  */
 
-#ifndef _TCLMAGIC_H
-#define _TCLMAGIC_H
+#ifndef _MAGIC__TCLTK__TCLMAGIC_H
+#define _MAGIC__TCLTK__TCLMAGIC_H
 
 #ifdef MAGIC_WRAPPER
 
@@ -31,4 +31,4 @@ extern void MakeWindowCommand();
 extern const char *Tclmagic_InitStubsVersion;
 
 #endif	/* MAGIC_WRAPPER */
-#endif /* _TCLMAGIC_H */
+#endif /* _MAGIC__TCLTK__TCLMAGIC_H */
diff --git a/textio/textio.h b/textio/textio.h
index 2dd50046..36a31c57 100644
--- a/textio/textio.h
+++ b/textio/textio.h
@@ -22,8 +22,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/textio/textio.h,v 1.2 2008/02/18 01:01:35 tim Exp $
  */
 
-#ifndef _TEXTIO_H
-#define _TEXTIO_H
+#ifndef _MAGIC__TEXTIO__TEXTIO_H
+#define _MAGIC__TEXTIO__TEXTIO_H
 
 #include "utils/magic.h"
 #include "utils/dqueue.h" /* DQueue */
@@ -110,4 +110,4 @@ extern void TxInit(void);
 extern void TxInitReadline(void);
 #endif
 
-#endif /* _TEXTIO_H */
+#endif /* _MAGIC__TEXTIO__TEXTIO_H */
diff --git a/textio/textioInt.h b/textio/textioInt.h
index 569fe6d6..067606ad 100644
--- a/textio/textioInt.h
+++ b/textio/textioInt.h
@@ -19,8 +19,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/textio/textioInt.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _TEXTIOINT_H
-#define _TEXTIOINT_H
+#ifndef _MAGIC__TEXTIO__TEXTIOINT_H
+#define _MAGIC__TEXTIO__TEXTIOINT_H
 
 #include "utils/magic.h"
 #include "textio/textio.h"
@@ -68,4 +68,4 @@ extern char *TxGetLineWPrompt(char *dest, int maxChars, const char *prompt, cons
 extern int Tcl_printf(FILE *fp, const char *fmt, va_list ap);
 #endif
 
-#endif /* _TEXTIOINT_H */
+#endif /* _MAGIC__TEXTIO__TEXTIOINT_H */
diff --git a/textio/txcommands.h b/textio/txcommands.h
index cf28ef32..cfb533c4 100644
--- a/textio/txcommands.h
+++ b/textio/txcommands.h
@@ -18,8 +18,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/textio/txcommands.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _TXCOMMANDS_H
-#define _TXCOMMANDS_H
+#ifndef _MAGIC__TEXTIO__TXCOMMANDS_H
+#define _MAGIC__TEXTIO__TXCOMMANDS_H
 
 #include "utils/magic.h"
 #include "utils/geometry.h"
@@ -164,4 +164,4 @@ extern int TxCommandNumber;	/* Serial number of current command. */
 extern int TxTclDispatch(ClientData clientData, int argc, char *argv[], bool quiet);
 #endif
 
-#endif /* _TXCOMMANDS_H */
+#endif /* _MAGIC__TEXTIO__TXCOMMANDS_H */
diff --git a/tiles/tile.h b/tiles/tile.h
index b876a346..4bcac11a 100644
--- a/tiles/tile.h
+++ b/tiles/tile.h
@@ -20,8 +20,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/tiles/tile.h,v 1.3 2010/06/24 12:37:57 tim Exp $"
  */
 
-#ifndef _TILES_H
-#define	_TILES_H
+#ifndef _MAGIC__TILES__TILE_H
+#define	_MAGIC__TILES__TILE_H
 
 #ifndef _MAGIC_H
 #include "utils/magic.h"
@@ -390,4 +390,4 @@ extern const Rect TiPlaneRect;	/* Rectangle large enough to force area
 				 * that should ever be painted in a plane.
 				 */
 
-#endif /* _TILES_H */
+#endif /* _MAGIC__TILES__TILE_H */
diff --git a/utils/dqueue.h b/utils/dqueue.h
index a64c73e6..d78b733a 100644
--- a/utils/dqueue.h
+++ b/utils/dqueue.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_DQUEUE_H
-#define	_DQUEUE_H
+#ifndef	_MAGIC__UTILS__DQUEUE_H
+#define	_MAGIC__UTILS__DQUEUE_H
 
 #include "utils/magic.h"
 
@@ -52,4 +52,4 @@ extern void DQPushRear();
 extern ClientData DQPopFront();
 extern ClientData DQPopRear();
 
-#endif	/* _DQUEUE_H */
+#endif	/* _MAGIC__UTILS__DQUEUE_H */
diff --git a/utils/geometry.h b/utils/geometry.h
index fc82835e..36ca7829 100644
--- a/utils/geometry.h
+++ b/utils/geometry.h
@@ -18,8 +18,8 @@
 
 /* rcsid "$Header: /usr/cvsroot/magic-8.0/utils/geometry.h,v 1.2 2009/09/10 20:32:55 tim Exp $" */
 
-#ifndef _GEOMETRY_H
-#define _GEOMETRY_H 1
+#ifndef _MAGIC__UTILS__GEOMETRY_H
+#define _MAGIC__UTILS__GEOMETRY_H 
 
 /*-------------------------------------------------------------------
  * Structure definition for Point (an x,y pair).
@@ -226,4 +226,4 @@ extern const Point GeoOrigin;
 
 extern const int GeoOppositePos[];
 
-#endif /* _GEOMETRY_H */
+#endif /* _MAGIC__UTILS__GEOMETRY_H */
diff --git a/utils/hash.h b/utils/hash.h
index eafce329..a55692bd 100644
--- a/utils/hash.h
+++ b/utils/hash.h
@@ -18,8 +18,8 @@
 
 /* rcsid "$Header: /usr/cvsroot/magic-8.0/utils/hash.h,v 1.2 2009/09/10 20:32:55 tim Exp $" */
 
-#ifndef	_HASH_H
-#define	_HASH_H
+#ifndef	_MAGIC__UTILS__HASH_H
+#define	_MAGIC__UTILS__HASH_H
 
 /*---------------------------------------------------------
  *	This first stuff should only be used internally
@@ -133,4 +133,4 @@ extern HashEntry *HashNext(HashTable *, HashSearch *);
 /* HashGetNumEntries(ht); HashTable *ht ; returns number of entries in table */
 #define	HashGetNumEntries(ht)	((ht)->ht_nEntries)
 
-#endif	/* _HASH_H */
+#endif	/* _MAGIC__UTILS__HASH_H */
diff --git a/utils/heap.h b/utils/heap.h
index a91811fc..a10c4bc3 100644
--- a/utils/heap.h
+++ b/utils/heap.h
@@ -62,8 +62,8 @@
  */
 
 
-#ifndef _HEAP_H
-#define _HEAP_H
+#ifndef _MAGIC__UTILS__HEAP_H
+#define _MAGIC__UTILS__HEAP_H
 
 #include "utils/geometry.h"
 
@@ -141,4 +141,4 @@ extern void HeapDump(Heap *heap);
 
 #define HEAP_EMPTY(h)   ((h)->he_used == 0)
 
-#endif /* _HEAP_H */
+#endif /* _MAGIC__UTILS__HEAP_H */
diff --git a/utils/ihash.h b/utils/ihash.h
index 3efe01cf..a6d1ca20 100644
--- a/utils/ihash.h
+++ b/utils/ihash.h
@@ -39,8 +39,8 @@
 
 /* rcsid "$Header$" */
 
-#ifndef _IHASH_H
-#define	_IHASH_H
+#ifndef _MAGIC__UTILS__IHASH_H
+#define	_MAGIC__UTILS__IHASH_H
 
 /* returns total memory required for malloc of given size, for	*/
 /* routine IHashStat2() only.					*/
@@ -130,4 +130,4 @@ extern int IHash4WordKeyHash(void *key);
 
 /* key comparison function for four word keys */
 extern int IHash4WordKeyEq(void *key1, void *key2);
-#endif /* _IHASH_H */
+#endif /* _MAGIC__UTILS__IHASH_H */
diff --git a/utils/list.h b/utils/list.h
index 26bf8841..78ed0a9d 100644
--- a/utils/list.h
+++ b/utils/list.h
@@ -25,8 +25,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/utils/list.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef	_LIST_H
-#define	_LIST_H
+#ifndef	_MAGIC__UTILS__LIST_H
+#define	_MAGIC__UTILS__LIST_H
 
 #include "utils/magic.h"
 
@@ -71,4 +71,4 @@ extern List *ListReverse();	/* usage:  ListReverse(&List) */
 	ListDealloc(LIST_intermediate); \
     } else
 
-#endif	/* _LIST_H */
+#endif	/* _MAGIC__UTILS__LIST_H */
diff --git a/utils/macros.h b/utils/macros.h
index 5e078ff4..1e232f68 100644
--- a/utils/macros.h
+++ b/utils/macros.h
@@ -19,8 +19,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/utils/macros.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _MACROS_H
-#define _MACROS_H
+#ifndef _MAGIC__UTILS__MACROS_H
+#define _MAGIC__UTILS__MACROS_H
 
 #include "utils/magic.h"
 #include "utils/hash.h"
@@ -51,4 +51,4 @@ extern char *MacroName();	/* returns a malloc'ed string */
 extern int MacroKey();
 extern int MacroCode();
 
-#endif /* _MACROS_H */
+#endif /* _MAGIC__UTILS__MACROS_H */
diff --git a/utils/magic.h b/utils/magic.h
index 9a2a2428..433a69af 100644
--- a/utils/magic.h
+++ b/utils/magic.h
@@ -18,8 +18,8 @@
  * rcsid="$Header"
  */
 
-#ifndef _MAGIC_H
-#define	_MAGIC_H
+#ifndef _MAGIC__UTILS__MAGIC_H
+#define	_MAGIC__UTILS__MAGIC_H
 
 #include <errno.h>
 #include <limits.h>
@@ -286,4 +286,4 @@ extern char AbortMessage[];
 
 /* ------------------ End of Machine Configuration Section ----------------- */
 
-#endif /* _MAGIC_H */
+#endif /* _MAGIC__UTILS__MAGIC_H */
diff --git a/utils/magic_alloca.h b/utils/magic_alloca.h
index 4006f9fc..d9ced9ac 100644
--- a/utils/magic_alloca.h
+++ b/utils/magic_alloca.h
@@ -47,8 +47,8 @@
  *
  */
 
-#ifndef _MAGIC__ALLOCA_H
-#define _MAGIC__ALLOCA_H
+#ifndef _MAGIC__UTILS__MAGIC_ALLOCA_H
+#define _MAGIC__UTILS__MAGIC_ALLOCA_H
 
 /* taken from autoconf documentation:
  *    https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Functions.html
@@ -83,4 +83,4 @@ void *alloca (size_t);
 # endif
 #endif
 
-#endif /* _MAGIC__ALLOCA_H */
+#endif /* _MAGIC__UTILS__MAGIC_ALLOCA_H */
diff --git a/utils/magic_assert.h b/utils/magic_assert.h
index 7e3de5ef..c5f8131b 100644
--- a/utils/magic_assert.h
+++ b/utils/magic_assert.h
@@ -18,8 +18,8 @@
  * rcsid="$Header"
  */
 
-#ifndef _MAGIC_ASSERT_H
-#define _MAGIC_ASSERT_H
+#ifndef _MAGIC__UTILS__MAGIC_ASSERT_H
+#define _MAGIC__UTILS__MAGIC_ASSERT_H
 
 
 /* --------------------- Debugging and assertions --------------------- */
@@ -30,4 +30,4 @@
 #define	ASSERT(p, where) assert(p)	/* "where" is ignored */
 
 
-#endif /* _MAGIC_ASSERT_H */
+#endif /* _MAGIC__UTILS__MAGIC_ASSERT_H */
diff --git a/utils/magsgtty.h b/utils/magsgtty.h
index d2e68d7c..76f7ddf5 100644
--- a/utils/magsgtty.h
+++ b/utils/magsgtty.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef	_MAGSGTTY_H
-#define _MAGSGTTY_H
+#ifndef	_MAGIC__UTILS__MAGSGTTY_H
+#define _MAGIC__UTILS__MAGSGTTY_H
 
 #if !defined(SYSV) && !defined(CYGWIN)
 
@@ -44,4 +44,4 @@
 #include <termio.h>
 #endif
 
-#endif	/* _MAGSGTTY_H */
+#endif	/* _MAGIC__UTILS__MAGSGTTY_H */
diff --git a/utils/main.h b/utils/main.h
index bb5acc55..df3948b9 100644
--- a/utils/main.h
+++ b/utils/main.h
@@ -20,8 +20,8 @@
  * rcsid="$Header: /usr/cvsroot/magic-8.0/utils/main.h,v 1.2 2009/09/10 20:32:55 tim Exp $"
  */
 
-#ifndef _MAIN_H
-#define _MAIN_H
+#ifndef _MAGIC__UTILS__MAIN_H
+#define _MAGIC__UTILS__MAIN_H
 
 #include "windows/windows.h"
 #include "database/database.h"
@@ -101,4 +101,4 @@ extern int  mainDoArgs();
 extern int  mainInitAfterArgs();
 extern int  mainInitFinal();
 
-#endif /* _MAIN_H */
+#endif /* _MAGIC__UTILS__MAIN_H */
diff --git a/utils/malloc.h b/utils/malloc.h
index de00e3b1..0e03591c 100644
--- a/utils/malloc.h
+++ b/utils/malloc.h
@@ -19,11 +19,11 @@
  *     *********************************************************************
  */
 
-#ifndef _MALLOC_H
-#define _MALLOC_H
+#ifndef _MAGIC__UTILS__MALLOC_H
+#define _MAGIC__UTILS__MALLOC_H
 
 extern void *mallocMagic(size_t);
 extern void *callocMagic(size_t);
 extern void freeMagic(void *);
 
-#endif /* _MALLOC_H */
+#endif /* _MAGIC__UTILS__MALLOC_H */
diff --git a/utils/maxrect.h b/utils/maxrect.h
index 71e60e02..74761198 100644
--- a/utils/maxrect.h
+++ b/utils/maxrect.h
@@ -20,8 +20,8 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/utils/maxrect.h,v 1.1 2008/12/04 16:21:44 tim Exp $
  */
 
-#ifndef _MAXRECT_H
-#define	_MAXRECT_H
+#ifndef _MAGIC__UTILS__MAXRECT_H
+#define	_MAGIC__UTILS__MAXRECT_H
 
 #include "database/database.h"
 
@@ -48,4 +48,4 @@ extern Rect *FindMaxRectangle();
 extern Rect *FindMaxRectangle2();
 extern int FindMaxRects();
 
-#endif /* _MAXRECT_H */
+#endif /* _MAGIC__UTILS__MAXRECT_H */
diff --git a/utils/netlist.h b/utils/netlist.h
index dab63004..09ddb48e 100644
--- a/utils/netlist.h
+++ b/utils/netlist.h
@@ -19,8 +19,8 @@
  * RCSID $Header: /usr/cvsroot/magic-8.0/utils/netlist.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef _RMNETLIST_H
-#define _RMNETLIST_H
+#ifndef _MAGIC__UTILS__NETLIST_H
+#define _MAGIC__UTILS__NETLIST_H
 
 #include "utils/geometry.h"
 #include "utils/magic.h"
@@ -128,4 +128,4 @@ extern void NLFree();
 extern int  NLBuild();
 extern void NLSort();
 
-#endif /* _RMNETLIST_H */
+#endif /* _MAGIC__UTILS__NETLIST_H */
diff --git a/utils/paths.h b/utils/paths.h
index a1f48d30..236ddc6c 100644
--- a/utils/paths.h
+++ b/utils/paths.h
@@ -20,8 +20,8 @@
  * rcsid="$Header"
  */
 
-#ifndef _PATHS_H
-#define _PATHS_H
+#ifndef _MAGIC__UTILS__PATHS_H
+#define _MAGIC__UTILS__PATHS_H
 
 /*
  * Paths used by 'ext2sim' and 'magicusage'.
@@ -72,4 +72,4 @@
  */
 #define CAD_LIB_PATH	". $CAD_ROOT/"
 
-#endif /* _PATHS_H */
+#endif /* _MAGIC__UTILS__PATHS_H */
diff --git a/utils/pathvisit.h b/utils/pathvisit.h
index beb84b71..7f85d99d 100644
--- a/utils/pathvisit.h
+++ b/utils/pathvisit.h
@@ -18,8 +18,8 @@
 
 /* rcsid "$Header: /usr/cvsroot/magic-8.0/utils/pathvisit.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $" */
 
-#ifndef	_PATHVISIT_H
-#define	_PATHVISIT_H
+#ifndef	_MAGIC__UTILS__PATHVISIT_H
+#define	_MAGIC__UTILS__PATHVISIT_H
 
 /* Each client will match words beginning with a particular keyword */
 typedef struct pvc
@@ -46,4 +46,4 @@ extern void PaVisitAddClient();
 extern int  PaVisitFiles();
 extern void PaVisitFree();
 
-#endif	/* _PATHVISIT_H */
+#endif	/* _MAGIC__UTILS__PATHVISIT_H */
diff --git a/utils/runstats.h b/utils/runstats.h
index b6b865bb..9b711e76 100644
--- a/utils/runstats.h
+++ b/utils/runstats.h
@@ -18,8 +18,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/utils/runstats.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef	_RUNSTATS_H
-#define	_RUNSTATS_H
+#ifndef	_MAGIC__UTILS__RUNSTATS_H
+#define	_MAGIC__UTILS__RUNSTATS_H
 
 #define	RS_TCUM		01	/* Cumulative user and system time */
 #define	RS_TINCR	02	/* User and system time since last call */
@@ -28,4 +28,4 @@
 extern char *RunStats();
 extern char *RunStatsRealTime();
 
-#endif	/* _RUNSTATS_H */
+#endif	/* _MAGIC__UTILS__RUNSTATS_H */
diff --git a/utils/signals.h b/utils/signals.h
index 2232802e..58b7e2dd 100644
--- a/utils/signals.h
+++ b/utils/signals.h
@@ -19,8 +19,8 @@
  * rcsid[]="$Header: /usr/cvsroot/magic-8.0/utils/signals.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $";
  */
 
-#ifndef _MAGSIGNAL_H
-#define _MAGSIGNAL_H
+#ifndef _MAGIC__UTILS__SIGNALS_H
+#define _MAGIC__UTILS__SIGNALS_H
 
 #include "utils/magic.h"
 
@@ -59,4 +59,4 @@ extern void SigRemoveTimer();
 
 extern sigRetVal sigOnInterrupt();
 
-#endif /* _MAGSIGNAL_H */
+#endif /* _MAGIC__UTILS__SIGNALS_H */
diff --git a/utils/stack.h b/utils/stack.h
index 73885500..1a9ee563 100644
--- a/utils/stack.h
+++ b/utils/stack.h
@@ -20,8 +20,8 @@
  * sccsid @(#)stack.h	4.1 MAGIC (Berkeley) 7/4/85
  */
 
-#ifndef	_STACK_H
-#define	_STACK_H
+#ifndef	_MAGIC__UTILS__STACK_H
+#define	_MAGIC__UTILS__STACK_H
 
 #include "utils/magic.h"
 
@@ -80,4 +80,4 @@ void StackCopy();
 		*((st)->st_ptr++) = (ClientData)(pointertype) (a); \
 	} else
 
-#endif	/* _STACK_H */
+#endif	/* _MAGIC__UTILS__STACK_H */
diff --git a/utils/styles.h b/utils/styles.h
index ce0b8105..22933cf2 100644
--- a/utils/styles.h
+++ b/utils/styles.h
@@ -18,8 +18,8 @@
  * rcsid:  $Header: /usr/cvsroot/magic-8.0/utils/styles.h,v 1.2 2008/12/11 04:20:14 tim Exp $
  */
 
-#ifndef _STYLES_H
-#define _STYLES_H 1
+#ifndef _MAGIC__UTILS__STYLES_H
+#define _MAGIC__UTILS__STYLES_H 
 
 /* Styles are divided into three parts: 1) system styles, used for
  * purposes such as drawing and erasing tools, window borders, etc.,
@@ -199,4 +199,4 @@
 /* pick icon */
 #define STYLE_CURS_PICK		22
 
-#endif /* _STYLES_H */
+#endif /* _MAGIC__UTILS__STYLES_H */
diff --git a/utils/tech.h b/utils/tech.h
index c94c0e80..7f56eb7a 100644
--- a/utils/tech.h
+++ b/utils/tech.h
@@ -18,8 +18,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/utils/tech.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"
  */
 
-#ifndef _TECH_H
-#define _TECH_H
+#ifndef _MAGIC__UTILS__TECH_H
+#define _MAGIC__UTILS__TECH_H
 
 #include "utils/magic.h"
 
@@ -60,4 +60,4 @@ extern SectionID TechSectionGetMask();
 extern void TechInit();
 extern int  techGetTokens();
 
-#endif /* _TECH_H */
+#endif /* _MAGIC__UTILS__TECH_H */
diff --git a/utils/touchingtypes.h b/utils/touchingtypes.h
index ccd3854a..8136bb75 100644
--- a/utils/touchingtypes.h
+++ b/utils/touchingtypes.h
@@ -18,10 +18,10 @@
  * rcsid $Header: /usr/cvsroot/magic-8.0/utils/touchingtypes.h,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $
  */
 
-#ifndef	_TOUCHINGTYPES_H
-#define	_TOUCHINGTYPES_H
+#ifndef	_MAGIC__UTILS__TOUCHINGTYPES_H
+#define	_MAGIC__UTILS__TOUCHINGTYPES_H
 
 /* -------------------- Functions (exported by touching.c) ---------------- */
 extern TileTypeBitMask TouchingTypes();
 
-#endif	/* _TOUCHINGTYPES_H */
+#endif	/* _MAGIC__UTILS__TOUCHINGTYPES_H */
diff --git a/utils/undo.h b/utils/undo.h
index d0166ae9..a593bfb1 100644
--- a/utils/undo.h
+++ b/utils/undo.h
@@ -21,8 +21,8 @@
  * rcsid "$Header: /usr/cvsroot/magic-8.0/utils/undo.h,v 1.2 2009/09/10 20:32:55 tim Exp $"
  */
 
-#ifndef	_UNDO_H
-#define	_UNDO_H
+#ifndef	_MAGIC__UTILS__UNDO_H
+#define	_MAGIC__UTILS__UNDO_H
 
 #include "utils/magic.h"
 
@@ -90,4 +90,4 @@ extern void UndoStackTrace(int);
 extern int UndoDisableCount;
 #define	UndoIsEnabled()	(UndoDisableCount == 0)
 
-#endif	/* _UNDO_H */
+#endif	/* _MAGIC__UTILS__UNDO_H */
diff --git a/utils/utils.h b/utils/utils.h
index 4067d0e0..4b353917 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -18,8 +18,8 @@
 
 /* rcsid "$Header: /usr/cvsroot/magic-8.0/utils/utils.h,v 1.2 2009/09/10 20:32:55 tim Exp $" */
 
-#ifndef _UTILS_H
-#define _UTILS_H 1
+#ifndef _MAGIC__UTILS__UTILS_H
+#define _MAGIC__UTILS__UTILS_H 
 
 #include "utils/magic.h"
 #include "utils/tech.h"
@@ -107,4 +107,4 @@ extern int WaitPid(int pid, int *status);
 
 #endif
 
-#endif /* _UTILS_H */
+#endif /* _MAGIC__UTILS__UTILS_H */
diff --git a/windows/windInt.h b/windows/windInt.h
index 002b62bb..49e2f626 100644
--- a/windows/windInt.h
+++ b/windows/windInt.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _WINDINT_H
-#define _WINDINT_H
+#ifndef _MAGIC__WINDOWS__WINDINT_H
+#define _MAGIC__WINDOWS__WINDINT_H
 
 #include "windows/windows.h"
 #include "graphics/glyphs.h"
@@ -91,4 +91,4 @@ extern int windCaptionPixels;
 #define CREATE_HEIGHT	300
 #define CREATE_WIDTH	300
 
-#endif /* _WINDINT_H */
+#endif /* _MAGIC__WINDOWS__WINDINT_H */
diff --git a/windows/windows.h b/windows/windows.h
index 209fcb57..2a741440 100644
--- a/windows/windows.h
+++ b/windows/windows.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef _WINDOWS_H
-#define _WINDOWS_H
+#ifndef _MAGIC__WINDOWS__WINDOWS_H
+#define _MAGIC__WINDOWS__WINDOWS_H
 
 #include "utils/magic.h"
 #include "utils/geometry.h"
@@ -343,4 +343,4 @@ extern int WindScrollBarWidth;
 /* Global identifier for the window client structure */
 extern WindClient windClientID;
 
-#endif /* _WINDOWS_H */
+#endif /* _MAGIC__WINDOWS__WINDOWS_H */
diff --git a/wiring/wireInt.h b/wiring/wireInt.h
index 1d98773f..51cab84d 100644
--- a/wiring/wireInt.h
+++ b/wiring/wireInt.h
@@ -19,8 +19,8 @@
  * rcsid $Header$
  */
 
-#ifndef _WIREINT_H
-#define _WIREINT_H
+#ifndef _MAGIC__WIRING__WIREINT_H
+#define _MAGIC__WIRING__WIREINT_H
 
 #include "utils/magic.h"
 #include "database/database.h"
@@ -37,4 +37,4 @@ extern int WireUnits;
 extern void WireRememberForUndo(void);
 extern void WireUndoInit(void);
 
-#endif /* _WIREINT_H */
+#endif /* _MAGIC__WIRING__WIREINT_H */
diff --git a/wiring/wiring.h b/wiring/wiring.h
index 9ef281be..ef82ebc7 100644
--- a/wiring/wiring.h
+++ b/wiring/wiring.h
@@ -19,8 +19,8 @@
  * rcsid $Header$
  */
 
-#ifndef _WIRING_H
-#define _WIRING_H
+#ifndef _MAGIC__WIRING__WIRING_H
+#define _MAGIC__WIRING__WIRING_H
 
 #include "utils/magic.h"
 #include "database/database.h"
@@ -96,4 +96,4 @@ extern void WireTechScale(int scalen, int scaled);
 
 extern void WireInit(void);
 
-#endif /* _WIRING_H */
+#endif /* _MAGIC__WIRING__WIRING_H */