diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp
index b818e1a95fcc9..d46c732ef5053 100644
--- a/src/activity_handlers.cpp
+++ b/src/activity_handlers.cpp
@@ -200,6 +200,9 @@ static const activity_id ACT_WAIT_WEATHER( "ACT_WAIT_WEATHER" );
 static const activity_id ACT_WASH( "ACT_WASH" );
 static const activity_id ACT_WEAR( "ACT_WEAR" );
 
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_controlled( "controlled" );
+
 static const zone_type_id zone_type_FARM_PLOT( "FARM_PLOT" );
 
 static const skill_id skill_computer( "computer" );
diff --git a/src/avatar.cpp b/src/avatar.cpp
index c74628a7b56ca..2dbcc0b2bbdb8 100644
--- a/src/avatar.cpp
+++ b/src/avatar.cpp
@@ -72,6 +72,9 @@ static const bionic_id bio_eye_optic( "bio_eye_optic" );
 static const bionic_id bio_memory( "bio_memory" );
 static const bionic_id bio_watch( "bio_watch" );
 
+static const efftype_id effect_contacts( "contacts" );
+static const efftype_id effect_depressants( "depressants" );
+
 class JsonIn;
 class JsonOut;
 
diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
index ab143c2ad0ab5..0ce69327f1627 100644
--- a/src/avatar_action.cpp
+++ b/src/avatar_action.cpp
@@ -52,6 +52,8 @@
 
 static const activity_id ACT_AIM( "ACT_AIM" );
 
+static const efftype_id effect_amigara( "amigara" );
+
 static const skill_id skill_swimming( "swimming" );
 
 static const bionic_id bio_ups( "bio_ups" );
diff --git a/src/ballistics.cpp b/src/ballistics.cpp
index 5542ad775570d..73871f2347869 100644
--- a/src/ballistics.cpp
+++ b/src/ballistics.cpp
@@ -35,6 +35,8 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_bounced( "bounced" );
+
 static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
 {
     const auto &proj = attack.proj;
diff --git a/src/bionics.cpp b/src/bionics.cpp
index 9a6c8fdeb6926..a46f7d675c6e9 100644
--- a/src/bionics.cpp
+++ b/src/bionics.cpp
@@ -70,6 +70,18 @@
 
 static const activity_id ACT_OPERATION( "ACT_OPERATION" );
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_adrenaline_mycus( "adrenaline_mycus" );
+static const efftype_id effect_assisted( "assisted" );
+static const efftype_id effect_asthma( "asthma" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_bloodworms( "bloodworms" );
+static const efftype_id effect_brainworms( "brainworms" );
+static const efftype_id effect_cig( "cig" );
+static const efftype_id effect_datura( "datura" );
+static const efftype_id effect_dermatik( "dermatik" );
+static const efftype_id effect_drunk( "drunk" );
+
 static const itype_id fuel_type_battery( "battery" );
 static const itype_id fuel_type_sun_light( "sunlight" );
 static const itype_id fuel_type_wind( "wind" );
diff --git a/src/cata_string_consts.h b/src/cata_string_consts.h
index bf4167fc72301..076a39c6b79d3 100644
--- a/src/cata_string_consts.h
+++ b/src/cata_string_consts.h
@@ -4,58 +4,6 @@
 
 #include "type_id.h"
 
-static const efftype_id effect_adrenaline( "adrenaline" );
-static const efftype_id effect_adrenaline_mycus( "adrenaline_mycus" );
-static const efftype_id effect_alarm_clock( "alarm_clock" );
-static const efftype_id effect_allow_sleep( "allow_sleep" );
-static const efftype_id effect_amigara( "amigara" );
-static const efftype_id effect_antibiotic( "antibiotic" );
-static const efftype_id effect_antibiotic_visible( "antibiotic_visible" );
-static const efftype_id effect_asked_for_item( "asked_for_item" );
-static const efftype_id effect_asked_personal_info( "asked_personal_info" );
-static const efftype_id effect_asked_to_follow( "asked_to_follow" );
-static const efftype_id effect_asked_to_lead( "asked_to_lead" );
-static const efftype_id effect_asked_to_train( "asked_to_train" );
-static const efftype_id effect_assisted( "assisted" );
-static const efftype_id effect_asthma( "asthma" );
-static const efftype_id effect_attention( "attention" );
-static const efftype_id effect_badpoison( "badpoison" );
-static const efftype_id effect_bandaged( "bandaged" );
-static const efftype_id effect_beartrap( "beartrap" );
-static const efftype_id effect_bite( "bite" );
-static const efftype_id effect_bleed( "bleed" );
-static const efftype_id effect_blind( "blind" );
-static const efftype_id effect_blisters( "blisters" );
-static const efftype_id effect_bloodworms( "bloodworms" );
-static const efftype_id effect_boomered( "boomered" );
-static const efftype_id effect_bouldering( "bouldering" );
-static const efftype_id effect_bounced( "bounced" );
-static const efftype_id effect_brainworms( "brainworms" );
-static const efftype_id effect_catch_up( "catch_up" );
-static const efftype_id effect_cig( "cig" );
-static const efftype_id effect_cold( "cold" );
-static const efftype_id effect_common_cold( "common_cold" );
-static const efftype_id effect_contacts( "contacts" );
-static const efftype_id effect_controlled( "controlled" );
-static const efftype_id effect_corroding( "corroding" );
-static const efftype_id effect_cough_suppress( "cough_suppress" );
-static const efftype_id effect_countdown( "countdown" );
-static const efftype_id effect_crushed( "crushed" );
-static const efftype_id effect_cureall( "cureall" );
-static const efftype_id effect_currently_busy( "currently_busy" );
-static const efftype_id effect_darkness( "darkness" );
-static const efftype_id effect_datura( "datura" );
-static const efftype_id effect_dazed( "dazed" );
-static const efftype_id effect_deaf( "deaf" );
-static const efftype_id effect_depressants( "depressants" );
-static const efftype_id effect_dermatik( "dermatik" );
-static const efftype_id effect_disabled( "disabled" );
-static const efftype_id effect_disinfected( "disinfected" );
-static const efftype_id effect_docile( "docile" );
-static const efftype_id effect_downed( "downed" );
-static const efftype_id effect_dragging( "dragging" );
-static const efftype_id effect_drunk( "drunk" );
-static const efftype_id effect_earphones( "earphones" );
 static const efftype_id effect_emp( "emp" );
 static const efftype_id effect_evil( "evil" );
 static const efftype_id effect_fearparalyze( "fearparalyze" );
diff --git a/src/character.cpp b/src/character.cpp
index aa2dcebd4fe91..ace8ff309af76 100644
--- a/src/character.cpp
+++ b/src/character.cpp
@@ -75,6 +75,28 @@ static const activity_id ACT_TREE_COMMUNION( "ACT_TREE_COMMUNION" );
 static const activity_id ACT_TRY_SLEEP( "ACT_TRY_SLEEP" );
 static const activity_id ACT_WAIT_STAMINA( "ACT_WAIT_STAMINA" );
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_alarm_clock( "alarm_clock" );
+static const efftype_id effect_bandaged( "bandaged" );
+static const efftype_id effect_beartrap( "beartrap" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_blisters( "blisters" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_cold( "cold" );
+static const efftype_id effect_common_cold( "common_cold" );
+static const efftype_id effect_contacts( "contacts" );
+static const efftype_id effect_controlled( "controlled" );
+static const efftype_id effect_corroding( "corroding" );
+static const efftype_id effect_cough_suppress( "cough_suppress" );
+static const efftype_id effect_crushed( "crushed" );
+static const efftype_id effect_darkness( "darkness" );
+static const efftype_id effect_deaf( "deaf" );
+static const efftype_id effect_disinfected( "disinfected" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_drunk( "drunk" );
+
 static const trait_id trait_DEBUG_NODMG( "DEBUG_NODMG" );
 
 static const skill_id skill_dodge( "dodge" );
diff --git a/src/computer_session.cpp b/src/computer_session.cpp
index e1840309beb70..5f3d2bf064109 100644
--- a/src/computer_session.cpp
+++ b/src/computer_session.cpp
@@ -52,6 +52,8 @@
 #include "type_id.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_amigara( "amigara" );
+
 static const skill_id skill_computer( "computer" );
 
 static const species_id HUMAN( "HUMAN" );
diff --git a/src/condition.cpp b/src/condition.cpp
index 9394dd7bbf926..a17ef58f4a276 100644
--- a/src/condition.cpp
+++ b/src/condition.cpp
@@ -30,6 +30,8 @@
 #include "vpart_position.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_currently_busy( "currently_busy" );
+
 // throws an error on failure, so no need to return
 std::string get_talk_varname( const JsonObject &jo, const std::string &member, bool check_value )
 {
diff --git a/src/consumption.cpp b/src/consumption.cpp
index d709016dbb46d..8349210dc7187 100644
--- a/src/consumption.cpp
+++ b/src/consumption.cpp
@@ -52,6 +52,10 @@ static const bionic_id bio_furnace( "bio_furnace" );
 static const bionic_id bio_reactor( "bio_reactor" );
 static const bionic_id bio_taste_blocker( "bio_taste_blocker" );
 
+static const efftype_id effect_bloodworms( "bloodworms" );
+static const efftype_id effect_brainworms( "brainworms" );
+static const efftype_id effect_common_cold( "common_cold" );
+
 const std::vector<std::string> carnivore_blacklist {{
         flag_ALLERGEN_VEGGY, flag_ALLERGEN_FRUIT, flag_ALLERGEN_WHEAT, flag_ALLERGEN_NUT,
     }
diff --git a/src/crafting.cpp b/src/crafting.cpp
index 47b9a1d75e26e..7117e3b1e6633 100644
--- a/src/crafting.cpp
+++ b/src/crafting.cpp
@@ -73,6 +73,8 @@
 static const activity_id ACT_CRAFT( "ACT_CRAFT" );
 static const activity_id ACT_DISASSEMBLE( "ACT_DISASSEMBLE" );
 
+static const efftype_id effect_contacts( "contacts" );
+
 static const skill_id skill_electronics( "electronics" );
 static const skill_id skill_tailor( "tailor" );
 
diff --git a/src/creature.cpp b/src/creature.cpp
index 01d303e4b89b1..af6e873aa8170 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -42,6 +42,10 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_bounced( "bounced" );
+static const efftype_id effect_downed( "downed" );
+
 const std::map<std::string, m_size> Creature::size_map = {
     {"TINY", MS_TINY}, {"SMALL", MS_SMALL}, {"MEDIUM", MS_MEDIUM},
     {"LARGE", MS_LARGE}, {"HUGE", MS_HUGE}
diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp
index 5c96003d1e680..0a4e4bc666e32 100644
--- a/src/debug_menu.cpp
+++ b/src/debug_menu.cpp
@@ -88,6 +88,8 @@
 #include "cata_string_consts.h"
 #include "mapgendata.h"
 
+static const efftype_id effect_asthma( "asthma" );
+
 static const mtype_id mon_generator( "mon_generator" );
 
 class vehicle;
diff --git a/src/effect.cpp b/src/effect.cpp
index 223a73b92dc62..1aee399d81ec9 100644
--- a/src/effect.cpp
+++ b/src/effect.cpp
@@ -17,6 +17,10 @@
 #include "units.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_beartrap( "beartrap" );
+static const efftype_id effect_crushed( "crushed" );
+static const efftype_id effect_downed( "downed" );
+
 namespace
 {
 std::map<efftype_id, effect_type> effect_types;
diff --git a/src/explosion.cpp b/src/explosion.cpp
index e4e4b1d44dcb5..cedfbfdd0fe04 100644
--- a/src/explosion.cpp
+++ b/src/explosion.cpp
@@ -61,6 +61,9 @@
 #include "type_id.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_deaf( "deaf" );
+
 static const itype_id fuel_type_none( "null" );
 
 static const species_id ROBOT( "ROBOT" );
diff --git a/src/game_inventory.cpp b/src/game_inventory.cpp
index e4792c2c3fb13..1354fe2ee2621 100644
--- a/src/game_inventory.cpp
+++ b/src/game_inventory.cpp
@@ -53,6 +53,8 @@ static const activity_id ACT_CONSUME_FOOD_MENU( "ACT_CONSUME_FOOD_MENU" );
 static const activity_id ACT_CONSUME_DRINK_MENU( "ACT_CONSUME_DRINK_MENU" );
 static const activity_id ACT_CONSUME_MEDS_MENU( "ACT_CONSUME_MEDS_MENU" );
 
+static const efftype_id effect_assisted( "assisted" );
+
 static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
 
 static const skill_id skill_computer( "computer" );
diff --git a/src/handle_action.cpp b/src/handle_action.cpp
index b0d6df6452da3..f8e61aff32738 100644
--- a/src/handle_action.cpp
+++ b/src/handle_action.cpp
@@ -83,6 +83,8 @@ static const activity_id ACT_WAIT( "ACT_WAIT" );
 static const activity_id ACT_WAIT_STAMINA( "ACT_WAIT_STAMINA" );
 static const activity_id ACT_WAIT_WEATHER( "ACT_WAIT_WEATHER" );
 
+static const efftype_id effect_alarm_clock( "alarm_clock" );
+
 static const skill_id skill_melee( "melee" );
 
 static const quality_id qual_CUT( "CUT" );
diff --git a/src/iexamine.cpp b/src/iexamine.cpp
index e2f2311140a5f..fea1a7eea8a4e 100644
--- a/src/iexamine.cpp
+++ b/src/iexamine.cpp
@@ -97,6 +97,8 @@ static const activity_id ACT_HACKING( "ACT_HACKING" );
 static const activity_id ACT_PICKUP( "ACT_PICKUP" );
 static const activity_id ACT_PLANT_SEED( "ACT_PLANT_SEED" );
 
+static const efftype_id effect_earphones( "earphones" );
+
 static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );
 
 static const skill_id skill_computer( "computer" );
diff --git a/src/item.cpp b/src/item.cpp
index 23c6c58fb736b..5624d2e906070 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -93,6 +93,8 @@ static const std::string CLOTHING_MOD_VAR_PREFIX( "clothing_mod_" );
 static const ammotype ammo_battery( "battery" );
 static const ammotype ammo_plutonium( "plutonium" );
 
+static const efftype_id effect_cig( "cig" );
+
 static const fault_id fault_gun_blackpowder( "fault_gun_blackpowder" );
 
 static const skill_id skill_cooking( "cooking" );
diff --git a/src/iuse.cpp b/src/iuse.cpp
index 9ae8b65c3793d..585caf923f41e 100644
--- a/src/iuse.cpp
+++ b/src/iuse.cpp
@@ -130,6 +130,32 @@ static const activity_id ACT_SHAVE( "ACT_SHAVE" );
 static const activity_id ACT_VIBE( "ACT_VIBE" );
 static const activity_id ACT_WASH( "ACT_WASH" );
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_antibiotic( "antibiotic" );
+static const efftype_id effect_antibiotic_visible( "antibiotic_visible" );
+static const efftype_id effect_asthma( "asthma" );
+static const efftype_id effect_attention( "attention" );
+static const efftype_id effect_beartrap( "beartrap" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_bloodworms( "bloodworms" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_bouldering( "bouldering" );
+static const efftype_id effect_brainworms( "brainworms" );
+static const efftype_id effect_cig( "cig" );
+static const efftype_id effect_contacts( "contacts" );
+static const efftype_id effect_corroding( "corroding" );
+static const efftype_id effect_crushed( "crushed" );
+static const efftype_id effect_cureall( "cureall" );
+static const efftype_id effect_datura( "datura" );
+static const efftype_id effect_dazed( "dazed" );
+static const efftype_id effect_dermatik( "dermatik" );
+static const efftype_id effect_docile( "docile" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_drunk( "drunk" );
+static const efftype_id effect_earphones( "earphones" );
+
 static const skill_id skill_computer( "computer" );
 static const skill_id skill_cooking( "cooking" );
 static const skill_id skill_electronics( "electronics" );
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
index 1c2d7a501817a..2bd9fcff59e95 100644
--- a/src/iuse_actor.cpp
+++ b/src/iuse_actor.cpp
@@ -85,6 +85,13 @@ static const activity_id ACT_SPELLCASTING( "ACT_SPELLCASTING" );
 static const activity_id ACT_STUDY_SPELL( "ACT_STUDY_SPELL" );
 static const activity_id ACT_START_FIRE( "ACT_START_FIRE" );
 
+static const efftype_id effect_asthma( "asthma" );
+static const efftype_id effect_bandaged( "bandaged" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_disinfected( "disinfected" );
+static const efftype_id effect_downed( "downed" );
+
 static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
 
 static const bionic_id bio_syringe( "bio_syringe" );
diff --git a/src/map_field.cpp b/src/map_field.cpp
index 43748d761a946..3a88eeedca54f 100644
--- a/src/map_field.cpp
+++ b/src/map_field.cpp
@@ -67,6 +67,10 @@ static const species_id SPIDER( "SPIDER" );
 
 static const bionic_id bio_heatsink( "bio_heatsink" );
 
+static const efftype_id effect_badpoison( "badpoison" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_corroding( "corroding" );
+
 void map::create_burnproducts( const tripoint &p, const item &fuel, const units::mass &burned_mass )
 {
     std::vector<material_id> all_mats = fuel.made_of();
diff --git a/src/mattack_actors.cpp b/src/mattack_actors.cpp
index d4df46666f003..e60ef041c166a 100644
--- a/src/mattack_actors.cpp
+++ b/src/mattack_actors.cpp
@@ -26,6 +26,9 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_badpoison( "badpoison" );
+static const efftype_id effect_bite( "bite" );
+
 // Simplified version of the function in monattack.cpp
 static bool is_adjacent( const monster &z, const Creature &target )
 {
diff --git a/src/memorial_logger.cpp b/src/memorial_logger.cpp
index 3dd7fe47bacba..750edaae1ccdc 100644
--- a/src/memorial_logger.cpp
+++ b/src/memorial_logger.cpp
@@ -21,6 +21,10 @@
 #include "stats_tracker.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_datura( "datura" );
+static const efftype_id effect_drunk( "drunk" );
+
 static const trap_str_id tr_bubblewrap( "tr_bubblewrap" );
 static const trap_str_id tr_glass( "tr_glass" );
 static const trap_str_id tr_beartrap( "tr_beartrap" );
diff --git a/src/monattack.cpp b/src/monattack.cpp
index 353ff8496d5b0..3deb3dea43789 100644
--- a/src/monattack.cpp
+++ b/src/monattack.cpp
@@ -76,6 +76,21 @@
 
 static const activity_id ACT_RELOAD( "ACT_RELOAD" );
 
+static const efftype_id effect_assisted( "assisted" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_controlled( "controlled" );
+static const efftype_id effect_corroding( "corroding" );
+static const efftype_id effect_countdown( "countdown" );
+static const efftype_id effect_darkness( "darkness" );
+static const efftype_id effect_dazed( "dazed" );
+static const efftype_id effect_deaf( "deaf" );
+static const efftype_id effect_dermatik( "dermatik" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_dragging( "dragging" );
+
 static const skill_id skill_gun( "gun" );
 static const skill_id skill_launcher( "launcher" );
 static const skill_id skill_melee( "melee" );
diff --git a/src/mondeath.cpp b/src/mondeath.cpp
index 0f6720691336e..45dcff4612546 100644
--- a/src/mondeath.cpp
+++ b/src/mondeath.cpp
@@ -49,6 +49,11 @@
 #include "mattack_actors.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_amigara( "amigara" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_controlled( "controlled" );
+static const efftype_id effect_darkness( "darkness" );
+
 static const species_id species_BLOB( "BLOB" );
 static const species_id ZOMBIE( "ZOMBIE" );
 
diff --git a/src/monexamine.cpp b/src/monexamine.cpp
index 5a986dd073529..996a5bc26e829 100644
--- a/src/monexamine.cpp
+++ b/src/monexamine.cpp
@@ -41,6 +41,8 @@
 static const activity_id ACT_MILK( "ACT_MILK" );
 static const activity_id ACT_PLAY_WITH_PET( "ACT_PLAY_WITH_PET" );
 
+static const efftype_id effect_controlled( "controlled" );
+
 static const skill_id skill_survival( "survival" );
 
 static const species_id ZOMBIE( "ZOMBIE" );
diff --git a/src/monmove.cpp b/src/monmove.cpp
index 74d1fd3ec1feb..3be9c8a941a25 100644
--- a/src/monmove.cpp
+++ b/src/monmove.cpp
@@ -43,6 +43,12 @@
 #include "string_formatter.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_bouldering( "bouldering" );
+static const efftype_id effect_countdown( "countdown" );
+static const efftype_id effect_docile( "docile" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_dragging( "dragging" );
+
 static const species_id FUNGUS( "FUNGUS" );
 static const species_id INSECT( "INSECT" );
 static const species_id SPIDER( "SPIDER" );
diff --git a/src/monster.cpp b/src/monster.cpp
index fcc0305862636..5323ad237e6ca 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -55,6 +55,16 @@
 #include "weather.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_badpoison( "badpoison" );
+static const efftype_id effect_beartrap( "beartrap" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_bouldering( "bouldering" );
+static const efftype_id effect_crushed( "crushed" );
+static const efftype_id effect_deaf( "deaf" );
+static const efftype_id effect_docile( "docile" );
+static const efftype_id effect_downed( "downed" );
+
 static const species_id FISH( "FISH" );
 static const species_id FUNGUS( "FUNGUS" );
 static const species_id INSECT( "INSECT" );
diff --git a/src/morale.cpp b/src/morale.cpp
index c13b6f34d55ad..120cc9031e177 100644
--- a/src/morale.cpp
+++ b/src/morale.cpp
@@ -22,6 +22,8 @@
 #include "enums.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_cold( "cold" );
+
 namespace
 {
 
diff --git a/src/npc.cpp b/src/npc.cpp
index 49fe8343fcd8d..13e8d7773d040 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -67,6 +67,11 @@
 
 static const activity_id ACT_READ( "ACT_READ" );
 
+static const efftype_id effect_bouldering( "bouldering" );
+static const efftype_id effect_contacts( "contacts" );
+static const efftype_id effect_controlled( "controlled" );
+static const efftype_id effect_drunk( "drunk" );
+
 static const skill_id skill_archery( "archery" );
 static const skill_id skill_barter( "barter" );
 static const skill_id skill_bashing( "bashing" );
diff --git a/src/npcmove.cpp b/src/npcmove.cpp
index 4f30be480b6ef..03a94b73fc83e 100644
--- a/src/npcmove.cpp
+++ b/src/npcmove.cpp
@@ -92,6 +92,14 @@ static const bionic_id bio_reactor( "bio_reactor" );
 static const bionic_id bio_shock( "bio_shock" );
 static const bionic_id bio_soporific( "bio_soporific" );
 
+static const efftype_id effect_asthma( "asthma" );
+static const efftype_id effect_bandaged( "bandaged" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_bouldering( "bouldering" );
+static const efftype_id effect_catch_up( "catch_up" );
+static const efftype_id effect_disinfected( "disinfected" );
+
 static constexpr float NPC_DANGER_VERY_LOW = 5.0f;
 static constexpr float NPC_DANGER_MAX = 150.0f;
 static constexpr float MAX_FLOAT = 5000000000.0f;
diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp
index d59cc247fa597..6964cc3eb4409 100644
--- a/src/npctalk_funcs.cpp
+++ b/src/npctalk_funcs.cpp
@@ -64,6 +64,16 @@ static const activity_id ACT_WAIT_NPC( "ACT_WAIT_NPC" );
 static const activity_id ACT_SOCIALIZE( "ACT_SOCIALIZE" );
 static const activity_id ACT_TRAIN( "ACT_TRAIN" );
 
+static const efftype_id effect_allow_sleep( "allow_sleep" );
+static const efftype_id effect_asked_for_item( "asked_for_item" );
+static const efftype_id effect_asked_personal_info( "asked_personal_info" );
+static const efftype_id effect_asked_to_follow( "asked_to_follow" );
+static const efftype_id effect_asked_to_lead( "asked_to_lead" );
+static const efftype_id effect_asked_to_train( "asked_to_train" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_currently_busy( "currently_busy" );
+
 static const mtype_id mon_chicken( "mon_chicken" );
 static const mtype_id mon_cow( "mon_cow" );
 static const mtype_id mon_horse( "mon_horse" );
diff --git a/src/player.cpp b/src/player.cpp
index 0eca3c2d5876d..1617fc2e9c871 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -99,6 +99,22 @@
 #include "stomach.h"
 #include "teleport.h"
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_bandaged( "bandaged" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_bloodworms( "bloodworms" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_brainworms( "brainworms" );
+static const efftype_id effect_contacts( "contacts" );
+static const efftype_id effect_darkness( "darkness" );
+static const efftype_id effect_deaf( "deaf" );
+static const efftype_id effect_dermatik( "dermatik" );
+static const efftype_id effect_disinfected( "disinfected" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_drunk( "drunk" );
+static const efftype_id effect_earphones( "earphones" );
+
 static const trait_id trait_DEBUG_NODMG( "DEBUG_NODMG" );
 
 static const skill_id skill_dodge( "dodge" );
diff --git a/src/player_hardcoded_effects.cpp b/src/player_hardcoded_effects.cpp
index 5922d7679c81e..3b575408895ef 100644
--- a/src/player_hardcoded_effects.cpp
+++ b/src/player_hardcoded_effects.cpp
@@ -41,6 +41,24 @@
 
 static const activity_id ACT_FIRSTAID( "ACT_FIRSTAID" );
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_alarm_clock( "alarm_clock" );
+static const efftype_id effect_antibiotic( "antibiotic" );
+static const efftype_id effect_asthma( "asthma" );
+static const efftype_id effect_attention( "attention" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_bloodworms( "bloodworms" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_brainworms( "brainworms" );
+static const efftype_id effect_cold( "cold" );
+static const efftype_id effect_datura( "datura" );
+static const efftype_id effect_dermatik( "dermatik" );
+static const efftype_id effect_disabled( "disabled" );
+static const efftype_id effect_disinfected( "disinfected" );
+static const efftype_id effect_downed( "downed" );
+
 const vitamin_id vitamin_iron( "iron" );
 
 static const mongroup_id GROUP_NETHER( "GROUP_NETHER" );
diff --git a/src/ranged.cpp b/src/ranged.cpp
index 6e393475d1b99..c831613b53d2c 100644
--- a/src/ranged.cpp
+++ b/src/ranged.cpp
@@ -67,6 +67,8 @@
 
 static const activity_id ACT_AIM( "ACT_AIM" );
 
+static const efftype_id effect_downed( "downed" );
+
 static const trap_str_id tr_practice_target( "tr_practice_target" );
 
 static const fault_id fault_gun_blackpowder( "fault_gun_blackpowder" );