diff --git a/src/display/bitmapfont.h b/src/display/bitmapfont.h
index e524a121..b0f8c565 100644
--- a/src/display/bitmapfont.h
+++ b/src/display/bitmapfont.h
@@ -9,6 +9,7 @@
 #include "../libs.h"
 #include "spritebatch.h"
 #include "tileset.h"
+#include "../util/math.h"
 
 /** Which is the first character within the font tilemap */
 #define BITMAP_FONT_CHAR_START 33
diff --git a/src/display/font.h b/src/display/font.h
index 6c0c4c88..96697145 100644
--- a/src/display/font.h
+++ b/src/display/font.h
@@ -11,6 +11,7 @@
 #include "primitive.h"
 #include "primitives/quad.h"
 #include "../util/mem.h"
+#include "../util/math.h"
 
 /** Which character (ASCII) to start the font from */
 #define FONT_FIRST_CHAR 32
diff --git a/src/display/spritebatch.h b/src/display/spritebatch.h
index 4b734b36..c5a53473 100644
--- a/src/display/spritebatch.h
+++ b/src/display/spritebatch.h
@@ -5,6 +5,7 @@
 
 #pragma once
 #include "../libs.h"
+#include "../util/math.h"
 #include "primitive.h"
 #include "primitives/quad.h"
 
diff --git a/src/epoch/epoch.h b/src/epoch/epoch.h
index a777dc76..928efa68 100644
--- a/src/epoch/epoch.h
+++ b/src/epoch/epoch.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "../libs.h"
+#include "../util/math.h"
 
 #define EPOCH_FIXED_STEP 0.016f
 #define EPOCH_SMALLEST_STEP 0.001f
diff --git a/src/game/poker/actions/bet.c b/src/game/poker/actions/bet.c
index 4fb3bbf9..839a6c73 100644
--- a/src/game/poker/actions/bet.c
+++ b/src/game/poker/actions/bet.c
@@ -109,7 +109,7 @@ void _pokerGameActionBetOnEnd(
     pokerDiscussionQueue(&discussion);
 
     pokerBetResetBetter(
-      &game->poker, &game->poker.players, game->poker.roundSmallBlind
+      &game->poker.bet, game->poker.players, game->poker.roundSmallBlind
     );
     pokerGameActionRestackAdd(game);
     pokerGameActionLookAdd(game, game->poker.bet.better);
diff --git a/src/game/poker/actions/restack.h b/src/game/poker/actions/restack.h
index 7aed9e00..d2f98fc2 100644
--- a/src/game/poker/actions/restack.h
+++ b/src/game/poker/actions/restack.h
@@ -7,9 +7,10 @@
 
 #pragma once
 #include "../../../libs.h"
+#include "../../../util/math.h"
 #include "action.h"
-#include "../../../display/animation/queue.h"
 #include "../pokergame.h"
+#include "../../../display/animation/queue.h"
 #include "../../../poker/turn.h"
 #include "../../../poker/bet.h"
 #include "../../../poker/actions/flop.h"
diff --git a/src/game/poker/actions/round.c b/src/game/poker/actions/round.c
index 68c3db33..7ac66475 100644
--- a/src/game/poker/actions/round.c
+++ b/src/game/poker/actions/round.c
@@ -42,7 +42,7 @@ void _pokerGameActionRoundOnEnd(queue_t *queue,queueaction_t *action,uint8_t i){
   // Begin Betting Round. This will queue for one player only and then the round
   // will take over.
   pokerBetResetBetter(
-    &game->poker, game->poker.players, game->poker.roundSmallBlind
+    &game->poker.bet, game->poker.players, game->poker.roundSmallBlind
   );
   pokerGameActionBetAdd(game);
 }
diff --git a/src/game/poker/game.c b/src/game/poker/game.c
index b8af2ef0..0edf1d80 100644
--- a/src/game/poker/game.c
+++ b/src/game/poker/game.c
@@ -71,14 +71,3 @@ void gameInstanceDispose(pokergame_t *game) {
   // Unload all assets
   pokerGameAssetsDispose(&game->assets);
 }
-
-void pokerGameQueueRestack(pokergame_t *pokerGame) {
-  arrayRewind(
-    sizeof(pokergameactiondata_t),
-    pokerGame->actionData,
-    ANIMATION_QUEUE_ITEM_MAX,
-    pokerGame->scene.conversation.actionQueue.current,
-    pokerGame->scene.conversation.actionQueue.count
-  );
-  queueRestack(&pokerGame->scene.conversation.actionQueue);
-}
\ No newline at end of file
diff --git a/src/game/poker/game.h b/src/game/poker/game.h
index 7a5837f2..169dddfe 100644
--- a/src/game/poker/game.h
+++ b/src/game/poker/game.h
@@ -36,11 +36,4 @@ void gameInstanceUpdate(pokergame_t *game);
  * Disposes a previously initialized poker game instance.
  * @param game Game to dispose.
  */
-void gameInstanceDispose(pokergame_t *game);
-
-/**
- * Restacks the poker game's stack.
- * 
- * @param game Poker game to restack
- */
-void pokerGameQueueRestack(pokergame_t *game);
\ No newline at end of file
+void gameInstanceDispose(pokergame_t *game);
\ No newline at end of file
diff --git a/src/game/poker/pokergame.c b/src/game/poker/pokergame.c
new file mode 100644
index 00000000..0e6c9020
--- /dev/null
+++ b/src/game/poker/pokergame.c
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "pokergame.h"
+
+void pokerGameQueueRestack(pokergame_t *pokerGame) {
+  arrayRewind(
+    sizeof(pokergameactiondata_t),
+    pokerGame->actionData,
+    ANIMATION_QUEUE_ITEM_MAX,
+    pokerGame->scene.conversation.actionQueue.current,
+    pokerGame->scene.conversation.actionQueue.count
+  );
+  queueRestack(&pokerGame->scene.conversation.actionQueue);
+}
\ No newline at end of file
diff --git a/src/game/poker/pokergame.h b/src/game/poker/pokergame.h
index 4dfe8f50..e2432c6f 100644
--- a/src/game/poker/pokergame.h
+++ b/src/game/poker/pokergame.h
@@ -37,4 +37,11 @@ typedef struct {
 
   /** Data for the actions */
   pokergameactiondata_t actionData[ANIMATION_QUEUE_ITEM_MAX];
-} pokergame_t;
\ No newline at end of file
+} pokergame_t;
+
+/**
+ * Restacks the poker game's stack.
+ * 
+ * @param game Poker game to restack
+ */
+void pokerGameQueueRestack(pokergame_t *game);
\ No newline at end of file
diff --git a/src/game/poker/pokerui.c b/src/game/poker/pokerui.c
index e804a744..3163a608 100644
--- a/src/game/poker/pokerui.c
+++ b/src/game/poker/pokerui.c
@@ -77,7 +77,7 @@ void pokerUiUpdate(
     );
     
     // Bind the frame buffer
-    frameBufferUse(&ui->frames + j, true);
+    frameBufferUse(ui->frames+j, true);
 
     // Render the VN character
     shaderUse(shader);
@@ -110,7 +110,7 @@ void pokerUiRender(
     for(j = 0; j < POKER_PLAYER_COUNT; j++) {
       player = poker->players + j;
       for(i = 0; i < player->cardCount; i++) {
-        pokerCardSetImage(&ui->card, &assets->cardTexture, player->cards[i]);
+        pokerUiSetImageToCard(&ui->card,&assets->cardTexture,player->cards[i]);
         imageRender(&ui->card, &assets->shader, i * 64.0f, j * 100.0f);
       }
     }
@@ -132,11 +132,11 @@ void pokerUiRender(
 
     // Position the grid itself.
     x = 0;
-    y = POKER_UI_PLAYER_HEIGHT * j;
+    y = (float)(POKER_UI_PLAYER_HEIGHT * j);
 
     // Render face
     gridGetChild(&ui->grid, 1, 0, 1, 2, &gx, &gy, &gw, &gh);
-    shaderUseTexture(&assets->shader, &ui->frames + j);
+    shaderUseTexture(&assets->shader, &(ui->frames + j)->texture);
     shaderUsePosition(&assets->shader, x + gx, y + gy, 0, 0,0,0);
     primitiveDraw(&ui->quad, 0, -1);
 
@@ -194,8 +194,8 @@ void pokerUiSetImageToCard(image_t *image, texture_t *texture, card_t card) {
 
   imageSetTextureAndCrop(
     image, texture,
-    cardGetNumber(cardImageIndex) * 71,
-    cardGetSuit(card) * 96,
+    cardGetNumber(cardImageIndex) * 71.0f,
+    cardGetSuit(card) * 96.0f,
     71, 96
   );
 }
\ No newline at end of file
diff --git a/src/game/poker/pokerui.h b/src/game/poker/pokerui.h
index c61fe526..7ac38e7a 100644
--- a/src/game/poker/pokerui.h
+++ b/src/game/poker/pokerui.h
@@ -91,4 +91,4 @@ void pokerUiDispose(pokerui_t *ui);
  * @param texture Texture to use.
  * @param card Card to set to.
  */
-void pokerCardSetImage(image_t *image, texture_t *texture, card_t card);
\ No newline at end of file
+void pokerUiSetImageToCard(image_t *image, texture_t *texture, card_t card);
\ No newline at end of file
diff --git a/src/physics/aabb.h b/src/physics/aabb.h
index 0c5d8d71..e33e9cb9 100644
--- a/src/physics/aabb.h
+++ b/src/physics/aabb.h
@@ -9,6 +9,7 @@
 #include "../libs.h"
 #include "sphere.h"
 #include "../input/input.h"
+#include "../util/math.h"
 
 typedef struct {
   float hitX;
diff --git a/src/poker/actions/round.c b/src/poker/actions/round.c
index e7c87427..7c4d29af 100644
--- a/src/poker/actions/round.c
+++ b/src/poker/actions/round.c
@@ -15,6 +15,7 @@ void _pokerActionRoundOnStart(queue_t *queue, queueaction_t *action ,uint8_t i){
 
   poker = (poker_t *)action->data;
 
+  // Update game state.
   poker->state = POKER_STATE_STARTING_ROUND;
 
   // Prepare the initial game state
diff --git a/src/poker/actions/round.h b/src/poker/actions/round.h
index fe927f9d..d32d72cf 100644
--- a/src/poker/actions/round.h
+++ b/src/poker/actions/round.h
@@ -11,6 +11,7 @@
 #include "../dealer.h"
 #include "../bet.h"
 #include "../player.h"
+#include "../poker.h"
 
 /** Callback for when the poker round start aciton begins. */
 void _pokerActionRoundOnStart(queue_t *queue, queueaction_t *action, uint8_t i);
diff --git a/src/poker/bet.c b/src/poker/bet.c
index e4f37bfb..8ea0dcaa 100644
--- a/src/poker/bet.c
+++ b/src/poker/bet.c
@@ -29,7 +29,7 @@ void pokerBetPlayer(pokerbet_t *bet, pokerplayer_t *player, int32_t chips) {
 }
 
 void pokerBetResetBetter(
-  pokerbet_t *poker, pokerplayer_t *players, uint8_t roundSmallBlind
+  pokerbet_t *bet, pokerplayer_t *players, uint8_t roundSmallBlind
 ) {
   uint8_t i;
   pokerplayer_t *player;
@@ -37,6 +37,7 @@ void pokerBetResetBetter(
     player = players + i;
     player->state = flagOff(player->state, POKER_PLAYER_STATE_ROUND_MOVE);
   }
+  
   bet->better = pokerBetGetRoundPlayerDefault(roundSmallBlind);
 }
 
diff --git a/src/poker/bet.h b/src/poker/bet.h
index 2c449065..f137e591 100644
--- a/src/poker/bet.h
+++ b/src/poker/bet.h
@@ -6,6 +6,7 @@
 #pragma once
 #include "../libs.h"
 #include "player.h"
+#include "../util/math.h"
 
 /** How many chips each player has by defautl */
 #define POKER_BET_PLAYER_CHIPS_DEFAULT 10000
diff --git a/src/ui/align.h b/src/ui/align.h
index d89b81c6..e9a20043 100644
--- a/src/ui/align.h
+++ b/src/ui/align.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "../libs.h"
+#include "../util/flags.h"
 
 #define ALIGN_POS_CENTER flagDefine(0)
 #define ALIGN_POS_START flagDefine(1)
diff --git a/src/ui/grid.h b/src/ui/grid.h
index 1c74cff0..3c5a4598 100644
--- a/src/ui/grid.h
+++ b/src/ui/grid.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "../libs.h"
+#include "../util/math.h"
 #include "align.h"
 
 /** Maximum number of columns a grid can have */
diff --git a/src/util/array.h b/src/util/array.h
index c3de15d2..9ead669c 100644
--- a/src/util/array.h
+++ b/src/util/array.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "../libs.h"
+#include "rand.h"
 
 /**
  * Definition of a callback that is used to sort an array.
diff --git a/src/util/dynarray.h b/src/util/dynarray.h
index 6c3e17c8..556d7ba6 100644
--- a/src/util/dynarray.h
+++ b/src/util/dynarray.h
@@ -8,6 +8,7 @@
 #pragma once
 #include "../libs.h"
 #include "array.h"
+#include "math.h"
 
 /** Custom Array Definition */
 typedef struct {
diff --git a/src/vn/conversation/talk.h b/src/vn/conversation/talk.h
index aeeb8ae2..1c31d4e4 100644
--- a/src/vn/conversation/talk.h
+++ b/src/vn/conversation/talk.h
@@ -10,6 +10,7 @@
 #include "vnconversation.h"
 #include "../../display/animation/queue.h"
 #include "../vncharacter.h"
+#include "../../util/flags.h"
 
 /** Event Callback for when the talk action starts */
 void _vnConversationTalkStart(queue_t *q, queueaction_t *a, uint8_t i);
diff --git a/src/vn/ui/vntextbox.h b/src/vn/ui/vntextbox.h
index 52249408..2c4c88ab 100644
--- a/src/vn/ui/vntextbox.h
+++ b/src/vn/ui/vntextbox.h
@@ -15,6 +15,7 @@
 #include "../../input/input.h"
 #include "../../ui/frame.h"
 #include "../../engine/engine.h"
+#include "../../util/flags.h"
 
 /** Amount of characters scrolled, per second */
 #define VN_TEXTBOX_SCROLL_SPEED 60
diff --git a/src/vn/vncharacter.h b/src/vn/vncharacter.h
index c5539a3d..27b05440 100644
--- a/src/vn/vncharacter.h
+++ b/src/vn/vncharacter.h
@@ -14,6 +14,7 @@
 #include "../display/primitives/quad.h"
 #include "../display/animation/animation.h"
 #include "../engine/engine.h"
+#include "../display/animation/easing.h"
 
 #define VN_CHARACTER_BLINK_TIME_RANGE_MAX 6
 #define VN_CHARACTER_SIZE 0.5