diff --git a/core/hw/naomi/decrypt.cpp b/core/hw/naomi/decrypt.cpp
index 8389f95a7..4b2697473 100644
--- a/core/hw/naomi/decrypt.cpp
+++ b/core/hw/naomi/decrypt.cpp
@@ -716,7 +716,8 @@ static void line_fill()
 
 	line_buffer_pos = 0;
 
-	for(int i=0; i != line_buffer_size;) {
+	for (u32 i = 0; i != line_buffer_size;)
+	{
 		// vlc 0: start of line
 		// vlc 1: interior of line
 		// vlc 2-9: 7-1 bytes from end of line
diff --git a/core/hw/naomi/m1cartridge.h b/core/hw/naomi/m1cartridge.h
index eb448849e..45efef60d 100644
--- a/core/hw/naomi/m1cartridge.h
+++ b/core/hw/naomi/m1cartridge.h
@@ -57,21 +57,21 @@ protected:
 private:
 	u32 get_decrypted_32b();
 
-	inline u32 lookb(int bits)
+	inline u32 lookb(u32 bits)
 	{
-		if(bits > avail_bits) {
+		if (bits > avail_bits) {
 			avail_val = (avail_val << 32) | get_decrypted_32b();
 			avail_bits += 32;
 		}
 		return (avail_val >> (avail_bits - bits)) & ((1 << bits)-1);
 	}
 
-	inline void skipb(int bits)
+	inline void skipb(u32 bits)
 	{
 		avail_bits -= bits;
 	}
 
-	inline u32 getb(int bits)
+	inline u32 getb(u32 bits)
 	{
 		u32 res = lookb(bits);
 		skipb(bits);
diff --git a/core/hw/naomi/m4cartridge.cpp b/core/hw/naomi/m4cartridge.cpp
index 03ba81ff5..c7574b4b9 100644
--- a/core/hw/naomi/m4cartridge.cpp
+++ b/core/hw/naomi/m4cartridge.cpp
@@ -112,7 +112,7 @@ void M4Cartridge::PioOffsetChanged(u32 pio_offset)
 bool M4Cartridge::Read(u32 offset, u32 size, void *dst) {
 	if (cfi_mode)
 	{
-		int fpr_num = m4id & 0x7f;
+		u32 fpr_num = m4id & 0x7f;
 
 		if (((offset >> 26) & 0x07) < fpr_num) {
 			*(u16 *)dst = *(u16 *)&cfidata[offset & 0xffff];
@@ -155,7 +155,7 @@ void *M4Cartridge::GetDmaPtr(u32 &limit)
 	static u8 retzero[2] = { 0, 0 };
 
 	if (cfi_mode) {
-		int fpr_num = m4id & 0x7f;
+		u32 fpr_num = m4id & 0x7f;
 
 		if (((rom_cur_address >> 26) & 0x07) < fpr_num) {
 			limit = std::min(limit, (u32)2);
diff --git a/core/hw/sh4/modules/intc.cpp b/core/hw/sh4/modules/intc.cpp
index d3eac8e8d..2b9d6da97 100644
--- a/core/hw/sh4/modules/intc.cpp
+++ b/core/hw/sh4/modules/intc.cpp
@@ -14,7 +14,7 @@
 
 //Register writes need interrupt re-testing !
 
-void write_INTC_IPRA(u32 addr, u32 data)
+static void write_INTC_IPRA(u32 addr, u32 data)
 {
 	if (INTC_IPRA.reg_data!=(u16)data)
 	{
@@ -22,7 +22,7 @@ void write_INTC_IPRA(u32 addr, u32 data)
 		SIIDRebuild();	//we need to rebuild the table
 	}
 }
-void write_INTC_IPRB(u32 addr, u32 data)
+static void write_INTC_IPRB(u32 addr, u32 data)
 {
 	if (INTC_IPRB.reg_data!=(u16)data)
 	{
@@ -30,7 +30,7 @@ void write_INTC_IPRB(u32 addr, u32 data)
 		SIIDRebuild(); //we need to rebuild the table
 	}
 }
-void write_INTC_IPRC(u32 addr, u32 data)
+static void write_INTC_IPRC(u32 addr, u32 data)
 {
 	if (INTC_IPRC.reg_data!=(u16)data)
 	{
@@ -71,8 +71,6 @@ void intc_reset()
 	INTC_IPRB.reg_data = 0x0;
 	INTC_IPRC.reg_data = 0x0;
 
-	SIIDRebuild(); //rebuild the interrupts table
-
 	interrupts_reset();
 }