diff --git a/sc2/src/sc2code/element.h b/sc2/src/sc2code/element.h
index 91b53c34d..b1d918c9a 100644
--- a/sc2/src/sc2code/element.h
+++ b/sc2/src/sc2code/element.h
@@ -94,11 +94,14 @@ typedef struct state
 	} image;
 } STATE;
 
-typedef void (CollisionFunc) (struct element *ElementPtr0, POINT *pPt0,
-			struct element *ElementPtr1, POINT *pPt1);
+
+typedef struct element ELEMENT;
+
+typedef void (CollisionFunc) (ELEMENT *ElementPtr0, POINT *pPt0,
+			ELEMENT *ElementPtr1, POINT *pPt1);
 
 // Any physical object in the simulation.
-typedef struct element
+struct element
 {
 	HELEMENT pred, succ;
 
@@ -120,7 +123,7 @@ typedef struct element
 	void *pParent;
 			// The ship this element belongs to.
 	HELEMENT hTarget;
-} ELEMENT;
+};
 
 #define MAX_DISPLAY_PRIMS 280
 extern COUNT DisplayFreeList;
diff --git a/sc2/src/sc2code/uqmdebug.c b/sc2/src/sc2code/uqmdebug.c
index 89bb0d284..709ef2992 100644
--- a/sc2/src/sc2code/uqmdebug.c
+++ b/sc2/src/sc2code/uqmdebug.c
@@ -190,7 +190,7 @@ dumpEventCallback (const EVENT *eventPtr, void *arg)
 }
 
 void
-dumpEvent (FILE *out, EVENT *eventPtr)
+dumpEvent (FILE *out, const EVENT *eventPtr)
 {
 	fprintf (out, "%4u/%02u/%02u: %s\n",
 			eventPtr->year_index,
diff --git a/sc2/src/sc2code/uqmdebug.h b/sc2/src/sc2code/uqmdebug.h
index 3862ec27f..4055444d0 100644
--- a/sc2/src/sc2code/uqmdebug.h
+++ b/sc2/src/sc2code/uqmdebug.h
@@ -43,7 +43,7 @@ void forwardToNextEvent (BOOLEAN skipHEE);
 // Generate a list of all events in the event queue.
 void dumpEvents (FILE *out);
 // Describe one event.
-void dumpEvent (FILE *out, EVENT *eventPtr);
+void dumpEvent (FILE *out, const EVENT *eventPtr);
 // Get the name of one event.
 const char *eventName (BYTE func_index);