diff --git a/include/backpacktf.hpp b/include/backpacktf.hpp
index 85217f1b..487d5af5 100755
--- a/include/backpacktf.hpp
+++ b/include/backpacktf.hpp
@@ -20,8 +20,6 @@ constexpr unsigned OUTDATED_AGE =
     60 * 60 * 24 * 3; // After how many seconds backpack is marked "outdated"
                       // (possibly private)
 
-extern CatVar enable_bptf;
-
 struct backpack_data_s
 {
     bool pending{ false };
diff --git a/include/crits.hpp b/include/crits.hpp
index 025a1d5c..6525135a 100755
--- a/include/crits.hpp
+++ b/include/crits.hpp
@@ -25,10 +25,6 @@ struct crithack_saved_state
     void Load(IClientEntity *entity);
 };
 
-extern CatVar crit_info;
-extern CatVar crit_key;
-extern CatVar crit_melee;
-
 namespace criticals
 {
 
diff --git a/include/hacks/AntiAim.hpp b/include/hacks/AntiAim.hpp
index 8c671e06..274c63eb 100755
--- a/include/hacks/AntiAim.hpp
+++ b/include/hacks/AntiAim.hpp
@@ -16,19 +16,12 @@ namespace hacks::shared::antiaim
 // TODO paste AA from AimTux
 
 extern CatVar enabled;
-extern CatVar yaw;
-extern CatVar pitch;
-extern CatVar yaw_mode;
-extern CatVar pitch_mode;
-extern CatVar roll;
-extern CatVar no_clamping;
-extern CatVar spin;
-extern CatVar lisp;
 extern CatVar communicate;
+extern CatVar yaw_mode;
 
 extern int safe_space;
 
 void SetSafeSpace(int safespace);
 bool ShouldAA(CUserCmd *cmd);
 void ProcessUserCmd(CUserCmd *cmd);
-}
\ No newline at end of file
+}
diff --git a/include/hacks/AntiDisguise.hpp b/include/hacks/AntiDisguise.hpp
index 2f1b774d..49eec69b 100755
--- a/include/hacks/AntiDisguise.hpp
+++ b/include/hacks/AntiDisguise.hpp
@@ -11,8 +11,5 @@
 
 namespace hacks::tf2::antidisguise
 {
-
-extern CatVar enabled;
-
 void Draw();
 }
diff --git a/include/hacks/AutoHeal.hpp b/include/hacks/AutoHeal.hpp
index 87ea120b..4a6831ee 100755
--- a/include/hacks/AutoHeal.hpp
+++ b/include/hacks/AutoHeal.hpp
@@ -15,9 +15,6 @@ namespace tf
 {
 namespace autoheal
 {
-
-extern CatVar enabled;
-extern CatVar silent;
 // TODO extern CatVar target_only;
 void CreateMove();
 
diff --git a/include/hacks/AutoReflect.hpp b/include/hacks/AutoReflect.hpp
index cfcda97d..faf593d0 100755
--- a/include/hacks/AutoReflect.hpp
+++ b/include/hacks/AutoReflect.hpp
@@ -15,12 +15,6 @@ namespace tf
 {
 namespace autoreflect
 {
-
-extern CatVar enabled;
-extern CatVar idle_only;
-extern CatVar stickies;
-extern CatVar max_distance;
-
 void Draw();
 void CreateMove();
 bool ShouldReflect(CachedEntity *ent);
diff --git a/include/hacks/AutoSticky.hpp b/include/hacks/AutoSticky.hpp
index 0bd407fc..2f89cba6 100755
--- a/include/hacks/AutoSticky.hpp
+++ b/include/hacks/AutoSticky.hpp
@@ -15,11 +15,6 @@ namespace tf
 {
 namespace autosticky
 {
-
-extern CatVar enabled;
-extern CatVar buildings;
-extern CatVar distance;
-
 bool ShouldDetonate(CachedEntity *bomb);
 void CreateMove();
 }
diff --git a/include/hacks/AutoTaunt.hpp b/include/hacks/AutoTaunt.hpp
index a3817624..487bd601 100755
--- a/include/hacks/AutoTaunt.hpp
+++ b/include/hacks/AutoTaunt.hpp
@@ -16,10 +16,6 @@ namespace tf
 {
 namespace autotaunt
 {
-
-extern CatVar enabled;
-extern CatVar chance;
-
 extern InitRoutine init;
 }
 }
diff --git a/include/hacks/Bunnyhop.hpp b/include/hacks/Bunnyhop.hpp
index 8728b144..37410723 100755
--- a/include/hacks/Bunnyhop.hpp
+++ b/include/hacks/Bunnyhop.hpp
@@ -15,9 +15,6 @@ namespace shared
 {
 namespace bunnyhop
 {
-
-extern CatVar enabled;
-
 void CreateMove();
 }
 }
diff --git a/include/hacks/Misc.hpp b/include/hacks/Misc.hpp
index 9bda212a..99939615 100755
--- a/include/hacks/Misc.hpp
+++ b/include/hacks/Misc.hpp
@@ -23,17 +23,6 @@ void DrawText();
 #endif
 
 extern int last_number;
-extern CatVar debug_info;
-extern CatVar flashlight_spam;
-extern CatVar anti_afk;
-extern CatVar tauntslide;
-extern CatCommand name;
-extern CatCommand save_settings;
-extern CatCommand say_lines;
-extern CatCommand disconnect;
-extern CatCommand schema;
-extern CatCommand disconnect_vac;
-extern CatCommand set_value;
 
 extern float last_bucket;
 }
@@ -85,4 +74,4 @@ public:
 void Schema_Reload();
 void CC_Misc_Disconnect_VAC();
 
-DECLARE_HACK_SINGLETON(Misc);*/
\ No newline at end of file
+DECLARE_HACK_SINGLETON(Misc);*/
diff --git a/include/hacks/Noisemaker.hpp b/include/hacks/Noisemaker.hpp
index 4631b64d..cb8c053e 100755
--- a/include/hacks/Noisemaker.hpp
+++ b/include/hacks/Noisemaker.hpp
@@ -15,9 +15,6 @@ namespace tf2
 {
 namespace noisemaker
 {
-
-extern CatVar enabled;
-
 void CreateMove();
 }
 }
diff --git a/include/hacks/Radar.hpp b/include/hacks/Radar.hpp
index 7f87dc45..0329082f 100755
--- a/include/hacks/Radar.hpp
+++ b/include/hacks/Radar.hpp
@@ -17,12 +17,6 @@ namespace tf
 namespace radar
 {
 
-extern CatVar size;
-extern CatVar zoom;
-extern CatVar radar_enabled;
-extern CatVar radar_x;
-extern CatVar radar_y;
-
 void Init();
 std::pair<int, int> WorldToRadar(int x, int y);
 void Draw();
diff --git a/include/hacks/Spam.hpp b/include/hacks/Spam.hpp
index 03b0eb43..4a1d002d 100755
--- a/include/hacks/Spam.hpp
+++ b/include/hacks/Spam.hpp
@@ -26,8 +26,6 @@ extern const std::vector<std::string> builtin_lmaobox;
 extern const std::vector<std::string> builtin_lithium;
 
 extern CatVar spam_source;
-extern CatVar filename;
-extern CatCommand reload;
 
 void Init();
 void CreateMove();
diff --git a/include/hacks/SpyAlert.hpp b/include/hacks/SpyAlert.hpp
index ba5869f3..eeb291cd 100755
--- a/include/hacks/SpyAlert.hpp
+++ b/include/hacks/SpyAlert.hpp
@@ -15,11 +15,6 @@ namespace tf
 {
 namespace spyalert
 {
-
-extern CatVar enabled;
-extern CatVar distance_warning;
-extern CatVar distance_backstab;
-
 void Draw();
 }
 }
diff --git a/include/visual/drawing.hpp b/include/visual/drawing.hpp
index f12449b2..934293c7 100755
--- a/include/visual/drawing.hpp
+++ b/include/visual/drawing.hpp
@@ -34,8 +34,6 @@ void Update();
 
 extern const std::vector<std::string> fonts;
 extern CatEnum family_enum;
-extern CatVar esp_family;
-extern CatVar esp_height;
 }
 
 constexpr rgba_t GUIColor()
diff --git a/include/visual/fidgetspinner.hpp b/include/visual/fidgetspinner.hpp
index d7e3d251..ad5f588f 100755
--- a/include/visual/fidgetspinner.hpp
+++ b/include/visual/fidgetspinner.hpp
@@ -13,8 +13,6 @@
 class CatVar;
 
 extern std::array<textures::sprite, 4> spinner_states;
-
-extern CatVar enable_spinner;
 extern CatVar v9mode;
 void InitSpinner();
 void DrawSpinner();
diff --git a/include/visual/menu/ncc/Menu.hpp b/include/visual/menu/ncc/Menu.hpp
index c40e4bbc..2d0ab0c6 100755
--- a/include/visual/menu/ncc/Menu.hpp
+++ b/include/visual/menu/ncc/Menu.hpp
@@ -32,8 +32,6 @@ class List;
 class Tooltip;
 
 extern CatVar scale;
-extern CatVar font_family;
-extern CatVar font_title_family;
 
 constexpr int psize_font_item  = 12;
 constexpr int psize_font_title = 14;
diff --git a/src/MiscTemporary.cpp b/src/MiscTemporary.cpp
index 4c36762c..aae41db3 100644
--- a/src/MiscTemporary.cpp
+++ b/src/MiscTemporary.cpp
@@ -24,7 +24,7 @@ CatVar serverlag_amount(
     CV_INT, "serverlag", "0", "serverlag",
     "Lag the server by spamming this many voicecommands per tick");
 CatVar semiauto(CV_INT, "semiauto", "0", "Semiauto");
-CatVar servercrash(CV_SWITCH, "servercrash", "0", "crash servers",
+static CatVar servercrash(CV_SWITCH, "servercrash", "0", "crash servers",
                    "Crash servers by spamming signon net messages");
 bool *bSendPackets;
 
@@ -32,4 +32,4 @@ CatVar crypt_chat(
     CV_SWITCH, "chat_crypto", "1", "Crypto chat",
     "Start message with !! and it will be only visible to cathook users");
 
-int spectator_target;
\ No newline at end of file
+int spectator_target;
diff --git a/src/backpacktf.cpp b/src/backpacktf.cpp
index eecc7bf0..d55015e6 100755
--- a/src/backpacktf.cpp
+++ b/src/backpacktf.cpp
@@ -25,7 +25,7 @@ std::mutex cache_mutex{};
 std::string api_key_s = "";
 bool valid_api_key    = false;
 
-CatVar enable_bptf(CV_SWITCH, "bptf_enable", "0", "Enable backpack.tf",
+static CatVar enable_bptf(CV_SWITCH, "bptf_enable", "0", "Enable backpack.tf",
                    "Enable backpack.tf integration\nYou have to set your API "
                    "key in cat_bptf_key");
 CatCommand api_key("bptf_key", "Set API Key", [](const CCommand &args) {
diff --git a/src/chatlog.cpp b/src/chatlog.cpp
index 72da824c..33805f83 100644
--- a/src/chatlog.cpp
+++ b/src/chatlog.cpp
@@ -15,10 +15,10 @@
 namespace chatlog
 {
 
-CatVar enabled(CV_SWITCH, "chat_log", "0", "Chat log", "Log chat to file");
-CatVar dont_log_spam(CV_SWITCH, "chat_log_nospam", "1", "No Spam",
+static CatVar enabled(CV_SWITCH, "chat_log", "0", "Chat log", "Log chat to file");
+static CatVar dont_log_spam(CV_SWITCH, "chat_log_nospam", "1", "No Spam",
                      "Don't log your messages if spam is active");
-CatVar dont_log_ipc(CV_SWITCH, "chat_log_noipc", "1", "No IPC",
+static CatVar dont_log_ipc(CV_SWITCH, "chat_log_noipc", "1", "No IPC",
                     "Don't log messages sent by bots");
 
 class csv_stream
diff --git a/src/crits.cpp b/src/crits.cpp
index 5076ebc4..a2c5454b 100644
--- a/src/crits.cpp
+++ b/src/crits.cpp
@@ -7,13 +7,13 @@
 
 #include "common.hpp"
 
-CatVar crit_info(CV_SWITCH, "crit_info", "0", "Show crit info");
-CatVar crit_key(CV_KEY, "crit_key", "0", "Crit Key");
-CatVar crit_melee(CV_SWITCH, "crit_melee", "0", "Melee crits");
-CatVar crit_legiter(
+static CatVar crit_info(CV_SWITCH, "crit_info", "0", "Show crit info");
+static CatVar crit_key(CV_KEY, "crit_key", "0", "Crit Key");
+static CatVar crit_melee(CV_SWITCH, "crit_melee", "0", "Melee crits");
+static CatVar crit_legiter(
     CV_SWITCH, "crit_force_gameplay", "0", "Don't hinder gameplay",
     "Attempt to crit when possible but do not hinder normal gameplay");
-CatVar crit_experimental(CV_SWITCH, "crit_experimental", "0",
+static CatVar crit_experimental(CV_SWITCH, "crit_experimental", "0",
                          "Experimental crithack");
 
 std::unordered_map<int, int> command_number_mod{};
diff --git a/src/hacks/Achievement.cpp b/src/hacks/Achievement.cpp
index aa350d60..d07e54d7 100644
--- a/src/hacks/Achievement.cpp
+++ b/src/hacks/Achievement.cpp
@@ -10,7 +10,7 @@
 namespace hacks::tf2::achievement
 {
 
-CatVar safety(CV_SWITCH, "achievement_safety", "1",
+static CatVar safety(CV_SWITCH, "achievement_safety", "1",
               "Achievement commands safety switch");
 
 void Lock()
diff --git a/src/hacks/Announcer.cpp b/src/hacks/Announcer.cpp
index f514c18a..87ae2152 100755
--- a/src/hacks/Announcer.cpp
+++ b/src/hacks/Announcer.cpp
@@ -14,7 +14,7 @@ namespace shared
 namespace announcer
 {
 
-CatVar enabled(CV_SWITCH, "announcer", "0", "Enable announcer");
+static CatVar enabled(CV_SWITCH, "announcer", "0", "Enable announcer");
 
 struct announcer_entry_s
 {
diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp
index 5f2950bf..a901fd1f 100644
--- a/src/hacks/AntiAim.cpp
+++ b/src/hacks/AntiAim.cpp
@@ -19,48 +19,48 @@ CatVar communicate(CV_SWITCH, "identify", "1", "identify",
                    "Auto identify for other cathook users");
 CatVar enabled(CV_SWITCH, "aa_enabled", "0", "Anti-Aim",
                "Master AntiAim switch");
-CatVar trueang(CV_SWITCH, "aa_realfakes", "0", "Real fakes",
+static CatVar trueang(CV_SWITCH, "aa_realfakes", "0", "Real fakes",
                "Do real fakeangles (Unresolveable)");
-CatVar yaw(CV_FLOAT, "aa_yaw", "0.0", "Yaw", "Static yaw (left/right)", 360.0);
-CatVar pitch(CV_FLOAT, "aa_pitch", "-89.0", "Pitch", "Static pitch (up/down)",
+static CatVar yaw(CV_FLOAT, "aa_yaw", "0.0", "Yaw", "Static yaw (left/right)", 360.0);
+static CatVar pitch(CV_FLOAT, "aa_pitch", "-89.0", "Pitch", "Static pitch (up/down)",
              -89.0, 89.0);
-CatVar yaw_real(CV_FLOAT, "aa_yaw_real", "0.0", "Real Yaw",
+static CatVar yaw_real(CV_FLOAT, "aa_yaw_real", "0.0", "Real Yaw",
                 "Static yaw (left/right)", 360.0);
-CatVar pitch_real(CV_FLOAT, "aa_pitch_real", "-89.0", "Real Pitch",
+static CatVar pitch_real(CV_FLOAT, "aa_pitch_real", "-89.0", "Real Pitch",
                   "Static pitch (up/down)", -89.0, 89.0);
-CatEnum yaw_mode_enum({ "KEEP", "STATIC", "JITTER", "BIGRANDOM", "RANDOM",
+static CatEnum yaw_mode_enum({ "KEEP", "STATIC", "JITTER", "BIGRANDOM", "RANDOM",
                         "SPIN", "OFFSETKEEP", "EDGE", "HECK", "FAKESIDEWAYS" });
-CatEnum pitch_mode_enum({ "KEEP", "STATIC", "JITTER", "RANDOM", "FLIP",
+static CatEnum pitch_mode_enum({ "KEEP", "STATIC", "JITTER", "RANDOM", "FLIP",
                           "FAKEFLIP", "FAKEUP", "FAKEDOWN", "FAKECENTER", "UP",
                           "DOWN", "HECK" });
 CatVar yaw_mode(yaw_mode_enum, "aa_yaw_mode", "0", "Yaw mode", "Yaw mode");
-CatVar pitch_mode(pitch_mode_enum, "aa_pitch_mode", "0", "Pitch mode",
+static CatVar pitch_mode(pitch_mode_enum, "aa_pitch_mode", "0", "Pitch mode",
                   "Pitch mode");
-CatVar true_yaw_mode(yaw_mode_enum, "aa_yaw_mode_real", "0", "The Real Yaw",
+static CatVar true_yaw_mode(yaw_mode_enum, "aa_yaw_mode_real", "0", "The Real Yaw",
                      "Yaw mode");
-CatVar true_pitch_mode(pitch_mode_enum, "aa_pitch_mode_real", "0",
+static CatVar true_pitch_mode(pitch_mode_enum, "aa_pitch_mode_real", "0",
                        "The Real Pitch", "Pitch mode");
-CatVar roll(CV_FLOAT, "aa_roll", "0", "Roll", "Roll angle (viewangles.z)", -180,
+static CatVar roll(CV_FLOAT, "aa_roll", "0", "Roll", "Roll angle (viewangles.z)", -180,
             180);
-CatVar no_clamping(CV_SWITCH, "aa_no_clamp", "0", "Don't clamp angles",
+static CatVar no_clamping(CV_SWITCH, "aa_no_clamp", "0", "Don't clamp angles",
                    "Use this with STATIC mode for unclamped manual angles");
-CatVar spin(CV_FLOAT, "aa_spin", "10.0", "Spin speed",
+static CatVar spin(CV_FLOAT, "aa_spin", "10.0", "Spin speed",
             "Spin speed (degrees/second)");
 
-CatVar aaaa_enabled(CV_SWITCH, "aa_aaaa_enabled", "0", "Enable AAAA",
+static CatVar aaaa_enabled(CV_SWITCH, "aa_aaaa_enabled", "0", "Enable AAAA",
                     "Enable Anti-Anti-Anti-Aim (Overrides AA Pitch)");
-CatVar aaaa_interval(CV_FLOAT, "aa_aaaa_interval", "0", "Interval",
+static CatVar aaaa_interval(CV_FLOAT, "aa_aaaa_interval", "0", "Interval",
                      "Interval in seconds, 0 = random");
-CatVar aaaa_interval_random_high(CV_FLOAT, "aa_aaaa_interval_high", "15",
+static CatVar aaaa_interval_random_high(CV_FLOAT, "aa_aaaa_interval_high", "15",
                                  "Interval Ceiling",
                                  "Upper bound for random AAAA interval");
-CatVar aaaa_interval_random_low(CV_FLOAT, "aa_aaaa_interval_low", "3",
+static CatVar aaaa_interval_random_low(CV_FLOAT, "aa_aaaa_interval_low", "3",
                                 "Interval Floor",
                                 "Lower bound for random AAAA interval");
-CatEnum aaaa_modes_enum({ "(FAKE)UP", "(FAKE)DOWN" });
-CatVar aaaa_mode(aaaa_modes_enum, "aa_aaaa_mode", "0", "Mode",
+static CatEnum aaaa_modes_enum({ "(FAKE)UP", "(FAKE)DOWN" });
+static CatVar aaaa_mode(aaaa_modes_enum, "aa_aaaa_mode", "0", "Mode",
                  "Anti-Anti-Anti-Aim Mode");
-CatVar aaaa_flip_key(CV_KEY, "aa_aaaa_flip_key", "0", "Flip key",
+static CatVar aaaa_flip_key(CV_KEY, "aa_aaaa_flip_key", "0", "Flip key",
                      "If you press that key, current AA will change");
 
 float cur_yaw  = 0.0f;
diff --git a/src/hacks/AntiDisguise.cpp b/src/hacks/AntiDisguise.cpp
index 9d6dd50c..2e83276e 100755
--- a/src/hacks/AntiDisguise.cpp
+++ b/src/hacks/AntiDisguise.cpp
@@ -14,7 +14,7 @@ namespace tf2
 namespace antidisguise
 {
 
-CatVar enabled(CV_SWITCH, "antidisguise", "0", "Remove spy disguise",
+static CatVar enabled(CV_SWITCH, "antidisguise", "0", "Remove spy disguise",
                "Removes the disguise from spys\nUsefull for aimbot");
 static CatVar no_invisibility(CV_SWITCH, "no_invis", "0", "Remove Invisibility",
                               "Useful with chams!");
diff --git a/src/hacks/AutoDeadringer.cpp b/src/hacks/AutoDeadringer.cpp
index 9a016660..27d80b68 100644
--- a/src/hacks/AutoDeadringer.cpp
+++ b/src/hacks/AutoDeadringer.cpp
@@ -11,7 +11,7 @@ namespace shared
 {
 namespace deadringer
 {
-CatVar enabled(CV_SWITCH, "deadringer_auto", "0", "Auto deadringer",
+static CatVar enabled(CV_SWITCH, "deadringer_auto", "0", "Auto deadringer",
                "automatically pull out DR on low health or projectile nearby");
 
 bool IsProjectile(CachedEntity *ent)
diff --git a/src/hacks/AutoDetonator.cpp b/src/hacks/AutoDetonator.cpp
index f27a0406..6daabd10 100755
--- a/src/hacks/AutoDetonator.cpp
+++ b/src/hacks/AutoDetonator.cpp
@@ -15,9 +15,9 @@ namespace autodetonator
 {
 
 // Vars for user settings
-CatVar enabled(CV_SWITCH, "detonator_enabled", "0", "Auto-Detonator-detonator",
+static CatVar enabled(CV_SWITCH, "detonator_enabled", "0", "Auto-Detonator-detonator",
                "Master auto detonator switch");
-CatVar legit(CV_SWITCH, "detonator_legit", "0", "Ignore invis",
+static CatVar legit(CV_SWITCH, "detonator_legit", "0", "Ignore invis",
              "Ignores invis spies");
 
 // A storage array for ents
diff --git a/src/hacks/AutoHeal.cpp b/src/hacks/AutoHeal.cpp
index c09e7bf4..b0bcf857 100644
--- a/src/hacks/AutoHeal.cpp
+++ b/src/hacks/AutoHeal.cpp
@@ -16,9 +16,9 @@ namespace tf
 namespace autoheal
 {
 
-CatVar enabled(CV_SWITCH, "autoheal_enabled", "0", "AutoHeal",
+static CatVar enabled(CV_SWITCH, "autoheal_enabled", "0", "AutoHeal",
                "Automatically heals nearby teammates");
-CatVar silent(CV_SWITCH, "autoheal_silent", "1", "Silent AutoHeal",
+static CatVar silent(CV_SWITCH, "autoheal_silent", "1", "Silent AutoHeal",
               "Silent AutoHeal. Disable this to make ghetto followbot");
 // extern CatVar target_only;
 
diff --git a/src/hacks/AutoJoin.cpp b/src/hacks/AutoJoin.cpp
index aacd00f9..7f8fbdfd 100644
--- a/src/hacks/AutoJoin.cpp
+++ b/src/hacks/AutoJoin.cpp
@@ -19,11 +19,11 @@ namespace autojoin
  * Credits to Blackfire for helping me with auto-requeue!
  */
 
-CatEnum classes_enum({ "DISABLED", "SCOUT", "SNIPER", "SOLDIER", "DEMOMAN",
+static CatEnum classes_enum({ "DISABLED", "SCOUT", "SNIPER", "SOLDIER", "DEMOMAN",
                        "MEDIC", "HEAVY", "PYRO", "SPY", "ENGINEER" });
-CatVar autojoin_team(CV_SWITCH, "autojoin_team", "0", "AutoJoin",
+static CatVar autojoin_team(CV_SWITCH, "autojoin_team", "0", "AutoJoin",
                      "Automatically joins a team");
-CatVar preferred_class(classes_enum, "autojoin_class", "0", "AutoJoin class",
+static CatVar preferred_class(classes_enum, "autojoin_class", "0", "AutoJoin class",
                        "You will pick a class automatically");
 
 CatVar auto_queue(CV_SWITCH, "autoqueue", "0", "AutoQueue",
diff --git a/src/hacks/AutoReflect.cpp b/src/hacks/AutoReflect.cpp
index 8e715587..73b8a751 100755
--- a/src/hacks/AutoReflect.cpp
+++ b/src/hacks/AutoReflect.cpp
@@ -16,26 +16,26 @@ namespace autoreflect
 {
 
 // Vars for user settings
-CatVar enabled(CV_SWITCH, "reflect_enabled", "0", "Auto Reflect",
+static CatVar enabled(CV_SWITCH, "reflect_enabled", "0", "Auto Reflect",
                "Master AutoReflect switch");
-CatVar idle_only(CV_SWITCH, "reflect_only_idle", "0", "Only when not shooting",
+static CatVar idle_only(CV_SWITCH, "reflect_only_idle", "0", "Only when not shooting",
                  "Don't AutoReflect if you're holding M1");
-CatVar legit(CV_SWITCH, "reflect_legit", "0", "Legit Reflect",
+static CatVar legit(CV_SWITCH, "reflect_legit", "0", "Legit Reflect",
              "Only Auto-airblasts projectiles that you can see, doesnt move "
              "your crosshair");
-CatVar dodgeball(CV_SWITCH, "reflect_dodgeball", "0", "Dodgeball Mode",
+static CatVar dodgeball(CV_SWITCH, "reflect_dodgeball", "0", "Dodgeball Mode",
                  "Allows auto-reflect to work in dodgeball servers");
-CatVar blastkey(CV_KEY, "reflect_key", "0", "Reflect Key",
+static CatVar blastkey(CV_KEY, "reflect_key", "0", "Reflect Key",
                 "Hold this key to activate auto-airblast");
-CatVar stickies(CV_SWITCH, "reflect_stickybombs", "0", "Reflect stickies",
+static CatVar stickies(CV_SWITCH, "reflect_stickybombs", "0", "Reflect stickies",
                 "Reflect Stickybombs");
-CatVar teammates(CV_SWITCH, "reflect_teammates", "0",
+static CatVar teammates(CV_SWITCH, "reflect_teammates", "0",
                  "Reflect teammates projectiles", "Useful in dodgeball with "
                                                   "free-for-all enabled");
-CatVar fov(CV_FLOAT, "reflect_fov", "85", "Reflect FOV", "Reflect FOV", 180.0f);
-CatVar fov_draw(CV_SWITCH, "reflect_fov_draw", "0", "Draw Fov Ring",
+static CatVar fov(CV_FLOAT, "reflect_fov", "85", "Reflect FOV", "Reflect FOV", 180.0f);
+static CatVar fov_draw(CV_SWITCH, "reflect_fov_draw", "0", "Draw Fov Ring",
                 "Draws a ring to represent your current reflect fov");
-CatVar fovcircle_opacity(CV_FLOAT, "reflect_fov_draw_opacity", "0.7",
+static CatVar fovcircle_opacity(CV_FLOAT, "reflect_fov_draw_opacity", "0.7",
                          "FOV Circle Opacity", "Defines opacity of FOV circle",
                          0.0f, 1.0f);
 // TODO setup proj sorting
diff --git a/src/hacks/AutoSticky.cpp b/src/hacks/AutoSticky.cpp
index 62f5f36b..269348de 100644
--- a/src/hacks/AutoSticky.cpp
+++ b/src/hacks/AutoSticky.cpp
@@ -16,11 +16,11 @@ namespace autosticky
 {
 
 // Vars for user settings
-CatVar enabled(CV_SWITCH, "sticky_enabled", "0", "AutoSticky",
+static CatVar enabled(CV_SWITCH, "sticky_enabled", "0", "AutoSticky",
                "Master AutoSticky switch");
-CatVar buildings(CV_SWITCH, "sticky_buildings", "1", "Detonate buildings",
+static CatVar buildings(CV_SWITCH, "sticky_buildings", "1", "Detonate buildings",
                  "Stickies react to buildings");
-CatVar
+static CatVar
     legit(CV_SWITCH, "sticky_legit", "0", "Legit",
           "Stickys only detonate when you see them\nAlso ignores invis spies");
 
diff --git a/src/hacks/AutoTaunt.cpp b/src/hacks/AutoTaunt.cpp
index 31d69247..07c6591b 100755
--- a/src/hacks/AutoTaunt.cpp
+++ b/src/hacks/AutoTaunt.cpp
@@ -15,10 +15,10 @@ namespace tf
 namespace autotaunt
 {
 
-CatVar enabled(
+static CatVar enabled(
     CV_SWITCH, "autotaunt", "0", "AutoTaunt",
     "Automatically taunt after killing an enemy, use with walkbots I guess");
-CatVar chance(CV_FLOAT, "autotaunt_chance", "8", "AutoTaunt chance",
+static CatVar chance(CV_FLOAT, "autotaunt_chance", "8", "AutoTaunt chance",
               "Chance of taunting after kill. 0 to 100.", 0.0f, 100.0f);
 
 class AutoTauntListener : public IGameEventListener2
diff --git a/src/hacks/Bunnyhop.cpp b/src/hacks/Bunnyhop.cpp
index 66e41257..a90638a1 100755
--- a/src/hacks/Bunnyhop.cpp
+++ b/src/hacks/Bunnyhop.cpp
@@ -15,7 +15,7 @@ namespace bunnyhop
 {
 
 // Var for user settings
-CatVar enabled(CV_SWITCH, "bhop_enabled", "0", "Bunnyhop",
+static CatVar enabled(CV_SWITCH, "bhop_enabled", "0", "Bunnyhop",
                "Enable Bunnyhop. All extra features like autojump and perfect "
                "jump limit were temporary removed.");
 // CatVar perfect_jump_limit(CV_INT, "bhop_enabled", "0", "Bunnyhop", "Enable
diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp
index 5a6079f1..caeaf22b 100644
--- a/src/hacks/ESP.cpp
+++ b/src/hacks/ESP.cpp
@@ -16,116 +16,116 @@ namespace esp
 {
 
 // Main Switch
-CatVar enabled(CV_SWITCH, "esp_enabled", "0", "ESP", "Master ESP switch");
+static CatVar enabled(CV_SWITCH, "esp_enabled", "0", "ESP", "Master ESP switch");
 // Box esp + Options
-CatEnum box_esp_enum({ "None", "Normal", "Corners" });
-CatVar box_esp(box_esp_enum, "esp_box", "2", "Box", "Draw a 2D box");
-CatVar box_corner_size(CV_INT, "esp_box_corner_size", "10", "Corner Size");
+static CatEnum box_esp_enum({ "None", "Normal", "Corners" });
+static CatVar box_esp(box_esp_enum, "esp_box", "2", "Box", "Draw a 2D box");
+static CatVar box_corner_size(CV_INT, "esp_box_corner_size", "10", "Corner Size");
 // Tracers
-CatEnum tracers_enum({ "OFF", "CENTER", "BOTTOM" });
-CatVar tracers(tracers_enum, "esp_tracers", "0", "Tracers",
+static CatEnum tracers_enum({ "OFF", "CENTER", "BOTTOM" });
+static CatVar tracers(tracers_enum, "esp_tracers", "0", "Tracers",
                "SDraws a line from the player to a position on your screen");
 // Emoji Esp
-CatEnum emoji_esp_enum({ "None", "Joy", "Thinking" });
-CatVar emoji_esp(emoji_esp_enum, "esp_emoji", "0", "Emoji ESP",
+static CatEnum emoji_esp_enum({ "None", "Joy", "Thinking" });
+static CatVar emoji_esp(emoji_esp_enum, "esp_emoji", "0", "Emoji ESP",
                  "Draw emoji on peopels head");
-CatVar emoji_ok(CV_SWITCH, "esp_okhand", "0", "ok_hand",
+static CatVar emoji_ok(CV_SWITCH, "esp_okhand", "0", "ok_hand",
                 "Draw ok_hand on hands");
-CatVar emoji_esp_size(CV_FLOAT, "esp_emoji_size", "32", "Emoji ESP Size",
+static CatVar emoji_esp_size(CV_FLOAT, "esp_emoji_size", "32", "Emoji ESP Size",
                       "Emoji size");
-CatVar emoji_esp_scaling(CV_SWITCH, "esp_emoji_scaling", "1",
+static CatVar emoji_esp_scaling(CV_SWITCH, "esp_emoji_scaling", "1",
                          "Emoji ESP Scaling", "Emoji ESP Scaling");
-CatVar emoji_min_size(CV_INT, "esp_emoji_min_size", "20", "Emoji ESP min size",
+static CatVar emoji_min_size(CV_INT, "esp_emoji_min_size", "20", "Emoji ESP min size",
                       "Minimum size for an emoji when you use auto scaling");
 
 hitbox_cache::CachedHitbox *hitboxcache[32][18]{};
 // Other esp options
-CatEnum show_health_enum({ "None", "Text", "Healthbar", "Both" });
-CatVar show_health(show_health_enum, "esp_health", "3", "Health ESP",
+static CatEnum show_health_enum({ "None", "Text", "Healthbar", "Both" });
+static CatVar show_health(show_health_enum, "esp_health", "3", "Health ESP",
                    "Show enemy health");
-CatVar draw_bones(CV_SWITCH, "esp_bones", "0", "Draw Bones");
-CatEnum sightlines_enum({ "None", "Sniper Only",
+static CatVar draw_bones(CV_SWITCH, "esp_bones", "0", "Draw Bones");
+static CatEnum sightlines_enum({ "None", "Sniper Only",
                           "All" }); // I ripped of lbox's choices cuz its nice
-CatVar sightlines(sightlines_enum, "esp_sightlines", "0", "Show sightlines",
+static CatVar sightlines(sightlines_enum, "esp_sightlines", "0", "Show sightlines",
                   "Displays a line of where players are looking");
-CatEnum esp_text_position_enum({ "TOP RIGHT", "BOTTOM RIGHT", "CENTER", "ABOVE",
+static CatEnum esp_text_position_enum({ "TOP RIGHT", "BOTTOM RIGHT", "CENTER", "ABOVE",
                                  "BELOW" });
-CatVar esp_text_position(esp_text_position_enum, "esp_text_position", "0",
+static CatVar esp_text_position(esp_text_position_enum, "esp_text_position", "0",
                          "Text position", "Defines text position");
-CatVar esp_expand(
+static CatVar esp_expand(
     CV_INT, "esp_expand", "0", "Expand Esp",
     "Spreads out Box, health bar, and text from center"); // Note, check if this
                                                           // should be int, it
                                                           // is being used by
                                                           // casting as float
-CatVar vischeck(CV_SWITCH, "esp_vischeck", "1", "VisCheck",
+static CatVar vischeck(CV_SWITCH, "esp_vischeck", "1", "VisCheck",
                 "ESP visibility check - makes enemy info behind walls darker, "
                 "disable this if you get FPS drops");
-CatVar legit(CV_SWITCH, "esp_legit", "0", "Legit Mode",
+static CatVar legit(CV_SWITCH, "esp_legit", "0", "Legit Mode",
              "Don't show invisible enemies\nHides invisable enemies with "
              "visibility enabled");
 // Selective esp options
-CatVar local_esp(CV_SWITCH, "esp_local", "1", "ESP Local Player",
+static CatVar local_esp(CV_SWITCH, "esp_local", "1", "ESP Local Player",
                  "Shows local player ESP in thirdperson");
-CatVar buildings(CV_SWITCH, "esp_buildings", "1", "Building ESP",
+static CatVar buildings(CV_SWITCH, "esp_buildings", "1", "Building ESP",
                  "Show buildings");
-CatVar teammates(CV_SWITCH, "esp_teammates", "0", "ESP Teammates",
+static CatVar teammates(CV_SWITCH, "esp_teammates", "0", "ESP Teammates",
                  "Teammate ESP");
-CatVar tank(CV_SWITCH, "esp_show_tank", "1", "Show tank", "Show tanks in mvm");
+static CatVar tank(CV_SWITCH, "esp_show_tank", "1", "Show tank", "Show tanks in mvm");
 // Text Esps
-CatVar show_weapon(CV_SWITCH, "esp_weapon", "0", "Show weapon name",
+static CatVar show_weapon(CV_SWITCH, "esp_weapon", "0", "Show weapon name",
                    "Show which weapon the enemy is using");
-CatVar show_distance(CV_SWITCH, "esp_distance", "1", "Distance ESP",
+static CatVar show_distance(CV_SWITCH, "esp_distance", "1", "Distance ESP",
                      "Show distance to target");
-CatVar show_name(CV_SWITCH, "esp_name", "1", "Name ESP", "Show name");
-CatVar show_class(CV_SWITCH, "esp_class", "1", "Class ESP", "Show class");
-CatVar show_conditions(CV_SWITCH, "esp_conds", "1", "Conditions ESP",
+static CatVar show_name(CV_SWITCH, "esp_name", "1", "Name ESP", "Show name");
+static CatVar show_class(CV_SWITCH, "esp_class", "1", "Class ESP", "Show class");
+static CatVar show_conditions(CV_SWITCH, "esp_conds", "1", "Conditions ESP",
                        "Show conditions");
-CatVar
+static CatVar
     show_ubercharge(CV_SWITCH, "esp_ubercharge", "1", "Ubercharge ESP",
                     "Show ubercharge percentage while players medigun is out");
-CatVar show_bot_id(CV_SWITCH, "esp_followbot_id", "1", "Followbot ESP",
+static CatVar show_bot_id(CV_SWITCH, "esp_followbot_id", "1", "Followbot ESP",
                    "Show followbot ID");
-CatVar powerup_esp(CV_SWITCH, "esp_powerups", "1", "Powerup ESP",
+static CatVar powerup_esp(CV_SWITCH, "esp_powerups", "1", "Powerup ESP",
                    "Shows powerups a player is using");
 // Item esp
-CatVar item_esp(CV_SWITCH, "esp_item", "1", "Item ESP",
+static CatVar item_esp(CV_SWITCH, "esp_item", "1", "Item ESP",
                 "Master Item ESP switch (health packs, etc.)");
-CatVar item_dropped_weapons(CV_SWITCH, "esp_item_weapons", "0",
+static CatVar item_dropped_weapons(CV_SWITCH, "esp_item_weapons", "0",
                             "Dropped weapons", "Show dropped weapons");
-CatVar item_ammo_packs(CV_SWITCH, "esp_item_ammo", "0", "Ammo packs",
+static CatVar item_ammo_packs(CV_SWITCH, "esp_item_ammo", "0", "Ammo packs",
                        "Show ammo packs");
-CatVar item_health_packs(CV_SWITCH, "esp_item_health", "1", "Health packs",
+static CatVar item_health_packs(CV_SWITCH, "esp_item_health", "1", "Health packs",
                          "Show health packs");
-CatVar item_powerups(CV_SWITCH, "esp_item_powerups", "1", "Powerups",
+static CatVar item_powerups(CV_SWITCH, "esp_item_powerups", "1", "Powerups",
                      "Shows powerups in the world");
-CatVar item_money(CV_SWITCH, "esp_money", "1", "MvM money", "Show MvM money");
-CatVar item_money_red(CV_SWITCH, "esp_money_red", "1", "Red MvM money",
+static CatVar item_money(CV_SWITCH, "esp_money", "1", "MvM money", "Show MvM money");
+static CatVar item_money_red(CV_SWITCH, "esp_money_red", "1", "Red MvM money",
                       "Show red MvM money");
-CatVar item_spellbooks(CV_SWITCH, "esp_spellbooks", "1", "Spellbooks",
+static CatVar item_spellbooks(CV_SWITCH, "esp_spellbooks", "1", "Spellbooks",
                        "Spell Books");
-CatVar item_weapon_spawners(CV_SWITCH, "esp_weapon_spawners", "1",
+static CatVar item_weapon_spawners(CV_SWITCH, "esp_weapon_spawners", "1",
                             "Show weapon spawners",
                             "TF2C deathmatch weapon spawners");
-CatVar item_adrenaline(CV_SWITCH, "esp_item_adrenaline", "0", "Show Adrenaline",
+static CatVar item_adrenaline(CV_SWITCH, "esp_item_adrenaline", "0", "Show Adrenaline",
                        "TF2C adrenaline pills");
 // Projectile esp
-CatVar proj_esp(CV_SWITCH, "esp_proj", "1", "Projectile ESP", "Projectile ESP");
-CatEnum proj_esp_enum({ "OFF", "ALL", "CRIT" });
-CatVar proj_rockets(proj_esp_enum, "esp_proj_rockets", "1", "Rockets",
+static CatVar proj_esp(CV_SWITCH, "esp_proj", "1", "Projectile ESP", "Projectile ESP");
+static CatEnum proj_esp_enum({ "OFF", "ALL", "CRIT" });
+static CatVar proj_rockets(proj_esp_enum, "esp_proj_rockets", "1", "Rockets",
                     "Rockets");
-CatVar proj_arrows(proj_esp_enum, "esp_proj_arrows", "1", "Arrows", "Arrows");
-CatVar proj_pipes(proj_esp_enum, "esp_proj_pipes", "1", "Pipes", "Pipebombs");
-CatVar proj_stickies(proj_esp_enum, "esp_proj_stickies", "1", "Stickies",
+static CatVar proj_arrows(proj_esp_enum, "esp_proj_arrows", "1", "Arrows", "Arrows");
+static CatVar proj_pipes(proj_esp_enum, "esp_proj_pipes", "1", "Pipes", "Pipebombs");
+static CatVar proj_stickies(proj_esp_enum, "esp_proj_stickies", "1", "Stickies",
                      "Stickybombs");
-CatVar proj_enemy(CV_SWITCH, "esp_proj_enemy", "1", "Only enemy projectiles",
+static CatVar proj_enemy(CV_SWITCH, "esp_proj_enemy", "1", "Only enemy projectiles",
                   "Don't show friendly projectiles");
 // Debug
-CatVar entity_info(CV_SWITCH, "esp_entity", "0", "Entity ESP",
+static CatVar entity_info(CV_SWITCH, "esp_entity", "0", "Entity ESP",
                    "Show entity info (debug)");
-CatVar entity_model(CV_SWITCH, "esp_model_name", "0", "Model name ESP",
+static CatVar entity_model(CV_SWITCH, "esp_model_name", "0", "Model name ESP",
                     "Model name esp (DEBUG ONLY)");
-CatVar entity_id(CV_SWITCH, "esp_entity_id", "1", "Entity ID",
+static CatVar entity_id(CV_SWITCH, "esp_entity_id", "1", "Entity ID",
                  "Used with Entity ESP. Shows entityID");
 
 // CatVar draw_hitbox(CV_SWITCH, "esp_hitbox", "1", "Draw Hitbox");
diff --git a/src/hacks/FollowBot.cpp b/src/hacks/FollowBot.cpp
index ad407f43..1aa5415a 100644
--- a/src/hacks/FollowBot.cpp
+++ b/src/hacks/FollowBot.cpp
@@ -32,13 +32,13 @@ static CatVar follow_activation(CV_INT, "fb_activation", "175",
                                 "followbot will pick them as a target");
 CatVar follow_steam(CV_INT, "fb_steam", "0", "Follow Steam Id",
                     "Set a steam id to let followbot prioritize players");
-CatVar mimic_slot(CV_SWITCH, "fb_mimic_slot", "0", "Mimic weapon slot",
+static CatVar mimic_slot(CV_SWITCH, "fb_mimic_slot", "0", "Mimic weapon slot",
                   "Mimic follow target's weapon slot");
-CatVar always_medigun(CV_SWITCH, "fb_always_medigun", "0", "Always Medigun",
+static CatVar always_medigun(CV_SWITCH, "fb_always_medigun", "0", "Always Medigun",
                       "Always use medigun");
-CatVar sync_taunt(CV_SWITCH, "fb_sync_taunt", "0", "Synced taunt",
+static CatVar sync_taunt(CV_SWITCH, "fb_sync_taunt", "0", "Synced taunt",
                   "Taunt when follow target does");
-CatVar change(CV_SWITCH, "fb_switch", "1", "Change followbot target",
+static CatVar change(CV_SWITCH, "fb_switch", "1", "Change followbot target",
               "Always change roaming target when possible");
 // Something to store breadcrumbs created by followed players
 static std::vector<Vector> breadcrumbs;
diff --git a/src/hacks/Killstreak.cpp b/src/hacks/Killstreak.cpp
index 0419f27b..8d520f38 100644
--- a/src/hacks/Killstreak.cpp
+++ b/src/hacks/Killstreak.cpp
@@ -15,7 +15,7 @@ namespace tf2
 namespace killstreak
 {
 
-CatVar enabled(CV_SWITCH, "killstreak", "0",
+static CatVar enabled(CV_SWITCH, "killstreak", "0",
                "Enable killstreaks on all weapons");
 
 int killstreak{ 0 };
diff --git a/src/hacks/LagExploit.cpp b/src/hacks/LagExploit.cpp
index 071cf99c..1ca3cc0b 100644
--- a/src/hacks/LagExploit.cpp
+++ b/src/hacks/LagExploit.cpp
@@ -16,43 +16,43 @@ namespace shared
 namespace lagexploit
 {
 
-CatVar toggle(CV_SWITCH, "se_toggle", "0", "toggle", "Toggle sequence exploit");
-CatVar shoot(CV_SWITCH, "se_shoot", "0", "Instant revvup/shoot",
+static CatVar toggle(CV_SWITCH, "se_toggle", "0", "toggle", "Toggle sequence exploit");
+static CatVar shoot(CV_SWITCH, "se_shoot", "0", "Instant revvup/shoot",
              "Instant revvup/shoot two shots at once");
 
 // SHOUTOUTS TO BLACKFIRE
-CatVar doom(CV_SWITCH, "se_doom", "0", "Shoot 2+ shots at once",
+static CatVar doom(CV_SWITCH, "se_doom", "0", "Shoot 2+ shots at once",
             "See Center string on activation.");
-CatVar piss(CV_SWITCH, "se_piss", "0", "Piss", "Spam Jarate");
-CatVar razorback(CV_SWITCH, "se_antirazorback", "0", "Anti-Razorback",
+static CatVar piss(CV_SWITCH, "se_piss", "0", "Piss", "Spam Jarate");
+static CatVar razorback(CV_SWITCH, "se_antirazorback", "0", "Anti-Razorback",
                  "Stab through razorbacks");
-CatVar stickyspam(CV_SWITCH, "se_stickyspam", "0", "Sticky spam",
+static CatVar stickyspam(CV_SWITCH, "se_stickyspam", "0", "Sticky spam",
                   "Allows Spam of stickies simply by holding Mouse1.");
-CatVar infinitecharge(CV_SWITCH, "se_infinite_charge", "0",
+static CatVar infinitecharge(CV_SWITCH, "se_infinite_charge", "0",
                       "Infinite sticky charge",
                       "Infinitely charge stickies, (can be used for sniping "
                       "and or b1g dmg using the quickiebomb launcher)");
-CatVar cloak(CV_SWITCH, "se_cloak", "0", "Instant decloak/cloak", "");
-CatVar cap(CV_SWITCH, "se_cap", "0", "Auto instant cap", "");
-CatVar cart(CV_SWITCH, "se_cart", "0", "Farm cart points",
+static CatVar cloak(CV_SWITCH, "se_cloak", "0", "Instant decloak/cloak", "");
+static CatVar cap(CV_SWITCH, "se_cap", "0", "Auto instant cap", "");
+static CatVar cart(CV_SWITCH, "se_cart", "0", "Farm cart points",
             "Automatically farm points by touching "
             "the cart (only works on attacking "
             "team)");
-CatVar instant_weapon_switch(CV_SWITCH, "se_switch", "0",
+static CatVar instant_weapon_switch(CV_SWITCH, "se_switch", "0",
                              "Instant weapon switch", "");
-CatVar key(CV_KEY, "se_key", "0", "Sequence exploit key");
-CatVar weaponswitch(CV_KEY, "se_switch_key", "0",
+static CatVar key(CV_KEY, "se_key", "0", "Sequence exploit key");
+static CatVar weaponswitch(CV_KEY, "se_switch_key", "0",
                     "Switch spam key (for gru) key");
-CatVar delay1(CV_INT, "se_switch_delay1", "0",
+static CatVar delay1(CV_INT, "se_switch_delay1", "0",
               "Delay before switching to melee");
-CatVar delay2(CV_INT, "se_switch_delay2", "0",
+static CatVar delay2(CV_INT, "se_switch_delay2", "0",
               "Delay before switching to Primary");
-CatVar master_switch(CV_SWITCH, "se_master", "1", "Enable sequence exploit",
+static CatVar master_switch(CV_SWITCH, "se_master", "1", "Enable sequence exploit",
                      "Master switch for the sequence exploit\nDisabling this "
                      "disables everything else that uses it");
-CatVar value(CV_INT, "se_value", "900", "Sequence exploit value",
+static CatVar value(CV_INT, "se_value", "900", "Sequence exploit value",
              "Value of user cmds to spam with");
-CatVar cap_range(CV_FLOAT, "se_cap_range", "200.0f", "Autocap range",
+static CatVar cap_range(CV_FLOAT, "se_cap_range", "200.0f", "Autocap range",
                  "Autocap range, increase if you notice that you only lagy "
                  "once you are already in the cap zone");
 CatCommand do_lagexploit("se_do", "Sequence exploit (for use in scripts)",
@@ -380,12 +380,19 @@ void CreateMove()
             }
         }
     }
+    static int charge = 0;
     if (g_pLocalPlayer->bAttackLastTick && infinitecharge &&
         g_pLocalPlayer->weapon()->m_iClassID ==
             (CL_CLASS(CTFPipebombLauncher)) &&
         (g_pUserCmd->buttons & IN_ATTACK) &&
         CE_BYTE(LOCAL_W, netvar.m_flChargeLevel))
-        amount = (int) value;
+    {
+        charge++;
+        if (charge > 5)
+            amount = (int) value;
+    }
+    else if (!(g_pUserCmd->buttons & IN_ATTACK))
+        charge = 0;
     if (instant_weapon_switch && not HasCondition<TFCond_Cloaked>(LOCAL_E))
     {
         if (lastwep != g_pLocalPlayer->weapon()->m_iClassID)
diff --git a/src/hacks/Misc.cpp b/src/hacks/Misc.cpp
index 1ada1975..e04d0ead 100644
--- a/src/hacks/Misc.cpp
+++ b/src/hacks/Misc.cpp
@@ -25,36 +25,36 @@ namespace shared
 namespace misc
 {
 
-CatVar debug_info(CV_SWITCH, "debug_info", "0", "Debug info",
+static CatVar debug_info(CV_SWITCH, "debug_info", "0", "Debug info",
                   "Shows some debug info in-game");
-CatVar flashlight_spam(CV_SWITCH, "flashlight", "0", "Flashlight spam",
+static CatVar flashlight_spam(CV_SWITCH, "flashlight", "0", "Flashlight spam",
                        "HL2DM flashlight spam");
-CatVar auto_balance_spam(CV_SWITCH, "request_balance_spam", "0",
+static CatVar auto_balance_spam(CV_SWITCH, "request_balance_spam", "0",
                          "Inf Auto Balance Spam",
                          "Use to send a autobalance request to the server that "
                          "doesnt prevent you from using it again\nCredits to "
                          "Blackfire");
-CatVar anti_afk(CV_SWITCH, "anti_afk", "0", "Anti-AFK",
+static CatVar anti_afk(CV_SWITCH, "anti_afk", "0", "Anti-AFK",
                 "Sends random commands to prevent being kicked from server");
-CatVar auto_strafe(CV_SWITCH, "auto_strafe", "0", "Auto-Strafe",
+static CatVar auto_strafe(CV_SWITCH, "auto_strafe", "0", "Auto-Strafe",
                    "Automaticly airstrafes for you.");
-CatVar render_zoomed(CV_SWITCH, "render_zoomed", "0",
+static CatVar render_zoomed(CV_SWITCH, "render_zoomed", "0",
                      "Render model when zoomed-in",
                      "Renders player model while being zoomed in as Sniper");
-CatVar nopush_enabled(CV_SWITCH, "nopush_enabled", "0", "No Push",
+static CatVar nopush_enabled(CV_SWITCH, "nopush_enabled", "0", "No Push",
                       "Prevents other players from pushing you around.");
 
-CatVar no_homo(CV_SWITCH, "no_homo", "1", "No Homo", "read if gay");
+static CatVar no_homo(CV_SWITCH, "no_homo", "1", "No Homo", "read if gay");
 // Taunting stuff
-CatVar tauntslide(CV_SWITCH, "tauntslide", "0", "TF2C tauntslide",
+static CatVar tauntslide(CV_SWITCH, "tauntslide", "0", "TF2C tauntslide",
                   "Allows moving and shooting while taunting");
-CatVar tauntslide_tf2(CV_SWITCH, "tauntslide_tf2", "0", "Tauntslide",
+static CatVar tauntslide_tf2(CV_SWITCH, "tauntslide_tf2", "0", "Tauntslide",
                       "Allows free movement while taunting with movable "
                       "taunts\nOnly works in tf2");
-CatVar
+static CatVar
     show_spectators(CV_SWITCH, "show_spectators", "0", "Show spectators",
                     "Show who's spectating you\nonly works in valve servers");
-CatVar god_mode(CV_SWITCH, "godmode", "0", "no description", "no description");
+static CatVar god_mode(CV_SWITCH, "godmode", "0", "no description", "no description");
 void *C_TFPlayer__ShouldDraw_original = nullptr;
 
 bool C_TFPlayer__ShouldDraw_hook(IClientEntity *thisptr)
diff --git a/src/hacks/Noisemaker.cpp b/src/hacks/Noisemaker.cpp
index e08367cb..9eb3a403 100755
--- a/src/hacks/Noisemaker.cpp
+++ b/src/hacks/Noisemaker.cpp
@@ -14,7 +14,7 @@ namespace tf2
 namespace noisemaker
 {
 
-CatVar
+static CatVar
     enabled(CV_SWITCH, "noisemaker", "0", "Noisemaker spam",
             "Spams noisemakers Infinitly\nWorks with limited use noisemakers");
 
diff --git a/src/hacks/Radar.cpp b/src/hacks/Radar.cpp
index 5f22c128..c29d687a 100755
--- a/src/hacks/Radar.cpp
+++ b/src/hacks/Radar.cpp
@@ -20,28 +20,28 @@ std::array<std::array<textures::sprite, 9>, 3> tx_class;
 std::array<textures::sprite, 2> tx_teams;
 std::array<textures::sprite, 2> tx_items;
 
-CatVar size(CV_INT, "radar_size", "300", "Radar size",
+static CatVar size(CV_INT, "radar_size", "300", "Radar size",
             "Defines radar size in pixels");
-CatVar zoom(CV_FLOAT, "radar_zoom", "20", "Radar zoom",
+static CatVar zoom(CV_FLOAT, "radar_zoom", "20", "Radar zoom",
             "Defines radar zoom (1px = Xhu)");
-CatVar healthbar(CV_SWITCH, "radar_health", "1", "Radar healthbar",
+static CatVar healthbar(CV_SWITCH, "radar_health", "1", "Radar healthbar",
                  "Show radar healthbar");
-CatVar enemies_over_teammates(
+static CatVar enemies_over_teammates(
     CV_SWITCH, "radar_enemies_top", "1", "Show enemies on top",
     "If true, radar will render enemies on top of teammates");
-CatVar icon_size(CV_INT, "radar_icon_size", "20", "Icon size",
+static CatVar icon_size(CV_INT, "radar_icon_size", "20", "Icon size",
                  "Defines radar icon size");
-CatVar radar_enabled(CV_SWITCH, "radar", "0", "Enable", "Enable Radar");
-CatVar radar_x(CV_INT, "radar_x", "100", "Radar X",
+static CatVar radar_enabled(CV_SWITCH, "radar", "0", "Enable", "Enable Radar");
+static CatVar radar_x(CV_INT, "radar_x", "100", "Radar X",
                "Defines radar position (X)");
-CatVar radar_y(CV_INT, "radar_y", "100", "Radar Y",
+static CatVar radar_y(CV_INT, "radar_y", "100", "Radar Y",
                "Defines radar position (Y)");
-CatVar use_icons(CV_SWITCH, "radar_icons", "1", "Use Icons",
+static CatVar use_icons(CV_SWITCH, "radar_icons", "1", "Use Icons",
                  "Radar will use class icons instead of class portraits");
-CatVar show_teammates(CV_SWITCH, "radar_teammates", "1", "Show Teammates");
-CatVar show_healthpacks(CV_SWITCH, "radar_healthpacks", "1",
+static CatVar show_teammates(CV_SWITCH, "radar_teammates", "1", "Show Teammates");
+static CatVar show_healthpacks(CV_SWITCH, "radar_healthpacks", "1",
                         "Show Healthpacks");
-CatVar show_ammopacks(CV_SWITCH, "radar_ammopacks", "1", "Show Ammopacks");
+static CatVar show_ammopacks(CV_SWITCH, "radar_ammopacks", "1", "Show Ammopacks");
 
 void Init()
 {
diff --git a/src/hacks/Spam.cpp b/src/hacks/Spam.cpp
index 5e360e50..b2aa5c35 100755
--- a/src/hacks/Spam.cpp
+++ b/src/hacks/Spam.cpp
@@ -20,20 +20,20 @@ CatVar spam_source(spam_enum, "spam", "0", "Chat Spam",
                    "Defines source of spam lines. CUSTOM spam file must be set "
                    "in cat_spam_file and loaded with cat_spam_reload (Use "
                    "console!)");
-CatVar random_order(CV_SWITCH, "spam_random", "0", "Random Order");
-CatVar filename(CV_STRING, "spam_file", "spam.txt", "Spam file",
+static CatVar random_order(CV_SWITCH, "spam_random", "0", "Random Order");
+static CatVar filename(CV_STRING, "spam_file", "spam.txt", "Spam file",
                 "Spam file name. Each line should be no longer than 100 "
                 "characters, file must be located in cathook data folder");
 CatCommand reload("spam_reload", "Reload spam file", Reload);
-CatVar spam_delay(CV_INT, "spam_delay", "800", "Spam delay",
+static CatVar spam_delay(CV_INT, "spam_delay", "800", "Spam delay",
                   "Delay between spam messages (in ms)", 0.0f, 8000.0f);
 
 static CatEnum voicecommand_enum({ "DISABLED", "RANDOM", "MEDIC", "THANKS",
                                    "NICE SHOT", "CHEERS", "JEERS" });
-CatVar voicecommand_spam(voicecommand_enum, "spam_voicecommand", "0",
+static CatVar voicecommand_spam(voicecommand_enum, "spam_voicecommand", "0",
                          "Voice Command Spam", "Spams tf voice commands");
 
-CatVar teamname_spam(CV_SWITCH, "spam_teamname", "0", "Teamname Spam",
+static CatVar teamname_spam(CV_SWITCH, "spam_teamname", "0", "Teamname Spam",
                      "Spam changes the tournament name");
 
 std::chrono::time_point<std::chrono::system_clock> last_spam_point{};
diff --git a/src/hacks/SpyAlert.cpp b/src/hacks/SpyAlert.cpp
index f9e836f2..2ad8d5ad 100755
--- a/src/hacks/SpyAlert.cpp
+++ b/src/hacks/SpyAlert.cpp
@@ -14,17 +14,17 @@ namespace tf
 namespace spyalert
 {
 
-CatVar enabled(CV_SWITCH, "spyalert_enabled", "0", "Enable",
+static CatVar enabled(CV_SWITCH, "spyalert_enabled", "0", "Enable",
                "Master SpyAlert switch");
-CatVar distance_warning(CV_FLOAT, "spyalert_warning", "500.0",
+static CatVar distance_warning(CV_FLOAT, "spyalert_warning", "500.0",
                         "Warning distance",
                         "Distance where yellow warning shows");
-CatVar distance_backstab(CV_FLOAT, "spyalert_backstab", "200.0",
+static CatVar distance_backstab(CV_FLOAT, "spyalert_backstab", "200.0",
                          "Backstab distance",
                          "Distance where red warning shows");
-CatVar sound_alerts(CV_SWITCH, "spyalert_sound", "1", "Sound Alerts",
+static CatVar sound_alerts(CV_SWITCH, "spyalert_sound", "1", "Sound Alerts",
                     "Demoman yells spy when a spy is within distance");
-CatVar sound_alert_interval(CV_FLOAT, "spyalert_interval", "3",
+static CatVar sound_alert_interval(CV_FLOAT, "spyalert_interval", "3",
                             "Alert Interval", "Sound alert interval");
 
 bool warning_triggered  = false;
diff --git a/src/hacks/Walkbot.cpp b/src/hacks/Walkbot.cpp
index ba6f8fe2..ab75f510 100644
--- a/src/hacks/Walkbot.cpp
+++ b/src/hacks/Walkbot.cpp
@@ -448,26 +448,26 @@ index_t CreateNode(const Vector &xyz)
     return node;
 }
 
-CatVar active_recording(CV_SWITCH, "wb_recording", "0", "Do recording",
+static CatVar active_recording(CV_SWITCH, "wb_recording", "0", "Do recording",
                         "Use BindToggle with this");
-CatVar draw_info(CV_SWITCH, "wb_info", "1", "Walkbot info");
-CatVar draw_path(CV_SWITCH, "wb_path", "1", "Walkbot path");
-CatVar draw_nodes(CV_SWITCH, "wb_nodes", "1", "Walkbot nodes");
-CatVar draw_indices(CV_SWITCH, "wb_indices", "0", "Node indices");
-CatVar free_move(CV_SWITCH, "wb_freemove", "1", "Allow free movement",
+static CatVar draw_info(CV_SWITCH, "wb_info", "1", "Walkbot info");
+static CatVar draw_path(CV_SWITCH, "wb_path", "1", "Walkbot path");
+static CatVar draw_nodes(CV_SWITCH, "wb_nodes", "1", "Walkbot nodes");
+static CatVar draw_indices(CV_SWITCH, "wb_indices", "0", "Node indices");
+static CatVar free_move(CV_SWITCH, "wb_freemove", "1", "Allow free movement",
                  "Allow free movement while pressing movement keys");
-CatVar spawn_distance(CV_FLOAT, "wb_node_spawn_distance", "54",
+static CatVar spawn_distance(CV_FLOAT, "wb_node_spawn_distance", "54",
                       "Node spawn distance");
-CatVar max_distance(CV_FLOAT, "wb_replay_max_distance", "100",
+static CatVar max_distance(CV_FLOAT, "wb_replay_max_distance", "100",
                     "Max distance to node when replaying");
-CatVar reach_distance(
+static CatVar reach_distance(
     CV_FLOAT, "wb_replay_reach_distance", "32",
     "Distance where bot can be considered 'stepping' on the node");
-CatVar draw_connection_flags(CV_SWITCH, "wb_connection_flags", "1",
+static CatVar draw_connection_flags(CV_SWITCH, "wb_connection_flags", "1",
                              "Connection flags");
-CatVar force_slot(CV_INT, "wb_force_slot", "1", "Force slot",
+static CatVar force_slot(CV_INT, "wb_force_slot", "1", "Force slot",
                   "Walkbot will always select weapon in this slot");
-CatVar leave_if_empty(CV_SWITCH, "wb_leave_if_empty", "0",
+static CatVar leave_if_empty(CV_SWITCH, "wb_leave_if_empty", "0",
                       "Leave if no walkbot",
                       "Leave game if there is no walkbot map");
 
diff --git a/src/helpers.cpp b/src/helpers.cpp
index 6b6cde40..985079a2 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -426,7 +426,7 @@ bool IsEntityVisible(CachedEntity *entity, int hb)
     }
 }
 
-CatVar tcm(CV_SWITCH, "debug_tcm", "1", "TCM");
+static CatVar tcm(CV_SWITCH, "debug_tcm", "1", "TCM");
 
 std::mutex trace_lock;
 bool IsEntityVectorVisible(CachedEntity *entity, Vector endpos)
diff --git a/src/hitrate.cpp b/src/hitrate.cpp
index a8574dd4..3e461fd1 100755
--- a/src/hitrate.cpp
+++ b/src/hitrate.cpp
@@ -18,7 +18,7 @@ int count_shots{ 0 };
 int count_hits{ 0 };
 int count_hits_head{ 0 };
 
-CatVar hitrate_check(CV_SWITCH, "hitrate", "1", "Monitor hitrate");
+static CatVar hitrate_check(CV_SWITCH, "hitrate", "1", "Monitor hitrate");
 
 std::vector<std::chrono::time_point<std::chrono::high_resolution_clock>>
     shots{};
diff --git a/src/hooks/GetFriendPersonaName.cpp b/src/hooks/GetFriendPersonaName.cpp
index 55601454..ba062afe 100644
--- a/src/hooks/GetFriendPersonaName.cpp
+++ b/src/hooks/GetFriendPersonaName.cpp
@@ -7,8 +7,8 @@
 
 static CatVar ipc_name(CV_STRING, "name_ipc", "", "IPC Name");
 
-CatEnum namesteal_enum({ "OFF", "PASSIVE", "ACTIVE" });
-CatVar namesteal(namesteal_enum, "name_stealer", "0", "Name Stealer",
+static CatEnum namesteal_enum({ "OFF", "PASSIVE", "ACTIVE" });
+static CatVar namesteal(namesteal_enum, "name_stealer", "0", "Name Stealer",
                  "Attemt to steal your teammates names. Usefull for avoiding "
                  "kicks\nPassive only changes when the name stolen is no "
                  "longer the best name to use\nActive Attemps to change the "
diff --git a/src/hooks/LevelInit.cpp b/src/hooks/LevelInit.cpp
index dc1bec0e..04f59fc2 100644
--- a/src/hooks/LevelInit.cpp
+++ b/src/hooks/LevelInit.cpp
@@ -37,7 +37,7 @@ const char *skynum[] = { "sky_tf2_04",
                          "sky_pyroland_01",
                          "sky_pyroland_02",
                          "sky_pyroland_03" };
-CatEnum skys({ "sky_tf2_04",
+static CatEnum skys({ "sky_tf2_04",
                "sky_upward",
                "sky_dustbowl_01",
                "sky_goldrush_01",
diff --git a/src/hooks/visual/FrameStageNotify.cpp b/src/hooks/visual/FrameStageNotify.cpp
index c949b481..3157a02b 100644
--- a/src/hooks/visual/FrameStageNotify.cpp
+++ b/src/hooks/visual/FrameStageNotify.cpp
@@ -7,8 +7,8 @@
 #include <hacks/hacklist.hpp>
 #include "HookedMethods.hpp"
 
-CatVar resolver(CV_SWITCH, "resolver", "0", "Resolve angles");
-CatVar nightmode(CV_SWITCH, "nightmode", "0", "Enable nightmode", "");
+static CatVar resolver(CV_SWITCH, "resolver", "0", "Resolve angles");
+static CatVar nightmode(CV_SWITCH, "nightmode", "0", "Enable nightmode", "");
 
 namespace hooked_methods
 {
diff --git a/src/hooks/visual/OverrideView.cpp b/src/hooks/visual/OverrideView.cpp
index 42c6000e..3b453d5b 100644
--- a/src/hooks/visual/OverrideView.cpp
+++ b/src/hooks/visual/OverrideView.cpp
@@ -6,13 +6,13 @@
 #include <MiscTemporary.hpp>
 #include "HookedMethods.hpp"
 
-CatVar override_fov_zoomed(CV_FLOAT, "fov_zoomed", "0", "FOV override (zoomed)",
+static CatVar override_fov_zoomed(CV_FLOAT, "fov_zoomed", "0", "FOV override (zoomed)",
                            "Overrides FOV with this value when zoomed in "
                            "(default FOV when zoomed is 20)");
-CatVar override_fov(CV_FLOAT, "fov", "0", "FOV override",
+static CatVar override_fov(CV_FLOAT, "fov", "0", "FOV override",
                     "Overrides FOV with this value");
 
-CatVar freecam(CV_KEY, "debug_freecam", "0", "Freecam");
+static CatVar freecam(CV_KEY, "debug_freecam", "0", "Freecam");
 
 namespace hooked_methods
 {
diff --git a/src/hooks/visual/PaintTraverse.cpp b/src/hooks/visual/PaintTraverse.cpp
index 220c5f9c..56ad407a 100644
--- a/src/hooks/visual/PaintTraverse.cpp
+++ b/src/hooks/visual/PaintTraverse.cpp
@@ -12,14 +12,14 @@ CatVar disable_visuals(CV_SWITCH, "no_visuals", "0", "Disable ALL drawing",
                        "Completely hides cathook");
 CatVar no_zoom(CV_SWITCH, "no_zoom", "0", "Disable scope",
                "Disables black scope overlay");
-CatVar pure_bypass(CV_SWITCH, "pure_bypass", "0", "Pure Bypass",
+static CatVar pure_bypass(CV_SWITCH, "pure_bypass", "0", "Pure Bypass",
                    "Bypass sv_pure");
 void *pure_orig  = nullptr;
 void **pure_addr = nullptr;
 
-CatEnum software_cursor_enum({ "KEEP", "ALWAYS", "NEVER", "MENU ON",
+static CatEnum software_cursor_enum({ "KEEP", "ALWAYS", "NEVER", "MENU ON",
                                "MENU OFF" });
-CatVar
+static CatVar
     software_cursor_mode(software_cursor_enum, "software_cursor_mode", "0",
                          "Software cursor",
                          "Try to change this and see what works best for you");
@@ -161,4 +161,4 @@ DEFINE_HOOKED_METHOD(PaintTraverse, void, vgui::IPanel *this_,
 #endif
     draw::UpdateWTS();
 }
-}
\ No newline at end of file
+}
diff --git a/src/hooks/visual/SDL_GL_SwapWindow.cpp b/src/hooks/visual/SDL_GL_SwapWindow.cpp
index 5782c204..8546305b 100644
--- a/src/hooks/visual/SDL_GL_SwapWindow.cpp
+++ b/src/hooks/visual/SDL_GL_SwapWindow.cpp
@@ -3,7 +3,7 @@
   Copyright (c) 2018 nullworks. All rights reserved.
 */
 
-#include <SDL_syswm.h>
+#include <SDL2/SDL_syswm.h>
 #include <MiscTemporary.hpp>
 #include <visual/SDLHooks.hpp>
 #include "HookedMethods.hpp"
@@ -60,4 +60,4 @@ DEFINE_HOOKED_METHOD(SDL_GL_SwapWindow, void, SDL_Window *window)
         // glXSwapBuffers(wminfo.info.x11.display, wminfo.info.x11.window);
     }
 }
-}
\ No newline at end of file
+}
diff --git a/src/prediction.cpp b/src/prediction.cpp
index c01e0405..726e4898 100755
--- a/src/prediction.cpp
+++ b/src/prediction.cpp
@@ -251,10 +251,10 @@ Vector ProjectilePrediction_Engine(CachedEntity *ent, int hb, float speed,
     return result;
 }
 
-CatVar debug_pp_extrapolate(
+static CatVar debug_pp_extrapolate(
     CV_SWITCH, "debug_pp_extrapolate", "0",
     "Extrapolate entity position when predicting projectiles");
-CatVar debug_pp_rockettimeping(CV_SWITCH, "debug_pp_rocket_time_ping", "0",
+static CatVar debug_pp_rockettimeping(CV_SWITCH, "debug_pp_rocket_time_ping", "0",
                                "Compensate for ping in pp");
 
 Vector ProjectilePrediction(CachedEntity *ent, int hb, float speed,
diff --git a/src/visual/EffectChams.cpp b/src/visual/EffectChams.cpp
index 0ca807bd..414683f8 100644
--- a/src/visual/EffectChams.cpp
+++ b/src/visual/EffectChams.cpp
@@ -15,7 +15,7 @@
 namespace effect_chams
 {
 
-CatVar enable(CV_SWITCH, "chams_enable", "0", "Enable", "Main chams switch");
+static CatVar enable(CV_SWITCH, "chams_enable", "0", "Enable", "Main chams switch");
 static CatVar flat(CV_SWITCH, "chams_flat", "0", "Flat",
                    "Makes chams brighter and more full");
 static CatVar health(CV_SWITCH, "chams_health", "0", "Health",
diff --git a/src/visual/EffectGlow.cpp b/src/visual/EffectGlow.cpp
index 91215334..b4065515 100755
--- a/src/visual/EffectGlow.cpp
+++ b/src/visual/EffectGlow.cpp
@@ -30,7 +30,7 @@ CScreenSpaceEffectRegistration::CScreenSpaceEffectRegistration(
 namespace effect_glow
 {
 
-CatVar enable(CV_SWITCH, "glow_enable", "0", "Enable", "Main glow switch");
+static CatVar enable(CV_SWITCH, "glow_enable", "0", "Enable", "Main glow switch");
 static CatVar health(CV_SWITCH, "glow_health", "0", "Health",
                      "Change glow color based on their health");
 static CatVar teammates(CV_SWITCH, "glow_teammates", "0", "Teammates",
diff --git a/src/visual/colors.cpp b/src/visual/colors.cpp
index 75ab440e..9ba3289d 100755
--- a/src/visual/colors.cpp
+++ b/src/visual/colors.cpp
@@ -7,18 +7,18 @@
 
 #include "common.hpp"
 
-CatVar user_red_blue(CV_INT, "esp_color_red_b", "0", "Red Team: Blue",
+static CatVar user_red_blue(CV_INT, "esp_color_red_b", "0", "Red Team: Blue",
                      "Blue color for red team", 255);
-CatVar user_red_green(CV_INT, "esp_color_red_g", "0", "Red Team: Green",
+static CatVar user_red_green(CV_INT, "esp_color_red_g", "0", "Red Team: Green",
                       "Green color for red team", 255);
-CatVar user_red_red(CV_INT, "esp_color_red_r", "0", "Red Team: Red",
+static CatVar user_red_red(CV_INT, "esp_color_red_r", "0", "Red Team: Red",
                     "Red color for red team", 255);
 
-CatVar user_blue_blue(CV_INT, "esp_color_blue_b", "0", "Blue Team: Blue",
+static CatVar user_blue_blue(CV_INT, "esp_color_blue_b", "0", "Blue Team: Blue",
                       "Blue color for blue team", 255);
-CatVar user_blue_green(CV_INT, "esp_color_blue_g", "0", "Blue Team: Green",
+static CatVar user_blue_green(CV_INT, "esp_color_blue_g", "0", "Blue Team: Green",
                        "Green color for blue team", 255);
-CatVar user_blue_red(CV_INT, "esp_color_blue_r", "0", "Blue Team: Red",
+static CatVar user_blue_red(CV_INT, "esp_color_blue_r", "0", "Blue Team: Red",
                      "Red color for blue team", 255);
 
 rgba_t colors::EntityF(CachedEntity *ent)
diff --git a/src/visual/drawmgr.cpp b/src/visual/drawmgr.cpp
index af68de7b..68dabfaf 100644
--- a/src/visual/drawmgr.cpp
+++ b/src/visual/drawmgr.cpp
@@ -49,11 +49,11 @@ void BeginCheatVisuals()
 
 std::mutex drawing_mutex;
 
-CatVar info_text(CV_SWITCH, "info", "1", "Show info",
+static CatVar info_text(CV_SWITCH, "info", "1", "Show info",
                  "Show cathook version in top left corner");
-CatVar info_text_min(CV_SWITCH, "info_min", "0", "Show minimal info",
+static CatVar info_text_min(CV_SWITCH, "info_min", "0", "Show minimal info",
                      "Only show cathook title in top left corner");
-CatVar enable_logo(CV_SWITCH, "nullcore_mode_logo", "1",
+static CatVar enable_logo(CV_SWITCH, "nullcore_mode_logo", "1",
                    "Enable Nullcore watermark", "");
 
 void DrawCheatVisuals()
diff --git a/src/visual/fidgetspinner.cpp b/src/visual/fidgetspinner.cpp
index 6739a0ac..df9a599a 100644
--- a/src/visual/fidgetspinner.cpp
+++ b/src/visual/fidgetspinner.cpp
@@ -12,7 +12,7 @@
 
 #ifndef FEATURE_FIDGET_SPINNER_ENABLED
 
-CatVar enable_spinner(CV_SWITCH, "fidgetspinner", "0", "Fidget Spinner",
+static CatVar enable_spinner(CV_SWITCH, "fidgetspinner", "0", "Fidget Spinner",
                       "Part of Cathook Autism Awareness program");
 CatVar v9mode(CV_SWITCH, "nullcore_mode", "0", "Nullcore mode",
               "Part of Cathook Autism Awareness program");
@@ -51,14 +51,14 @@ void InitSpinner()
     g_IGameEventManager->AddListener(&listener, false);
 }
 
-CatVar spinner_speed_cap(CV_FLOAT, "fidgetspinner_speed_cap", "30",
+static CatVar spinner_speed_cap(CV_FLOAT, "fidgetspinner_speed_cap", "30",
                          "Speed cap");
-CatVar spinner_speed_scale(CV_FLOAT, "fidgetspinner_speed_scale", "0.03",
+static CatVar spinner_speed_scale(CV_FLOAT, "fidgetspinner_speed_scale", "0.03",
                            "Speed scale");
-CatVar spinner_decay_speed(CV_FLOAT, "fidgetspinner_decay_speed", "0.1",
+static CatVar spinner_decay_speed(CV_FLOAT, "fidgetspinner_decay_speed", "0.1",
                            "Decay speed");
-CatVar spinner_scale(CV_FLOAT, "fidgetspinner_scale", "32", "Spinner Size");
-CatVar spinner_min_speed(CV_FLOAT, "fidgetspinner_min_speed", "2",
+static CatVar spinner_scale(CV_FLOAT, "fidgetspinner_scale", "32", "Spinner Size");
+static CatVar spinner_min_speed(CV_FLOAT, "fidgetspinner_min_speed", "2",
                          "Spinner Min Speed");
 
 draw_api::texture_handle_t text{ GLEZ_TEXTURE_INVALID };
diff --git a/src/visual/menu/compatibilitylayer.cpp b/src/visual/menu/compatibilitylayer.cpp
index b6a4300b..39e8c26d 100755
--- a/src/visual/menu/compatibilitylayer.cpp
+++ b/src/visual/menu/compatibilitylayer.cpp
@@ -8,7 +8,6 @@ const std::vector<std::string> fonts = { "Tahoma Bold",  "Tahoma",
                                          "TF2 Build",    "Verdana",
                                          "Verdana Bold", "Arial",
                                          "Courier New",  "Ubuntu Mono Bold" };
-CatEnum family_enum(fonts);
 }
 
 int colorsint::FromHSL(float h, float s, float v)
diff --git a/src/visual/menu/ncc/List.cpp b/src/visual/menu/ncc/List.cpp
index deccf5b5..0d473258 100755
--- a/src/visual/menu/ncc/List.cpp
+++ b/src/visual/menu/ncc/List.cpp
@@ -93,7 +93,7 @@ bool List::ShouldClose()
     return nullptr;
 }*/
 
-CatVar *FindCatVar(const std::string name)
+static CatVar *FindCatVar(const std::string name)
 {
     for (auto var : CatVarList())
     {
diff --git a/src/visual/menu/ncc/Menu.cpp b/src/visual/menu/ncc/Menu.cpp
index 9d26dd5b..2c05163a 100644
--- a/src/visual/menu/ncc/Menu.cpp
+++ b/src/visual/menu/ncc/Menu.cpp
@@ -22,9 +22,9 @@ unsigned long font_item  = 0;
 
 CatVar scale(CV_FLOAT, "gui_ncc_scale", "1", "NCC GUI Scale",
              "Defines scale of NCC gui", 0.5f, 4.0f);
-CatVar font_family(fonts::family_enum, "gui_ncc_font_family", "3",
+static CatVar font_family(fonts::family_enum, "gui_ncc_font_family", "3",
                    "NCC Font Family", "Defines font family for NCC menu");
-CatVar font_title_family(fonts::family_enum, "gui_ncc_font_title_family", "4",
+static CatVar font_title_family(fonts::family_enum, "gui_ncc_font_title_family", "4",
                          "NCC Title Family",
                          "Defines font family for NCC menu titles");