diff --git a/libraries/fluidlite/src/fluid_defsfont.c b/libraries/fluidlite/src/fluid_defsfont.c
index 62adf4462..181c90506 100644
--- a/libraries/fluidlite/src/fluid_defsfont.c
+++ b/libraries/fluidlite/src/fluid_defsfont.c
@@ -28,9 +28,8 @@
 #include "fluid_sys.h"
 
 #if SF3_SUPPORT == SF3_XIPH_VORBIS
-#include "vorbis/codec.h"
-#include "vorbis/vorbisenc.h"
-#include "vorbis/vorbisfile.h"
+#define OV_EXCLUDE_STATIC_CALLBACKS
+#include "minivorbis.h"
 
 struct VorbisData {
     int pos;          // current position in audio->data()
diff --git a/source_files/edge/p_user.cc b/source_files/edge/p_user.cc
index f5da245fc..8383f60c0 100644
--- a/source_files/edge/p_user.cc
+++ b/source_files/edge/p_user.cc
@@ -24,6 +24,7 @@
 //----------------------------------------------------------------------------
 
 #include <float.h>
+#include <math.h>
 
 #include "AlmostEquals.h"
 #include "bot_think.h"
@@ -925,7 +926,7 @@ bool PlayerThink(Player *player)
         line_lengths += abs(player_x - room_checker.X);
         PathTraverse(player_x, player_y, 32768.0f, player_y, kPathAddLines, P_RoomPath, &room_checker);
         line_lengths += abs(room_checker.X - player_x);
-        // not reverbe per se, but approximately matches how we use to do "reverb" - Dasho
+        // not reverb per se, but approximately matches how we used to do "reverb" - Dasho
         ma_delay_node_set_decay(&reverb_node, log1p(line_lengths * 0.125f) * .020f);
     }