diff --git a/Makefile b/Makefile
index f2511b2..c0d7108 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,10 @@ PFLAGS = -g
 PFLAGS += -DE6502_ILLEGAL
 CFLAGS = $(PFLAGS) -Wall -Werror -Wshadow -Wunused -I../ -Isrc/
 CFLAGS += -Iinc/$(PLATFORM) -I../inc/$(PLATFORM)
+CFLAGS += $(shell sdl2-config --cflags)
 LDFLAGS = $(PFLAGS)
 LDFLAGS += -Llib/$(PLATFORM)
+LDFLAGS += $(shell sdl2-config --libs)
 
 OBJDIR = obj$(DIR_SUFFIX)
 SRCDIR = src
@@ -38,7 +40,6 @@ BINDIR = bin$(DIR_SUFFIX)
 # nese
 
 TARGET_1 = nese$(EXTENSION)
-LDLIBS_1 = -lSDL2
 
 SRC_SRCS_1 = nese.c ines.c
 SRC_SRCS_1 += nes.c ppu.c input.c
diff --git a/src/apu.c b/src/apu.c
index 7b756e7..57edcdf 100644
--- a/src/apu.c
+++ b/src/apu.c
@@ -30,13 +30,13 @@ static const uint16_t dmc_period_lut[16] = {
     190, 160, 142, 128, 106,  84,  72,  54,
 };
 
-static const void dmc_restart(nes_apu_Channel* channel) {
+static void dmc_restart(nes_apu_Channel* channel) {
     channel->length = (channel->reg[3] * 16) + 1;
     channel->addr = 0x4000U | ((uint16_t)channel->reg[2] << 6);
 }
 
-static const void nes_apu_dmc_fetch(nes_apu* apu,
-                                    nes_apu_Channel* channel) {
+static void nes_apu_dmc_fetch(nes_apu* apu,
+                              nes_apu_Channel* channel) {
     channel->data = apu->mem_read(apu->arg_mem,
                                   0x8000U | channel->addr);
     channel->mask = 1;
@@ -51,8 +51,8 @@ static const void nes_apu_dmc_fetch(nes_apu* apu,
     }
 }
 
-static const void nes_apu_dmc_start(nes_apu* apu,
-                                    nes_apu_Channel* channel) {
+static void nes_apu_dmc_start(nes_apu* apu,
+                              nes_apu_Channel* channel) {
     dmc_restart(channel);
     nes_apu_dmc_fetch(apu, channel);
 }
diff --git a/src/nese.c b/src/nese.c
index 95fa686..9f13dfd 100644
--- a/src/nese.c
+++ b/src/nese.c
@@ -248,7 +248,7 @@ int main(int argc, char* argv[]) {
         uint64_t cycle_last_frame = 0;
 
         uint64_t total_cycles = 0;
-        for (int i = 0; status == 0; ++i) {
+        while (0 == status) {
             int run = 0;
             nes_ppu_Result result = nes_step(&sys, &run);
             total_cycles += run;
diff --git a/src/save.c b/src/save.c
index 2f64fd2..deb09ae 100644
--- a/src/save.c
+++ b/src/save.c
@@ -312,9 +312,9 @@ int state_read(nes* sys, const void* mem, int mem_size) {
         if ((ptr + size) > end) {
             result = -1;
             fprintf(stderr,
-                    "Unusually large chunk: %.4s: +%"PRIu64"\n",
+                    "Unusually large chunk: %.4s: +%d\n",
                     (char*)&tag,
-                    ((ptr + size) - end));
+                    (int)((ptr + size) - end));
             break;
         }
 
@@ -359,27 +359,27 @@ int state_read(nes* sys, const void* mem, int mem_size) {
     }
 
     if (0 == result) {
-        if (!(loaded | Component_CPU)) {
+        if (!(loaded & Component_CPU)) {
             result = -1;
             fprintf(stderr, "Missing %s state\n", "CPU");
         }
 
-        if (!(loaded | Component_PPU)) {
+        if (!(loaded & Component_PPU)) {
             result = -1;
             fprintf(stderr, "Missing %s state\n", "PPU");
         }
 
-        if (!(loaded | Component_APU)) {
+        if (!(loaded & Component_APU)) {
             result = -1;
             fprintf(stderr, "Missing %s state\n", "APU");
         }
 
-        if (!(loaded | Component_RAM)) {
+        if (!(loaded & Component_RAM)) {
             result = -1;
             fprintf(stderr, "Missing %s state\n", "RAM");
         }
 
-        if (!(loaded | Component_Mapper)) {
+        if (!(loaded & Component_Mapper)) {
             result = -1;
             fprintf(stderr, "Missing %s state\n", "Mapper");
         }
diff --git a/src/sdl_audio.c b/src/sdl_audio.c
index 9e02298..db2f499 100644
--- a/src/sdl_audio.c
+++ b/src/sdl_audio.c
@@ -1,4 +1,4 @@
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include "audio.h"
 
diff --git a/src/sdl_input.c b/src/sdl_input.c
index 0b2bbca..0ad8b12 100644
--- a/src/sdl_input.c
+++ b/src/sdl_input.c
@@ -1,4 +1,4 @@
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include "input.h"
 
diff --git a/src/sdl_overlay.h b/src/sdl_overlay.h
index 4a25219..cf7909d 100644
--- a/src/sdl_overlay.h
+++ b/src/sdl_overlay.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include "overlay.h"
 
diff --git a/src/sdl_render.c b/src/sdl_render.c
index 78ed2f7..ffe813a 100644
--- a/src/sdl_render.c
+++ b/src/sdl_render.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include "render.h"
 #include "ppu.h"
diff --git a/src/sdl_timer.c b/src/sdl_timer.c
index eca8aa4..bd4ef42 100644
--- a/src/sdl_timer.c
+++ b/src/sdl_timer.c
@@ -1,6 +1,6 @@
 #include "timer.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 
 time_us time_now(void) {