diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc
index 8190c2e6..643d4900 100644
--- a/server/gameserver/app.cc
+++ b/server/gameserver/app.cc
@@ -41,6 +41,8 @@
 #include "tracemgr.h"
 #include "matchmgr.h"
 #include "selfchecker.h"
+#include "hero_agent.h"
+#include "android_agent.h"
 
 #include "skillhelper.h"
 #include "mt/MetaMgr.h"
@@ -227,9 +229,9 @@ void App::UnInit()
     HttpProxy::Instance()->UnInit();
     GGListener::Instance()->UnInit();
     PlayerMgr::Instance()->UnInit();
+    RoomMgr::Instance()->UnInit();
     MapMgr::Instance()->UnInit();
     MatchMgr::Instance()->UnInit();
-    RoomMgr::Instance()->UnInit();
     KillMgr::Instance()->UnInit();
     EntityFactory::Instance()->UnInit();
     SelfChecker::UnInit();