diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index 28408eec..7de8afff 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <iostream>
 
 #include <sstream>
-#include <time.h>
+#include <ctime>
 
-#include <string.h>
+#include <cstring>
 #include <memory>
 #include <Util/Util.h>
 
diff --git a/src/scripts/quest/classquest/WHM/JobWhm001.cpp b/src/scripts/quest/classquest/WHM/JobWhm001.cpp
index 0c607406..4a809993 100644
--- a/src/scripts/quest/classquest/WHM/JobWhm001.cpp
+++ b/src/scripts/quest/classquest/WHM/JobWhm001.cpp
@@ -8,7 +8,7 @@
 #include <Service.h>
 
 #include "Actor/BNpc.h"
-#include "Inventory/Item.h";
+#include "Inventory/Item.h"
 
 // Quest Script: JobWhm001_01124
 // Quest Name: A Relic Reborn (Thyrus)
diff --git a/src/tools/pcb_reader/threadpool.h b/src/tools/pcb_reader/threadpool.h
index 78657bd3..a5714170 100644
--- a/src/tools/pcb_reader/threadpool.h
+++ b/src/tools/pcb_reader/threadpool.h
@@ -34,7 +34,7 @@ public:
     if( num == 0 )
       num = std::thread::hardware_concurrency() - 1;
 
-    for( auto i = 0; i < num; ++i )
+    for( auto i = 0u; i < num; ++i )
     {
       m_workers.push_back( std::async( std::launch::async, [this]{ run(); } ) );
     }
diff --git a/src/world/Action/ItemAction.cpp b/src/world/Action/ItemAction.cpp
index 5ca875f2..fb84c355 100644
--- a/src/world/Action/ItemAction.cpp
+++ b/src/world/Action/ItemAction.cpp
@@ -86,5 +86,5 @@ void ItemAction::handleMountItem()
   auto player = getSourceChara()->getAsPlayer();
 
   player->unlockMount( m_itemAction->data().Calcu0Arg[ 0 ] );
-  player->dropInventoryItem( static_cast< Common::InventoryType >( m_itemSourceContainer ), m_itemSourceSlot );
+  player->dropInventoryItem( static_cast< Common::InventoryType >( m_itemSourceContainer ), static_cast< uint8_t >( m_itemSourceSlot ) );
 }
\ No newline at end of file
diff --git a/src/world/Manager/RNGMgr.h b/src/world/Manager/RNGMgr.h
index 57e9570c..6e9cd632 100644
--- a/src/world/Manager/RNGMgr.h
+++ b/src/world/Manager/RNGMgr.h
@@ -31,7 +31,7 @@ namespace Sapphire::World::Manager
       if constexpr( std::is_integral< T >::value )
         return m_intDist( *m_engine );
 
-      return m_fpuDist( *m_engine );
+      return static_cast< T >( m_fpuDist( *m_engine ) );
     }
 
     // returns an array of size nSize with values type T on set ranges, deducing real or integer distribution from given numeric type