diff --git a/src/core/or/circuitmux.h b/src/core/or/circuitmux.h
index c68c31b29a..5127ee3206 100644
--- a/src/core/or/circuitmux.h
+++ b/src/core/or/circuitmux.h
@@ -212,7 +212,7 @@ struct circuitmux_s {
   circuitmux_policy_data_t *policy_data;
 };
 
-#endif /* CIRCUITMUX_PRIVATE */
+#endif /* defined(CIRCUITMUX_PRIVATE) */
 
 #endif /* !defined(TOR_CIRCUITMUX_H) */
 
diff --git a/src/core/or/circuitmux_ewma.h b/src/core/or/circuitmux_ewma.h
index dcfbc17a82..2bd9fa71f7 100644
--- a/src/core/or/circuitmux_ewma.h
+++ b/src/core/or/circuitmux_ewma.h
@@ -129,7 +129,7 @@ TO_EWMA_POL_CIRC_DATA(circuitmux_policy_circ_data_t *pol)
 STATIC unsigned cell_ewma_get_current_tick_and_fraction(double *remainder_out);
 STATIC void cell_ewma_initialize_ticks(void);
 
-#endif /* CIRCUITMUX_EWMA_PRIVATE */
+#endif /* defined(CIRCUITMUX_EWMA_PRIVATE) */
 
 #endif /* !defined(TOR_CIRCUITMUX_EWMA_H) */
 
diff --git a/src/test/fakecircs.h b/src/test/fakecircs.h
index 5fd02027f0..1b8f0e75a7 100644
--- a/src/test/fakecircs.h
+++ b/src/test/fakecircs.h
@@ -14,4 +14,4 @@
 or_circuit_t *new_fake_orcirc(channel_t *nchan, channel_t *pchan);
 void free_fake_orcirc(or_circuit_t *orcirc);
 
-#endif /* TOR_FAKECIRCS_H */
+#endif /* !defined(TOR_FAKECIRCS_H) */