diff --git a/src/mainboard/matsonic/ms7308e/dll.inc b/src/mainboard/matsonic/ms7308e/dll.inc
index 70c913eb66..5e92636afb 100644
--- a/src/mainboard/matsonic/ms7308e/dll.inc
+++ b/src/mainboard/matsonic/ms7308e/dll.inc
@@ -12,4 +12,4 @@
         .word	0x8d77	# 0x8c ~ 0x8f,
         .word	0x8e01	# these values are very M/B
         .word	0x8f07	# specific
-#endif /* SIS630S */
\ No newline at end of file
+#endif /* SIS630S */
diff --git a/src/northsouthbridge/sis/630/ipl.S b/src/northsouthbridge/sis/630/ipl.S
index cfcc59edfb..b27407f747 100644
--- a/src/northsouthbridge/sis/630/ipl.S
+++ b/src/northsouthbridge/sis/630/ipl.S
@@ -222,7 +222,7 @@ sis630ipl_start:
 #include "unlock_flash.inc"
 #if defined(USE_DOC_MIL) || defined(USE_DOC_2000_TSOP)
 #	include "rom/doc_mil.inc"
-#else defined(USE_DOC_MIL_PLUS)
+#elif defined(USE_DOC_MIL_PLUS)
 #	include "rom/doc_mil_plus.inc"
 #endif
 #endif /* STD_FLASH */
diff --git a/src/northsouthbridge/sis/630/southbridge.c b/src/northsouthbridge/sis/630/southbridge.c
index f35d5fc3b9..981983660e 100644
--- a/src/northsouthbridge/sis/630/southbridge.c
+++ b/src/northsouthbridge/sis/630/southbridge.c
@@ -72,7 +72,7 @@ static const initreg_t ide_init[] = {
 
 void ide_fixup(void)
 {
-	volatile int delay;
+
 	struct pci_dev *dev  = pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513,
 					       (void *) NULL); 
 	int i;
diff --git a/src/rom/docmil_fill_inbuf.c b/src/rom/docmil_fill_inbuf.c
index c3bb75a6c2..229c216f5d 100644
--- a/src/rom/docmil_fill_inbuf.c
+++ b/src/rom/docmil_fill_inbuf.c
@@ -56,7 +56,9 @@ reset_doc()
 int
 fill_inbuf(void)
 {
+#ifdef CHECK_DOC_MIL
 redo:
+#endif
 	if (firstfill) {
 		// it is possible that we can get in here and the 
 		// doc has never been reset. So go ahead and reset it again.