diff --git a/sim/firesim-lib/src/main/cc/bridges/tracerv/trace_tracker.h b/sim/firesim-lib/src/main/cc/bridges/tracerv/trace_tracker.h
index eb88807b..06b3701a 100644
--- a/sim/firesim-lib/src/main/cc/bridges/tracerv/trace_tracker.h
+++ b/sim/firesim-lib/src/main/cc/bridges/tracerv/trace_tracker.h
@@ -1,3 +1,6 @@
+#ifndef __TRACE_TRACKER_H
+#define __TRACE_TRACKER_H
+
 #include "tracerv_processing.h"
 
 //#define INDENT_SPACES
@@ -58,3 +61,5 @@ public:
   TraceTracker(std::string binary_with_dwarf, FILE *tracefile);
   void addInstruction(uint64_t inst_addr, uint64_t cycle);
 };
+
+#endif // __TRACE_TRACKER_H
diff --git a/sim/firesim-lib/src/main/cc/bridges/tracerv/tracerv_processing.h b/sim/firesim-lib/src/main/cc/bridges/tracerv/tracerv_processing.h
index abcce290..bbc9c789 100644
--- a/sim/firesim-lib/src/main/cc/bridges/tracerv/tracerv_processing.h
+++ b/sim/firesim-lib/src/main/cc/bridges/tracerv/tracerv_processing.h
@@ -1,5 +1,5 @@
-#ifndef TRACERV_PROCESSING_GUARD
-#define TRACERV_PROCESSING_GUARD
+#ifndef __TRACERV_PROCESSING_H
+#define __TRACERV_PROCESSING_H
 
 #include <inttypes.h>
 #include <string>
@@ -43,4 +43,4 @@ public:
   Instr *getInstrFromAddr(uint64_t lookupaddress);
 };
 
-#endif
+#endif // __TRACERV_PROCESSING_H