diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfd35870a..2fdc02674 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,11 +48,43 @@ set(CMAKE_C_STANDARD 11)
 if(MSVC)
     # remove cmake's default /W3 to avoid warning D9025
     string(REGEX REPLACE "/W3" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    # we would probably like to pass /Wall instead of /W4, but there's a lot
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /permissive- /W4")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /permissive- /W4 /WX")
+    # Disable select warnings:
+    # C4100: unreferenced formal parameter
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4100")
+    # C4456: declaration hides previous local declaration
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4456")
+    # C4459: declaration hides previous global declaration
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4459")
+    # C4244: implicit conversion, possible loss of data
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244")
+    # C4267: implicit conversion from size_t, possible loss of data
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267")
+    # C4389: 'equality-operator' : signed/unsigned mismatch
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4389")
+    # _CRT_SECURE_NO_WARNINGS: disable warnings when calling functions like strncpy or sscanf
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_WARNINGS")
+    # _CRT_NONSTDC_NO_WARNINGS: disable warnings when calling POSIX functions like fileno
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_NONSTDC_NO_WARNINGS")
+
+    # Error on certain warnings:
+    # C4013: call to undefined function
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4013")
+    # C4146: unary minus operator applied to unsigned type, result still unsigned
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4146")
+    # C4245: signed const to unsigned
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4245")
+    # C4305: truncation from double to float
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4305")
+    # C4701: potentially uninitialized local variable used
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4701")
+    # C4668: undefined symbol used as compiler directive (will evaluate to 0).
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4668")
+    # C4702: unreachable code
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4702")
 else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wformat -pedantic -Wvla")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -DDEBUGMODE -Werror -fno-omit-frame-pointer")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -Werror -fno-omit-frame-pointer")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O2 -fno-omit-frame-pointer -DNDEBUG")
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -DNDEBUG")
     set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -DNDEBUG")
@@ -62,8 +94,7 @@ add_definitions(-DV_MAJOR=${VERSION_MAJOR} -DV_MINOR=${VERSION_MINOR} -DV_PATCH=
 # Enable AddressSanitizer if requested
 if(USE_SANITIZERS)
     if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-        add_compile_options("-fsanitize=address")
-        add_link_options("-fsanitize=address")
+        add_compile_options("/fsanitize=address")
         message(STATUS "Development: Asan enabled. Ubsan is unsupported by MSVC.")
     else()
         add_compile_options("-fsanitize=address,undefined")
@@ -178,6 +209,7 @@ set_source_files_properties("src/video/video.c" PROPERTIES COMPILE_DEFINITIONS "
 # Build core sources first as an object library
 # this can then be reused in tests and main executable to speed things up
 add_library(openomf_core OBJECT ${OPENOMF_SRC})
+target_compile_definitions(openomf_core PUBLIC "$<$<CONFIG:Debug>:DEBUGMODE>")
 omf_target_precompile_headers(openomf_core PUBLIC
     "<SDL.h>"
     "<enet/enet.h>"
@@ -246,6 +278,9 @@ include_directories(${COREINCS})
 
 # Build the game binary
 add_executable(openomf src/main.c src/engine.c ${ICON_RESOURCE})
+set_property(TARGET openomf PROPERTY
+    VS_DEBUGGER_ENVIRONMENT "OPENOMF_SHADER_DIR=${CMAKE_CURRENT_BINARY_DIR}/shaders
+OPENOMF_RESOURCE_DIR=${CMAKE_CURRENT_BINARY_DIR}/resources")
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT openomf)
 
 # This is used to copy shader files from source directory to the binary output directory during compile.
diff --git a/src/controller/ai_controller.c b/src/controller/ai_controller.c
index bcfc6784a..87b06f007 100644
--- a/src/controller/ai_controller.c
+++ b/src/controller/ai_controller.c
@@ -797,8 +797,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->pref_jump = -10;
             pilot->pref_fwd = 30;
             pilot->pref_back = 10;
-            pilot->learning = 1.5;
-            pilot->forget = 0.25;
+            pilot->learning = 1.5f;
+            pilot->forget = 0.25f;
             break;
         case 1:
             // steffan
@@ -813,8 +813,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->pref_jump = 6;
             pilot->pref_fwd = 20;
             pilot->pref_back = -9;
-            pilot->learning = 1.0;
-            pilot->forget = 0.4;
+            pilot->learning = 1.0f;
+            pilot->forget = 0.4f;
             break;
         case 2:
             // milano
@@ -831,8 +831,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->pref_jump = 8;
             pilot->pref_fwd = 30;
             pilot->pref_back = -3;
-            pilot->learning = 0.9;
-            pilot->forget = 0.1;
+            pilot->learning = 0.9f;
+            pilot->forget = 0.1f;
             break;
         case 3:
             // christian
@@ -848,8 +848,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->pref_jump = 2;
             pilot->pref_fwd = 10;
             pilot->pref_back = -10;
-            pilot->learning = 2.5;
-            pilot->forget = 0.35;
+            pilot->learning = 2.5f;
+            pilot->forget = 0.35f;
             break;
         case 4:
             // shirro
@@ -867,8 +867,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->pref_jump = -20;
             pilot->pref_fwd = 10;
             pilot->pref_back = 10;
-            pilot->learning = 2.0;
-            pilot->forget = 0.2;
+            pilot->learning = 2.0f;
+            pilot->forget = 0.2f;
             break;
         case 5:
             // jean-paul
@@ -884,8 +884,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->ap_low = 100;
             pilot->ap_middle = -50;
             pilot->pref_fwd = 20;
-            pilot->learning = 1.2;
-            pilot->forget = 0.07;
+            pilot->learning = 1.2f;
+            pilot->forget = 0.07f;
             break;
         case 6:
             // ibrahim
@@ -902,8 +902,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->pref_jump = 2;
             pilot->pref_fwd = 10;
             pilot->pref_back = -10;
-            pilot->learning = 2.5;
-            pilot->forget = 0.05;
+            pilot->learning = 2.5f;
+            pilot->forget = 0.05f;
             break;
         case 7:
             // angel
@@ -919,8 +919,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->pref_jump = 40;
             pilot->pref_fwd = 40;
             pilot->pref_back = -9;
-            pilot->learning = 3.0;
-            pilot->forget = 0.15;
+            pilot->learning = 3.0f;
+            pilot->forget = 0.15f;
             break;
         case 8:
             // cossette
@@ -937,8 +937,8 @@ void reset_pilot_personality(sd_pilot *pilot) {
             pilot->ap_middle = -50;
             pilot->pref_jump = -10;
             pilot->pref_back = 10;
-            pilot->learning = 0.7;
-            pilot->forget = 0.2;
+            pilot->learning = 0.7f;
+            pilot->forget = 0.2f;
             break;
         case 9:
             // raven
diff --git a/src/game/objects/har.c b/src/game/objects/har.c
index 72d150d69..528e6b58a 100644
--- a/src/game/objects/har.c
+++ b/src/game/objects/har.c
@@ -695,8 +695,8 @@ void har_spawn_oil(object *obj, vec2i pos, int amount, float gravity, int layer)
 
         // Make sure the oil drops have somekind of velocity
         // (to prevent floating scrap objects)
-        if(vely < 0.1 && vely > -0.1)
-            vely += 0.21;
+        if(vely < 0.1f && vely > -0.1f)
+            vely += 0.21f;
 
         // Create the object
         object *scrap = omf_calloc(1, sizeof(object));
@@ -754,8 +754,8 @@ void har_spawn_scrap(object *obj, vec2i pos, int amount) {
 
         // Make sure scrap has somekind of velocity
         // (to prevent floating scrap objects)
-        if(vely < 0.1 && vely > -0.1)
-            vely += 0.21;
+        if(vely < 0.1f && vely > -0.1f)
+            vely += 0.21f;
 
         // Create the object
         object *scrap = omf_calloc(1, sizeof(object));
diff --git a/src/game/objects/scrap.c b/src/game/objects/scrap.c
index 801cd609e..314e6b5bf 100644
--- a/src/game/objects/scrap.c
+++ b/src/game/objects/scrap.c
@@ -16,7 +16,7 @@ void scrap_move(object *obj) {
     vel.y += obj->gravity;
     pos.y += vel.y;
 
-    float dampen = 0.4;
+    float dampen = 0.4f;
 
     if(pos.x < ARENA_LEFT_WALL) {
         pos.x = ARENA_LEFT_WALL;
diff --git a/src/game/protos/player.c b/src/game/protos/player.c
index e17e26fbc..de1dbc68c 100644
--- a/src/game/protos/player.c
+++ b/src/game/protos/player.c
@@ -30,7 +30,7 @@ static void player_clear_frame(object *obj) {
 
 void player_create(object *obj) {
     memset(&obj->animation_state, 0, sizeof(player_animation_state));
-    obj->animation_state.previous_tick = -1;
+    obj->animation_state.previous_tick = ~0u;
     sd_script_create(&obj->animation_state.parser);
     player_clear_frame(obj);
 }
@@ -71,7 +71,7 @@ void player_reload(object *obj) {
 }
 
 void player_reset(object *obj) {
-    obj->animation_state.previous_tick = -1;
+    obj->animation_state.previous_tick = ~0u;
     obj->animation_state.current_tick = 0;
     obj->animation_state.finished = 0;
     obj->animation_state.previous = -1;
diff --git a/src/game/scenes/arena.c b/src/game/scenes/arena.c
index 42b6b7369..e842b11fd 100644
--- a/src/game/scenes/arena.c
+++ b/src/game/scenes/arena.c
@@ -1039,8 +1039,8 @@ void arena_dynamic_tick(scene *scene, int paused) {
 
                     // Make sure scrap has somekind of velocity
                     // (to prevent floating scrap objects)
-                    if(vely < 0.1 && vely > -0.1)
-                        vely += 0.21;
+                    if(vely < 0.1f && vely > -0.1f)
+                        vely += 0.21f;
 
                     // Create the object
                     object *scrap = omf_calloc(1, sizeof(object));
diff --git a/src/game/scenes/scoreboard.c b/src/game/scenes/scoreboard.c
index 5273a41e3..9e85863dd 100644
--- a/src/game/scenes/scoreboard.c
+++ b/src/game/scenes/scoreboard.c
@@ -222,7 +222,7 @@ int scoreboard_create(scene *scene) {
     }
 
     // Darken the colors for the background a bit.
-    vga_state_mul_base_palette(0, 0xEF, 0.6);
+    vga_state_mul_base_palette(0, 0xEF, 0.6f);
 
     if(local->has_pending_data) {
         text_settings small_text;
diff --git a/src/game/utils/nat.c b/src/game/utils/nat.c
index 1680789ab..b12a153d3 100644
--- a/src/game/utils/nat.c
+++ b/src/game/utils/nat.c
@@ -40,8 +40,9 @@ bool nat_create_upnp_mapping(nat_ctx *ctx, uint16_t int_port, uint16_t ext_port)
         // like overly short lifetimes
         return false;
     }
-#endif
+#else
     return false;
+#endif
 }
 
 bool nat_create_pmp_mapping(nat_ctx *ctx, uint16_t int_port, uint16_t ext_port) {
@@ -70,8 +71,9 @@ bool nat_create_pmp_mapping(nat_ctx *ctx, uint16_t int_port, uint16_t ext_port)
         // TODO handle some errors here
         return false;
     }
-#endif
+#else
     return false;
+#endif
 }
 
 bool nat_create_mapping(nat_ctx *ctx, uint16_t int_port, uint16_t ext_port) {
diff --git a/src/game/utils/score.c b/src/game/utils/score.c
index 6badbe6bd..2595dfcfb 100644
--- a/src/game/utils/score.c
+++ b/src/game/utils/score.c
@@ -23,13 +23,13 @@ typedef struct score_text {
 } score_text;
 
 float multipliers[] = {
-    0.2, // punching bag
-    0.4, // rookie
-    0.6, // veteran
-    0.8, // world class
-    1.0, // champion
-    1.2, // deadly
-    1.4  // ultimate
+    0.2f, // punching bag
+    0.4f, // rookie
+    0.6f, // veteran
+    0.8f, // world class
+    1.0f, // champion
+    1.2f, // deadly
+    1.4f  // ultimate
 };
 
 vec2i interpolate(vec2i start, vec2i end, float fraction) {
diff --git a/src/main.c b/src/main.c
index 5bc2d1040..ef317ac79 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,9 +11,9 @@
 #include "utils/msgbox.h"
 #include "utils/random.h"
 #include <SDL.h>
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <enet/enet.h>
diff --git a/src/utils/compat.h b/src/utils/compat.h
index 306e8b5c3..fe191a32e 100644
--- a/src/utils/compat.h
+++ b/src/utils/compat.h
@@ -3,7 +3,7 @@
 
 #include <string.h>
 
-#if __APPLE__
+#ifdef __APPLE__
 // MacOS X does not ship uchar.h
 #include <stdint.h>
 typedef uint_least16_t char16_t;
diff --git a/src/utils/scandir.c b/src/utils/scandir.c
index 3cf2915b0..b4ba3a541 100644
--- a/src/utils/scandir.c
+++ b/src/utils/scandir.c
@@ -10,11 +10,11 @@
 #endif
 
 static void check_valid_directory(char const *dir) {
-#if !NDEBUG
+#ifndef NDEBUG
     assert(dir != NULL);
     assert(dir[0] != '\0');
     size_t end = strlen(dir) - 1;
-#if _WIN32
+#ifdef _WIN32
     assert(dir[end] == '\\');
 #else
     assert(dir[end] == '/');
diff --git a/src/video/renderers/opengl3/helpers/bindings.c b/src/video/renderers/opengl3/helpers/bindings.c
index af778ae40..8c8ecb026 100644
--- a/src/video/renderers/opengl3/helpers/bindings.c
+++ b/src/video/renderers/opengl3/helpers/bindings.c
@@ -7,7 +7,7 @@ static GLuint bound_vbo = 0;
 static GLuint bound_vao = 0;
 static GLuint bound_tex[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static GLuint bound_fbo = 0;
-static GLuint active_tex = -1;
+static GLuint active_tex = ~0u;
 
 void binding_active_tex(GLuint unit_id) {
     if(active_tex != unit_id) {
diff --git a/src/video/renderers/opengl3/helpers/object_array.c b/src/video/renderers/opengl3/helpers/object_array.c
index 6c53d5aed..edfb19c30 100644
--- a/src/video/renderers/opengl3/helpers/object_array.c
+++ b/src/video/renderers/opengl3/helpers/object_array.c
@@ -117,11 +117,12 @@ bool object_array_get_batch(const object_array *array, object_array_batch *state
     }
     state->start = state->end;
     object_array_blend_mode next;
-    for(; state->end < array->item_count; state->end++) {
+    do {
         next = array->modes[state->end];
         if(next != state->mode)
             break;
-    }
+        state->end++;
+    } while(state->end < array->item_count);
     *mode = state->mode;
     state->mode = next;
     return true;
diff --git a/testing/test_script.c b/testing/test_script.c
index e15c97e78..8d6dd8c93 100644
--- a/testing/test_script.c
+++ b/testing/test_script.c
@@ -126,8 +126,8 @@ void test_script_get_frame_index(void) {
 }
 
 void test_script_get_frame_index_at(void) {
-    CU_ASSERT(sd_script_get_frame_index_at(NULL, -1) == -1);
-    CU_ASSERT(sd_script_get_frame_index_at(&script, -1) == -1);
+    CU_ASSERT(sd_script_get_frame_index_at(NULL, ~0u) == -1);
+    CU_ASSERT(sd_script_get_frame_index_at(&script, ~0u) == -1);
     CU_ASSERT(sd_script_get_frame_index_at(&script, 0) == 0);
     CU_ASSERT(sd_script_get_frame_index_at(&script, 99) == 0);
     CU_ASSERT(sd_script_get_frame_index_at(&script, 100) == 1);
diff --git a/tools/afdiff/main.c b/tools/afdiff/main.c
index d3daef347..bf09cb290 100644
--- a/tools/afdiff/main.c
+++ b/tools/afdiff/main.c
@@ -4,9 +4,9 @@
  * @license MIT
  */
 
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
diff --git a/tools/aftool/main.c b/tools/aftool/main.c
index 85464a58a..0e5b5298e 100644
--- a/tools/aftool/main.c
+++ b/tools/aftool/main.c
@@ -9,9 +9,9 @@
 #include "formats/af.h"
 #include "formats/error.h"
 #include <SDL.h>
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
diff --git a/tools/altpaltool/main.c b/tools/altpaltool/main.c
index b3b86226a..bf1a7ef05 100644
--- a/tools/altpaltool/main.c
+++ b/tools/altpaltool/main.c
@@ -5,9 +5,9 @@
 
 #include "formats/altpal.h"
 #include "formats/error.h"
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
diff --git a/tools/bktool/main.c b/tools/bktool/main.c
index 0fee39cd9..ed9f7aa8a 100644
--- a/tools/bktool/main.c
+++ b/tools/bktool/main.c
@@ -9,9 +9,9 @@
 #include "formats/bk.h"
 #include "formats/error.h"
 #include <SDL.h>
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
diff --git a/tools/chrtool/main.c b/tools/chrtool/main.c
index cb51470c7..b941c6c87 100644
--- a/tools/chrtool/main.c
+++ b/tools/chrtool/main.c
@@ -7,9 +7,9 @@
 #include "formats/bk.h"
 #include "formats/chr.h"
 #include "formats/error.h"
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
@@ -103,12 +103,12 @@ int main(int argc, char *argv[]) {
 
     // Load bkfile if necessary
     sd_bk_file bk;
+    sd_bk_create(&bk);
     if(bkfile->count > 0) {
-        sd_bk_create(&bk);
         int ret = sd_bk_load(&bk, bkfile->filename[0]);
         if(ret != SD_SUCCESS) {
             printf("Unable to load BK file %s: %s.\n", bkfile->filename[0], sd_get_error(ret));
-            goto exit_2;
+            goto exit_1;
         }
     }
 
@@ -116,7 +116,7 @@ int main(int argc, char *argv[]) {
     if(export->count > 0 && bkfile->count > 0) {
         if(bk.palette_count < 1) {
             printf("BK file %s does not have palettes.\n", bkfile->filename[0]);
-            goto exit_2;
+            goto exit_1;
         }
 
         sd_rgba_image img;
@@ -159,11 +159,8 @@ int main(int argc, char *argv[]) {
     }
 
     // Quit
-exit_2:
-    if(bkfile->count > 0) {
-        sd_bk_free(&bk);
-    }
 exit_1:
+    sd_bk_free(&bk);
     sd_chr_free(&chr);
 exit_0:
     arg_freetable(argtable, sizeof(argtable) / sizeof(argtable[0]));
diff --git a/tools/fonttool/main.c b/tools/fonttool/main.c
index e154c4716..eb4680074 100644
--- a/tools/fonttool/main.c
+++ b/tools/fonttool/main.c
@@ -7,9 +7,9 @@
 #include "formats/error.h"
 #include "formats/fonts.h"
 #include <SDL2/SDL.h>
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
diff --git a/tools/languagetool/main.c b/tools/languagetool/main.c
index 8573cace5..7790adc2e 100644
--- a/tools/languagetool/main.c
+++ b/tools/languagetool/main.c
@@ -14,9 +14,9 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 
@@ -127,7 +127,7 @@ int read_entry(FILE *file, sd_language *language, int *line_number) {
         // Check if this is the start of a new entry
         if(strncmp(line, "ID:", 3) == 0) {
             // Rewind to start of this line
-            fseek(file, -strlen(line), SEEK_CUR);
+            fseek(file, -(long)strlen(line), SEEK_CUR);
             *line_number -= 1;
             break;
         }
diff --git a/tools/pcxtool/main.c b/tools/pcxtool/main.c
index 79025cf23..f2929bffe 100644
--- a/tools/pcxtool/main.c
+++ b/tools/pcxtool/main.c
@@ -1,6 +1,6 @@
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include "formats/error.h"
diff --git a/tools/pictool/main.c b/tools/pictool/main.c
index 84b9cf8ff..f18b30956 100644
--- a/tools/pictool/main.c
+++ b/tools/pictool/main.c
@@ -7,9 +7,9 @@
 #include "formats/bk.h"
 #include "formats/error.h"
 #include "formats/pic.h"
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 
diff --git a/tools/rectool/main.c b/tools/rectool/main.c
index 7719b2972..34200961e 100644
--- a/tools/rectool/main.c
+++ b/tools/rectool/main.c
@@ -6,9 +6,9 @@
 #include "../shared/pilot.h"
 #include "formats/error.h"
 #include "formats/rec.h"
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
diff --git a/tools/scoretool/main.c b/tools/scoretool/main.c
index 140a74c9e..aaf87ce21 100644
--- a/tools/scoretool/main.c
+++ b/tools/scoretool/main.c
@@ -6,9 +6,9 @@
 
 #include "formats/error.h"
 #include "formats/score.h"
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 
diff --git a/tools/setuptool/main.c b/tools/setuptool/main.c
index fad5177ba..b79139e63 100644
--- a/tools/setuptool/main.c
+++ b/tools/setuptool/main.c
@@ -6,9 +6,9 @@
 #include "../shared/pilot.h"
 #include "formats/error.h"
 #include "formats/setup.h"
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
diff --git a/tools/soundtool/main.c b/tools/soundtool/main.c
index 07979f823..acac65304 100644
--- a/tools/soundtool/main.c
+++ b/tools/soundtool/main.c
@@ -7,9 +7,9 @@
 #include "formats/error.h"
 #include "formats/sounds.h"
 #include <SDL.h>
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 
diff --git a/tools/stringparser/main.c b/tools/stringparser/main.c
index 7cd76989f..e2980756c 100644
--- a/tools/stringparser/main.c
+++ b/tools/stringparser/main.c
@@ -6,9 +6,9 @@
 
 #include "formats/error.h"
 #include "formats/script.h"
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>
diff --git a/tools/trntool/main.c b/tools/trntool/main.c
index 99ea2a45c..bd349af6f 100644
--- a/tools/trntool/main.c
+++ b/tools/trntool/main.c
@@ -7,9 +7,9 @@
 #include "../shared/pilot.h"
 #include "formats/error.h"
 #include "formats/tournament.h"
-#if ARGTABLE2_FOUND
+#if defined(ARGTABLE2_FOUND)
 #include <argtable2.h>
-#elif ARGTABLE3_FOUND
+#elif defined(ARGTABLE3_FOUND)
 #include <argtable3.h>
 #endif
 #include <stdint.h>