diff --git a/src/sfbase.c b/src/sfbase.c
index 9d2e6006d..8c722eeb4 100644
--- a/src/sfbase.c
+++ b/src/sfbase.c
@@ -1159,3 +1159,10 @@ normalize_pointers_you(struct you *d_you UNUSED)
 {
 }
 #endif  /* SFCTOOL */
+
+#undef SF_X
+#undef SF_C
+#undef SF_A
+
+/* end of sfbase.c */
+
diff --git a/src/sfstruct.c b/src/sfstruct.c
index 971676c52..ef9dbdf37 100644
--- a/src/sfstruct.c
+++ b/src/sfstruct.c
@@ -684,4 +684,11 @@ logging_finish(void)
     }
     icnt = 0L;
 }
-#endif
+#endif  /* SFLOGGING */
+
+#undef SF_X
+#undef SF_C
+#undef SF_A
+
+/* end of sfstruct.c */
+