diff --git a/src/game/Object/CreatureEventAI.cpp b/src/game/Object/CreatureEventAI.cpp
index c1ea75711..b4107c6ee 100644
--- a/src/game/Object/CreatureEventAI.cpp
+++ b/src/game/Object/CreatureEventAI.cpp
@@ -1022,6 +1022,8 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             m_creature->HandleEmote(action.emoteTarget.emoteId);
             break;
         }
+        default:
+            break;
     }
 }
 
@@ -1063,6 +1065,8 @@ void CreatureEventAI::Reset()
                     (*i).Enabled = true;
                 break;
             }
+            default:
+                break;
             // default:
             // TODO: enable below code line / verify this is correct to enable events previously disabled (ex. aggro yell), instead of enable this in void Aggro()
             //(*i).Enabled = true;
@@ -1344,6 +1348,8 @@ void CreatureEventAI::UpdateAI(const uint32 diff)
                                 ProcessEvent(*i);
                     }
                     break;
+                default:
+                    break;
             }
 
             m_EventDiff = 0;
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
index f8b38ead5..b6bdd67ba 100644
--- a/src/mangosd/CMakeLists.txt
+++ b/src/mangosd/CMakeLists.txt
@@ -47,7 +47,7 @@ endif()
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/shared
     ${CMAKE_SOURCE_DIR}/src/framework
-    ${CMAKE_SOURCE_DIR}/src/game/AuctionHouseBot
+    ${CMAKE_SOURCE_DIR}/src/game/
     ${CMAKE_SOURCE_DIR}/src/game/BattleGround
     ${CMAKE_SOURCE_DIR}/src/game/Server
     ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers
diff --git a/src/mangosd/Main.cpp b/src/mangosd/Main.cpp
index 3dbe5dcbe..dca11a029 100644
--- a/src/mangosd/Main.cpp
+++ b/src/mangosd/Main.cpp
@@ -33,7 +33,7 @@
 #include "Log.h"
 #include "Master.h"
 #include "SystemConfig.h"
-#include "AuctionHouseBot/AuctionHouseBot.h"
+#include "AuctionHouseBot.h"
 #include "revision.h"
 #include "revision_nr.h"
 #include <openssl/opensslv.h>