#include "cheats.qh"
#include "client.qh"
#include "clientkill.qh"
-#include "g_damage.qh"
-#include "g_world.qh"
+#include "damage.qh"
+#include "world.qh"
#include "handicap.qh"
#include "miscfunctions.qh"
#include "portals.qh"
#include "teamplay.qh"
-#include <server/sv_main.qh>
+#include <server/main.qh>
#include "weapons/common.qh"
#include "weapons/throwing.qh"
#include "command/common.qh"