diff --git a/src/runtime/c/pgf/jit.c b/src/runtime/c/pgf/jit.c
index 003fa2630..a47cb4a90 100644
--- a/src/runtime/c/pgf/jit.c
+++ b/src/runtime/c/pgf/jit.c
@@ -904,7 +904,7 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
 				jit_stxi_p(curr_offset*sizeof(void*), JIT_VHEAP, JIT_R0);
 				curr_offset++;
 
-				PgfLiteral lit;
+				PgfLiteral lit = gu_null_variant;
 				switch (mod) {
 				case 0: {
 					PgfLiteralInt *lit_int =
diff --git a/src/runtime/c/pgf/lightning/asm-common.h b/src/runtime/c/pgf/lightning/asm-common.h
index 3cc96649f..c0bb46c47 100644
--- a/src/runtime/c/pgf/lightning/asm-common.h
+++ b/src/runtime/c/pgf/lightning/asm-common.h
@@ -30,7 +30,7 @@
  ***********************************************************************/
 
 
-#ifndef __lightning_asm_common_h
+#ifndef __lightning_asm_common_h_
 #define __lightning_asm_common_h_
 
 
diff --git a/src/runtime/c/pgf/lightning/core-common.h b/src/runtime/c/pgf/lightning/core-common.h
index 3761bcc2b..ee90bd472 100644
--- a/src/runtime/c/pgf/lightning/core-common.h
+++ b/src/runtime/c/pgf/lightning/core-common.h
@@ -30,7 +30,7 @@
  ***********************************************************************/
 
 
-#ifndef __lightning_core_common_h
+#ifndef __lightning_core_common_h_
 #define __lightning_core_common_h_
 
 typedef struct {