diff --git a/src/action.cpp b/src/action.cpp
index 1ddec702f445c..5871fe114c350 100644
--- a/src/action.cpp
+++ b/src/action.cpp
@@ -34,6 +34,9 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const quality_id qual_BUTCHER( "BUTCHER" );
+static const quality_id qual_CUT_FINE( "CUT_FINE" );
+
 class inventory;
 
 void parse_keymap( std::istream &keymap_txt, std::map<char, action_id> &kmap,
diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp
index 3d2be998e8213..94c1c9674f314 100644
--- a/src/activity_handlers.cpp
+++ b/src/activity_handlers.cpp
@@ -100,6 +100,22 @@
 
 #define dbg(x) DebugLog((x),D_GAME) << __FILE__ << ":" << __LINE__ << ": "
 
+static const zone_type_id zone_type_FARM_PLOT( "FARM_PLOT" );
+
+static const skill_id skill_computer( "computer" );
+static const skill_id skill_electronics( "electronics" );
+static const skill_id skill_fabrication( "fabrication" );
+static const skill_id skill_firstaid( "firstaid" );
+static const skill_id skill_survival( "survival" );
+
+static const quality_id qual_BUTCHER( "BUTCHER" );
+static const quality_id qual_CUT_FINE( "CUT_FINE" );
+static const quality_id qual_SAW_M( "SAW_M" );
+static const quality_id qual_SAW_W( "SAW_W" );
+
+static const species_id HUMAN( "HUMAN" );
+static const species_id ZOMBIE( "ZOMBIE" );
+
 using namespace activity_handlers;
 
 const std::map< activity_id, std::function<void( player_activity *, player * )> >
diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp
index 0565f0b88605a..79c531de6d92a 100644
--- a/src/activity_item_handling.cpp
+++ b/src/activity_item_handling.cpp
@@ -51,6 +51,31 @@
 #include "string_id.h"
 #include "cata_string_consts.h"
 
+static const trap_str_id tr_firewood_source( "tr_firewood_source" );
+static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );
+
+static const zone_type_id zone_type_loot_unsorted( "LOOT_UNSORTED" );
+static const zone_type_id zone_type_source_firewood( "SOURCE_FIREWOOD" );
+
+static const zone_type_id zone_type_CHOP_TREES( "CHOP_TREES" );
+static const zone_type_id zone_type_CONSTRUCTION_BLUEPRINT( "CONSTRUCTION_BLUEPRINT" );
+static const zone_type_id zone_type_FARM_PLOT( "FARM_PLOT" );
+static const zone_type_id zone_type_FISHING_SPOT( "FISHING_SPOT" );
+static const zone_type_id zone_type_LOOT_CORPSE( "LOOT_CORPSE" );
+static const zone_type_id zone_type_LOOT_IGNORE( "LOOT_IGNORE" );
+static const zone_type_id zone_type_LOOT_UNSORTED( "LOOT_UNSORTED" );
+static const zone_type_id zone_type_LOOT_WOOD( "LOOT_WOOD" );
+static const zone_type_id zone_type_VEHICLE_DECONSTRUCT( "VEHICLE_DECONSTRUCT" );
+static const zone_type_id zone_type_VEHICLE_REPAIR( "VEHICLE_REPAIR" );
+
+static const quality_id qual_AXE( "AXE" );
+static const quality_id qual_BUTCHER( "BUTCHER" );
+static const quality_id qual_DIG( "DIG" );
+static const quality_id qual_FISHING( "FISHING" );
+static const quality_id qual_SAW_M( "SAW_M" );
+static const quality_id qual_SAW_W( "SAW_W" );
+static const quality_id qual_WELD( "WELD" );
+
 struct construction_category;
 
 void cancel_aim_processing();
@@ -1469,7 +1494,7 @@ static activity_reason_info can_do_activity_there( const activity_id &act, playe
         return activity_reason_info::fail( NO_ZONE );
     }
     if( act == ACT_TIDY_UP ) {
-        if( mgr.has_near( z_loot_unsorted, g->m.getabs( src_loc ), distance ) ) {
+        if( mgr.has_near( zone_type_loot_unsorted, g->m.getabs( src_loc ), distance ) ) {
             return activity_reason_info::ok( CAN_DO_FETCH );
         }
         return activity_reason_info::fail( NO_ZONE );
@@ -1912,7 +1937,7 @@ static bool tidy_activity( player &p, const tripoint &src_loc,
         }
     }
     // we are adjacent to an unsorted zone, we came here to just drop items we are carrying
-    if( mgr.has( zone_type_id( z_loot_unsorted ), g->m.getabs( src_loc ) ) ) {
+    if( mgr.has( zone_type_loot_unsorted, g->m.getabs( src_loc ) ) ) {
         for( item *inv_elem : p.inv_dump() ) {
             if( inv_elem->has_var( "activity_var" ) ) {
                 inv_elem->erase_var( "activity_var" );
@@ -2407,7 +2432,7 @@ static std::unordered_set<tripoint> generic_multi_activity_locations( player &p,
     if( act_id == ACT_TIDY_UP ) {
         dark_capable = true;
         tripoint unsorted_spot;
-        std::unordered_set<tripoint> unsorted_set = mgr.get_near( zone_type_id( z_loot_unsorted ), abspos,
+        std::unordered_set<tripoint> unsorted_set = mgr.get_near( zone_type_loot_unsorted, abspos,
                 ACTIVITY_SEARCH_DISTANCE );
         if( !unsorted_set.empty() ) {
             unsorted_spot = g->m.getlocal( random_entry( unsorted_set ) );
@@ -2926,7 +2951,7 @@ static cata::optional<tripoint> find_refuel_spot_zone( const tripoint &center )
     const tripoint center_abs = g->m.getabs( center );
 
     const std::unordered_set<tripoint> &tiles_abs_unordered =
-        mgr.get_near( zone_source_firewood, center_abs, PICKUP_RANGE );
+        mgr.get_near( zone_type_source_firewood, center_abs, PICKUP_RANGE );
     const std::vector<tripoint> &tiles_abs =
         get_sorted_tiles_by_distance( center_abs, tiles_abs_unordered );
 
diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
index 7e1604293df05..7342c6c94a718 100644
--- a/src/avatar_action.cpp
+++ b/src/avatar_action.cpp
@@ -50,6 +50,8 @@
 #include "rng.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_swimming( "swimming" );
+
 #define dbg(x) DebugLog((x),D_SDL) << __FILE__ << ":" << __LINE__ << ": "
 
 bool avatar_action::move( avatar &you, map &m, int dx, int dy, int dz )
diff --git a/src/basecamp.cpp b/src/basecamp.cpp
index 2223f36e4c935..2e3c8e4b28cfd 100644
--- a/src/basecamp.cpp
+++ b/src/basecamp.cpp
@@ -36,7 +36,8 @@
 #include "type_id.h"
 #include "flat_set.h"
 #include "line.h"
-#include "cata_string_consts.h"
+
+static const zone_type_id zone_type_camp_storage( "CAMP_STORAGE" );
 
 const std::map<point, base_camps::direction_data> base_camps::all_directions = {
     // direction, direction id, tab order, direction abbreviation with bracket, direction tab title
@@ -588,8 +589,8 @@ void basecamp::form_crafting_inventory( map &target_map )
     if( g->m.check_vehicle_zones( g->get_levz() ) ) {
         mgr.cache_vzones();
     }
-    if( mgr.has_near( z_camp_storage, dump_spot, 60 ) ) {
-        std::unordered_set<tripoint> src_set = mgr.get_near( z_camp_storage, dump_spot, 60 );
+    if( mgr.has_near( zone_type_camp_storage, dump_spot, 60 ) ) {
+        std::unordered_set<tripoint> src_set = mgr.get_near( zone_type_camp_storage, dump_spot, 60 );
         _inv.form_from_zone( target_map, src_set, nullptr, false );
     }
     /*
diff --git a/src/bionics.cpp b/src/bionics.cpp
index daba58d5b874c..2779559900993 100644
--- a/src/bionics.cpp
+++ b/src/bionics.cpp
@@ -67,6 +67,17 @@
 #include "teleport.h"
 #include "cata_string_consts.h"
 
+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" );
+
+static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
+
+static const skill_id skill_computer( "computer" );
+static const skill_id skill_electronics( "electronics" );
+static const skill_id skill_firstaid( "firstaid" );
+static const skill_id skill_mechanics( "mechanics" );
+
 namespace
 {
 std::map<bionic_id, bionic_data> bionics;
diff --git a/src/cata_string_consts.h b/src/cata_string_consts.h
index 3fc054f0034c6..e73a9a9d19a91 100644
--- a/src/cata_string_consts.h
+++ b/src/cata_string_consts.h
@@ -463,7 +463,6 @@ static const trait_id trait_DEBUG_HS( "DEBUG_HS" );
 static const trait_id trait_DEBUG_LS( "DEBUG_LS" );
 static const trait_id trait_DEBUG_MIND_CONTROL( "DEBUG_MIND_CONTROL" );
 static const trait_id trait_DEBUG_NIGHTVISION( "DEBUG_NIGHTVISION" );
-static const trait_id trait_DEBUG_NODMG( "DEBUG_NODMG" );
 static const trait_id trait_DEBUG_NOSCENT( "DEBUG_NOSCENT" );
 static const trait_id trait_DEBUG_NOTEMP( "DEBUG_NOTEMP" );
 static const trait_id trait_DEBUG_SILENT( "DEBUG_SILENT" );
@@ -719,8 +718,6 @@ static const trait_id trait_WOOLALLERGY( "WOOLALLERGY" );
 static const trait_id trait_XS( "XS" );
 static const trait_id trait_XXXL( "XXXL" );
 
-static const trait_id debug_nodmg( "DEBUG_NODMG" );
-
 static const std::string trait_flag_CANNIBAL( "CANNIBAL" );
 static const std::string trait_flag_PSYCHOPATH( "PSYCHOPATH" );
 static const std::string trait_flag_SAPIOVORE( "SAPIOVORE" );
@@ -1225,167 +1222,4 @@ static const std::string flag_WIND_EXTINGUISH( "WIND_EXTINGUISH" );
 static const std::string flag_WRITE_MESSAGE( "WRITE_MESSAGE" );
 static const std::string flag_YOUNG( "YOUNG" );
 
-static const skill_id skill_archery( "archery" );
-static const skill_id skill_barter( "barter" );
-static const skill_id skill_bashing( "bashing" );
-static const skill_id skill_computer( "computer" );
-static const skill_id skill_cooking( "cooking" );
-static const skill_id skill_cutting( "cutting" );
-static const skill_id skill_dodge( "dodge" );
-static const skill_id skill_driving( "driving" );
-static const skill_id skill_electronics( "electronics" );
-static const skill_id skill_fabrication( "fabrication" );
-static const skill_id skill_firstaid( "firstaid" );
-static const skill_id skill_gun( "gun" );
-static const skill_id skill_launcher( "launcher" );
-static const skill_id skill_mechanics( "mechanics" );
-static const skill_id skill_melee( "melee" );
-static const skill_id skill_pistol( "pistol" );
-static const skill_id skill_rifle( "rifle" );
-static const skill_id skill_shotgun( "shotgun" );
-static const skill_id skill_smg( "smg" );
-static const skill_id skill_speech( "speech" );
-static const skill_id skill_stabbing( "stabbing" );
-static const skill_id skill_survival( "survival" );
-static const skill_id skill_swimming( "swimming" );
-static const skill_id skill_tailor( "tailor" );
-static const skill_id skill_throw( "throw" );
-static const skill_id skill_traps( "traps" );
-static const skill_id skill_unarmed( "unarmed" );
-static const skill_id weapon_skill( "weapon" );
-
-static const quality_id qual_ANESTHESIA( "ANESTHESIA" );
-static const quality_id qual_AXE( "AXE" );
-static const quality_id qual_BUTCHER( "BUTCHER" );
-static const quality_id qual_CUT( "CUT" );
-static const quality_id qual_CUT_FINE( "CUT_FINE" );
-static const quality_id qual_DIG( "DIG" );
-static const quality_id qual_FISHING( "FISHING" );
-static const quality_id qual_JACK( "JACK" );
-static const quality_id qual_LIFT( "LIFT" );
-static const quality_id qual_SAW_M( "SAW_M" );
-static const quality_id qual_SAW_W( "SAW_W" );
-static const quality_id qual_SELF_JACK( "SELF_JACK" );
-static const quality_id qual_WELD( "WELD" );
-
-static const zone_type_id zone_investigate_only( "NPC_INVESTIGATE_ONLY" );
-static const zone_type_id zone_no_investigate( "NPC_NO_INVESTIGATE" );
-static const zone_type_id zone_type_CHOP_TREES( "CHOP_TREES" );
-static const zone_type_id zone_type_CONSTRUCTION_BLUEPRINT( "CONSTRUCTION_BLUEPRINT" );
-static const zone_type_id zone_type_FARM_PLOT( "FARM_PLOT" );
-static const zone_type_id zone_type_FISHING_SPOT( "FISHING_SPOT" );
-static const zone_type_id zone_type_LOOT_CORPSE( "LOOT_CORPSE" );
-static const zone_type_id zone_type_LOOT_IGNORE( "LOOT_IGNORE" );
-static const zone_type_id zone_type_LOOT_UNSORTED( "LOOT_UNSORTED" );
-static const zone_type_id zone_type_LOOT_WOOD( "LOOT_WOOD" );
-static const zone_type_id zone_type_VEHICLE_DECONSTRUCT( "VEHICLE_DECONSTRUCT" );
-static const zone_type_id zone_type_VEHICLE_REPAIR( "VEHICLE_REPAIR" );
-
-static const zone_type_id z_camp_food( "CAMP_FOOD" );
-static const zone_type_id z_camp_storage( "CAMP_STORAGE" );
-static const zone_type_id z_loot_unsorted( "LOOT_UNSORTED" );
-static const zone_type_id zone_source_firewood( "SOURCE_FIREWOOD" );
-
-static const trap_str_id tr_firewood_source( "tr_firewood_source" );
-static const trap_str_id tr_practice_target( "tr_practice_target" );
-static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );
-
-static const itype_id fuel_type_animal( "animal" );
-static const itype_id fuel_type_battery( "battery" );
-static const itype_id fuel_type_muscle( "muscle" );
-static const itype_id fuel_type_none( "null" );
-static const itype_id fuel_type_plutonium_cell( "plut_cell" );
-static const itype_id fuel_type_sun_light( "sunlight" );
-static const itype_id fuel_type_wind( "wind" );
-
-static const fault_id fault_belt( "fault_engine_belt_drive" );
-static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
-static const fault_id fault_diesel( "fault_engine_pump_diesel" );
-static const fault_id fault_filter_air( "fault_engine_filter_air" );
-static const fault_id fault_filter_fuel( "fault_engine_filter_fuel" );
-static const fault_id fault_glowplug( "fault_engine_glow_plug" );
-static const fault_id fault_gun_blackpowder( "fault_gun_blackpowder" );
-static const fault_id fault_gun_chamber_spent( "fault_gun_chamber_spent" );
-static const fault_id fault_gun_dirt( "fault_gun_dirt" );
-static const fault_id fault_gun_unlubricated( "fault_gun_unlubricated" );
-static const fault_id fault_immobiliser( "fault_engine_immobiliser" );
-static const fault_id fault_pump( "fault_engine_pump_fuel" );
-static const fault_id fault_starter( "fault_engine_starter" );
-
-static const std::string comesttype_DRINK( "DRINK" );
-static const std::string comesttype_FOOD( "FOOD" );
-
-static const matype_id style_aikido( "style_aikido" );
-static const matype_id style_biojutsu( "style_biojutsu" );
-static const matype_id style_boxing( "style_boxing" );
-static const matype_id style_capoeira( "style_capoeira" );
-static const matype_id style_crane( "style_crane" );
-static const matype_id style_dragon( "style_dragon" );
-static const matype_id style_judo( "style_judo" );
-static const matype_id style_karate( "style_karate" );
-static const matype_id style_kicks( "style_kicks" );
-static const matype_id style_krav_maga( "style_krav_maga" );
-static const matype_id style_leopard( "style_leopard" );
-static const matype_id style_muay_thai( "style_muay_thai" );
-static const matype_id style_ninjutsu( "style_ninjutsu" );
-static const matype_id style_none( "style_none" );
-static const matype_id style_pankration( "style_pankration" );
-static const matype_id style_snake( "style_snake" );
-static const matype_id style_taekwondo( "style_taekwondo" );
-static const matype_id style_tai_chi( "style_tai_chi" );
-static const matype_id style_tiger( "style_tiger" );
-static const matype_id style_wingchun( "style_wingchun" );
-static const matype_id style_zui_quan( "style_zui_quan" );
-
-static const species_id ABERRATION( "ABERRATION" );
-static const species_id species_BLOB( "BLOB" );
-static const species_id FISH( "FISH" );
-static const species_id FUNGUS( "FUNGUS" );
-static const species_id HALLUCINATION( "HALLUCINATION" );
-static const species_id HUMAN( "HUMAN" );
-static const species_id INSECT( "INSECT" );
-static const species_id LEECH_PLANT( "LEECH_PLANT" );
-static const species_id MAMMAL( "MAMMAL" );
-static const species_id MOLLUSK( "MOLLUSK" );
-static const species_id PLANT( "PLANT" );
-static const species_id ROBOT( "ROBOT" );
-static const species_id SPIDER( "SPIDER" );
-static const species_id ZOMBIE( "ZOMBIE" );
-
-static const matec_id tec_none( "tec_none" );
-static const matec_id WBLOCK_1( "WBLOCK_1" );
-static const matec_id WBLOCK_2( "WBLOCK_2" );
-static const matec_id WBLOCK_3( "WBLOCK_3" );
-static const matec_id WHIP_DISARM( "WHIP_DISARM" );
-
-static const ter_str_id ter_dirt( "t_dirt" );
-static const ter_str_id ter_grass_dead( "t_grass_dead" );
-static const ter_str_id ter_stump( "t_stump" );
-static const ter_str_id ter_tree_dead( "t_tree_dead" );
-static const ter_str_id ter_tree_deadpine( "t_tree_deadpine" );
-static const ter_str_id ter_tree_birch_harvested( "t_tree_birch_harvested" );
-static const ter_str_id ter_tree_willow_harvested( "t_tree_willow_harvested" );
-static const ter_str_id ter_tree_hickory_dead( "t_tree_hickory_dead" );
-static const ter_str_id ter_trunk( "t_trunk" );
-
-static const std::string part_location_structure( "structure" );
-static const std::string part_location_center( "center" );
-static const std::string part_location_onroof( "on_roof" );
-
-static const std::string GUN_MODE_VAR_NAME( "item::mode" );
-static const std::string CLOTHING_MOD_VAR_PREFIX( "clothing_mod_" );
-
-static const faction_id your_followers( "your_followers" );
-static const faction_id no_faction( "no_faction" );
-
-static const std::string errstring( "ERROR" );
-
-static const ammotype ammo_battery( "battery" );
-static const ammotype ammo_reactor_slurry( "reactor_slurry" );
-static const ammotype ammo_plutonium( "plutonium" );
-
-const vitamin_id vitamin_iron( "iron" );
-
-static const std::string null_item_id( "null" );
-
 #endif // STRING_CONSTS_H
diff --git a/src/character.cpp b/src/character.cpp
index 1ea3a9d5ce164..16c2f74da43bb 100644
--- a/src/character.cpp
+++ b/src/character.cpp
@@ -68,6 +68,14 @@
 #include "vitamin.h"
 #include "vpart_position.h"
 
+static const trait_id trait_DEBUG_NODMG( "DEBUG_NODMG" );
+
+static const skill_id skill_dodge( "dodge" );
+static const skill_id skill_throw( "throw" );
+
+static const species_id HUMAN( "HUMAN" );
+static const species_id ROBOT( "ROBOT" );
+
 // *INDENT-OFF*
 Character::Character() :
 
@@ -5468,7 +5476,7 @@ nc_color Character::symbol_color() const
 bool Character::is_immune_field( const field_type_id &fid ) const
 {
     // Obviously this makes us invincible
-    if( has_trait( debug_nodmg ) ) {
+    if( has_trait( trait_DEBUG_NODMG ) ) {
         return true;
     }
     // Check to see if we are immune
diff --git a/src/character_martial_arts.cpp b/src/character_martial_arts.cpp
index 074bc552f98f7..5d3f6a7057048 100644
--- a/src/character_martial_arts.cpp
+++ b/src/character_martial_arts.cpp
@@ -5,7 +5,9 @@
 #include "martialarts.h"
 #include "messages.h"
 #include "output.h"
-#include "cata_string_consts.h"
+
+static const matype_id style_kicks( "style_kicks" );
+static const matype_id style_none( "style_none" );
 
 using itype_id = std::string;
 
diff --git a/src/computer_session.cpp b/src/computer_session.cpp
index d649844100d63..46e173461a8b7 100644
--- a/src/computer_session.cpp
+++ b/src/computer_session.cpp
@@ -52,6 +52,11 @@
 #include "type_id.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_computer( "computer" );
+
+static const species_id HUMAN( "HUMAN" );
+static const species_id ZOMBIE( "ZOMBIE" );
+
 static catacurses::window init_window()
 {
     const int width = std::min( FULL_SCREEN_WIDTH, TERMX );
diff --git a/src/construction.cpp b/src/construction.cpp
index f464a6f665344..08a3d14771df3 100644
--- a/src/construction.cpp
+++ b/src/construction.cpp
@@ -54,6 +54,15 @@
 #include "units.h"
 #include "cata_string_consts.h"
 
+static const trap_str_id tr_firewood_source( "tr_firewood_source" );
+static const trap_str_id tr_practice_target( "tr_practice_target" );
+static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );
+
+static const skill_id skill_electronics( "electronics" );
+static const skill_id skill_fabrication( "fabrication" );
+
+static const quality_id qual_CUT( "CUT" );
+
 class inventory;
 
 static bool finalized = false;
diff --git a/src/consumption.cpp b/src/consumption.cpp
index 8fad30d0d6ed0..9adc142f07e89 100644
--- a/src/consumption.cpp
+++ b/src/consumption.cpp
@@ -38,6 +38,12 @@
 #include "flat_set.h"
 #include "cata_string_consts.h"
 
+static const std::string comesttype_DRINK( "DRINK" );
+static const std::string comesttype_FOOD( "FOOD" );
+
+static const skill_id skill_cooking( "cooking" );
+static const skill_id skill_survival( "survival" );
+
 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 54aa545aabe0d..d89cc4e82dfe5 100644
--- a/src/crafting.cpp
+++ b/src/crafting.cpp
@@ -70,6 +70,9 @@
 #include "weather.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_electronics( "electronics" );
+static const skill_id skill_tailor( "tailor" );
+
 class basecamp;
 
 void drop_or_handle( const item &newit, player &p );
diff --git a/src/descriptions.cpp b/src/descriptions.cpp
index 050c6db1e8d47..de233adc0ca26 100644
--- a/src/descriptions.cpp
+++ b/src/descriptions.cpp
@@ -17,6 +17,8 @@
 #include "string_id.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_survival( "survival" );
+
 enum class description_target : int {
     creature,
     furniture,
diff --git a/src/explosion.cpp b/src/explosion.cpp
index a9836a893df07..766ad23623e62 100644
--- a/src/explosion.cpp
+++ b/src/explosion.cpp
@@ -61,6 +61,10 @@
 #include "type_id.h"
 #include "cata_string_consts.h"
 
+static const itype_id fuel_type_none( "null" );
+
+static const species_id ROBOT( "ROBOT" );
+
 // Global to smuggle data into shrapnel_calc() function without replicating it across entire map.
 // Mass in kg
 float fragment_mass = 0.0001;
diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp
index 3e4008c399b98..7318e1e2c0da5 100644
--- a/src/faction_camp.cpp
+++ b/src/faction_camp.cpp
@@ -75,6 +75,23 @@
 #include "weather.h"
 #include "cata_string_consts.h"
 
+static const zone_type_id zone_type_camp_food( "CAMP_FOOD" );
+static const zone_type_id zone_type_camp_storage( "CAMP_STORAGE" );
+
+static const skill_id skill_bashing( "bashing" );
+static const skill_id skill_cutting( "cutting" );
+static const skill_id skill_dodge( "dodge" );
+static const skill_id skill_fabrication( "fabrication" );
+static const skill_id skill_gun( "gun" );
+static const skill_id skill_mechanics( "mechanics" );
+static const skill_id skill_melee( "melee" );
+static const skill_id skill_speech( "speech" );
+static const skill_id skill_stabbing( "stabbing" );
+static const skill_id skill_survival( "survival" );
+static const skill_id skill_swimming( "swimming" );
+static const skill_id skill_traps( "traps" );
+static const skill_id skill_unarmed( "unarmed" );
+
 struct mass_volume {
     units::mass wgt;
     units::volume vol;
@@ -586,8 +603,8 @@ void talk_function::basecamp_mission( npc &p )
         }
         tripoint src_loc;
         const auto abspos = p.global_square_location();
-        if( mgr.has_near( z_camp_storage, abspos, 60 ) ) {
-            const auto &src_set = mgr.get_near( z_camp_storage, abspos );
+        if( mgr.has_near( zone_type_camp_storage, abspos, 60 ) ) {
+            const auto &src_set = mgr.get_near( zone_type_camp_storage, abspos );
             const auto &src_sorted = get_sorted_tiles_by_distance( abspos, src_set );
             // Find the nearest unsorted zone to dump objects at
             for( auto &src : src_sorted ) {
@@ -3373,14 +3390,15 @@ bool basecamp::validate_sort_points()
     }
     tripoint src_loc = bb_pos + point_north;
     const tripoint abspos = g->m.getabs( g->u.pos() );
-    if( !mgr.has_near( z_camp_storage, abspos, 60 ) || !mgr.has_near( z_camp_food, abspos, 60 ) ) {
+    if( !mgr.has_near( zone_type_camp_storage, abspos, 60 ) ||
+        !mgr.has_near( zone_type_camp_food, abspos, 60 ) ) {
         if( query_yn( _( "You do not have sufficient sort zones.  Do you want to add them?" ) ) ) {
             return set_sort_points();
         } else {
             return false;
         }
     } else {
-        const std::unordered_set<tripoint> &src_set = mgr.get_near( z_camp_storage, abspos );
+        const std::unordered_set<tripoint> &src_set = mgr.get_near( zone_type_camp_storage, abspos );
         const std::vector<tripoint> &src_sorted = get_sorted_tiles_by_distance( abspos, src_set );
         // Find the nearest unsorted zone to dump objects at
         for( auto &src : src_sorted ) {
@@ -3674,7 +3692,7 @@ bool basecamp::distribute_food()
         mgr.cache_vzones();
     }
     const tripoint &abspos = get_dumping_spot();
-    const std::unordered_set<tripoint> &z_food = mgr.get_near( z_camp_food, abspos, 60 );
+    const std::unordered_set<tripoint> &z_food = mgr.get_near( zone_type_camp_food, abspos, 60 );
 
     tripoint p_litter = omt_to_sm_copy( omt_pos ) + point( -7, 0 );
 
@@ -3768,8 +3786,8 @@ void basecamp::place_results( item result )
             mgr.cache_vzones();
         }
         const auto abspos = g->m.getabs( g->u.pos() );
-        if( mgr.has_near( z_camp_storage, abspos ) ) {
-            const auto &src_set = mgr.get_near( z_camp_storage, abspos );
+        if( mgr.has_near( zone_type_camp_storage, abspos ) ) {
+            const auto &src_set = mgr.get_near( zone_type_camp_storage, abspos );
             const auto &src_sorted = get_sorted_tiles_by_distance( abspos, src_set );
             // Find the nearest unsorted zone to dump objects at
             for( auto &src : src_sorted ) {
diff --git a/src/fungal_effects.cpp b/src/fungal_effects.cpp
index 5cb1c65ad39ad..fc20a7b44cbcb 100644
--- a/src/fungal_effects.cpp
+++ b/src/fungal_effects.cpp
@@ -30,6 +30,10 @@
 #include "string_formatter.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_melee( "melee" );
+
+static const species_id FUNGUS( "FUNGUS" );
+
 fungal_effects::fungal_effects( game &g, map &mp )
     : gm( g ), m( mp )
 {
diff --git a/src/game_inventory.cpp b/src/game_inventory.cpp
index 879fa6e93f6c3..7b57c79dbc383 100644
--- a/src/game_inventory.cpp
+++ b/src/game_inventory.cpp
@@ -48,6 +48,14 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
+
+static const skill_id skill_computer( "computer" );
+static const skill_id skill_electronics( "electronics" );
+static const skill_id skill_firstaid( "firstaid" );
+
+static const quality_id qual_ANESTHESIA( "ANESTHESIA" );
+
 class Character;
 
 using item_filter = std::function<bool ( const item & )>;
diff --git a/src/gamemode_defense.cpp b/src/gamemode_defense.cpp
index 1bfa46967c210..e1dc01b767096 100644
--- a/src/gamemode_defense.cpp
+++ b/src/gamemode_defense.cpp
@@ -35,6 +35,8 @@
 #include "weather.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_barter( "barter" );
+
 #define SPECIAL_WAVE_CHANCE 5 // One in X chance of single-flavor wave
 #define SPECIAL_WAVE_MIN 5 // Don't use a special wave with < X monsters
 
diff --git a/src/gamemode_tutorial.cpp b/src/gamemode_tutorial.cpp
index e669d1bf99b98..64946c71c4255 100644
--- a/src/gamemode_tutorial.cpp
+++ b/src/gamemode_tutorial.cpp
@@ -33,6 +33,9 @@
 #include "weather.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_gun( "gun" );
+static const skill_id skill_melee( "melee" );
+
 static std::vector<translation> tut_text;
 
 bool tutorial_game::init()
diff --git a/src/handle_action.cpp b/src/handle_action.cpp
index 9b90e13580406..2edad3dd0db1a 100644
--- a/src/handle_action.cpp
+++ b/src/handle_action.cpp
@@ -68,6 +68,10 @@
 #include "item.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_melee( "melee" );
+
+static const quality_id qual_CUT( "CUT" );
+
 #define dbg(x) DebugLog((x),D_GAME) << __FILE__ << ":" << __LINE__ << ": "
 
 #if defined(__ANDROID__)
diff --git a/src/iexamine.cpp b/src/iexamine.cpp
index 912ccaffa53ad..a0eedc785350d 100644
--- a/src/iexamine.cpp
+++ b/src/iexamine.cpp
@@ -88,6 +88,19 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );
+
+static const skill_id skill_computer( "computer" );
+static const skill_id skill_cooking( "cooking" );
+static const skill_id skill_electronics( "electronics" );
+static const skill_id skill_fabrication( "fabrication" );
+static const skill_id skill_firstaid( "firstaid" );
+static const skill_id skill_mechanics( "mechanics" );
+static const skill_id skill_survival( "survival" );
+
+static const quality_id qual_ANESTHESIA( "ANESTHESIA" );
+static const quality_id qual_DIG( "DIG" );
+
 static void pick_plant( player &p, const tripoint &examp, const std::string &itemType,
                         ter_id new_ter,
                         bool seeds = false );
diff --git a/src/item.cpp b/src/item.cpp
index b64f75b17bed5..f0b6d54e84190 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -87,6 +87,24 @@
 #include "clothing_mod.h"
 #include "cata_string_consts.h"
 
+static const std::string GUN_MODE_VAR_NAME( "item::mode" );
+static const std::string CLOTHING_MOD_VAR_PREFIX( "clothing_mod_" );
+
+static const ammotype ammo_battery( "battery" );
+static const ammotype ammo_plutonium( "plutonium" );
+
+static const fault_id fault_gun_blackpowder( "fault_gun_blackpowder" );
+
+static const skill_id skill_cooking( "cooking" );
+static const skill_id skill_melee( "melee" );
+static const skill_id skill_survival( "survival" );
+static const skill_id skill_unarmed( "unarmed" );
+static const skill_id skill_weapon( "weapon" );
+
+static const quality_id qual_JACK( "JACK" );
+static const quality_id qual_LIFT( "LIFT" );
+static const species_id ROBOT( "ROBOT" );
+
 class npc_class;
 
 using npc_class_id = string_id<npc_class>;
@@ -9442,7 +9460,7 @@ bool item::has_infinite_charges() const
 skill_id item::contextualize_skill( const skill_id &id ) const
 {
     if( id->is_contextual_skill() ) {
-        if( id == weapon_skill ) {
+        if( id == skill_weapon ) {
             if( is_gun() ) {
                 return gun_skill();
             } else if( is_melee() ) {
diff --git a/src/item_action.cpp b/src/item_action.cpp
index 94fb5a02d1510..2ad5319a6e671 100644
--- a/src/item_action.cpp
+++ b/src/item_action.cpp
@@ -30,6 +30,8 @@
 #include "type_id.h"
 #include "cata_string_consts.h"
 
+static const std::string errstring( "ERROR" );
+
 struct tripoint;
 
 static item_action nullaction;
diff --git a/src/item_group.cpp b/src/item_group.cpp
index f96055c3121d5..7a710c9ce3e98 100644
--- a/src/item_group.cpp
+++ b/src/item_group.cpp
@@ -18,6 +18,8 @@
 #include "flat_set.h"
 #include "cata_string_consts.h"
 
+static const std::string null_item_id( "null" );
+
 Item_spawn_data::ItemList Item_spawn_data::create( const time_point &birthday ) const
 {
     RecursionList rec;
diff --git a/src/iuse.cpp b/src/iuse.cpp
index a55c1c61d95d3..1d27e579fab2f 100644
--- a/src/iuse.cpp
+++ b/src/iuse.cpp
@@ -102,6 +102,24 @@
 #include "teleport.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_computer( "computer" );
+static const skill_id skill_cooking( "cooking" );
+static const skill_id skill_electronics( "electronics" );
+static const skill_id skill_fabrication( "fabrication" );
+static const skill_id skill_firstaid( "firstaid" );
+static const skill_id skill_mechanics( "mechanics" );
+static const skill_id skill_melee( "melee" );
+static const skill_id skill_survival( "survival" );
+
+static const quality_id qual_AXE( "AXE" );
+static const quality_id qual_DIG( "DIG" );
+
+static const species_id FUNGUS( "FUNGUS" );
+static const species_id HALLUCINATION( "HALLUCINATION" );
+static const species_id INSECT( "INSECT" );
+static const species_id ROBOT( "ROBOT" );
+static const species_id ZOMBIE( "ZOMBIE" );
+
 #define RADIO_PER_TURN 25 // how many characters per turn of radio
 
 #include "iuse_software.h"
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
index 6820dc169e89d..6c6072d8d8c29 100644
--- a/src/iuse_actor.cpp
+++ b/src/iuse_actor.cpp
@@ -77,6 +77,16 @@
 #include "clothing_mod.h"
 #include "cata_string_consts.h"
 
+static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
+
+static const skill_id skill_fabrication( "fabrication" );
+static const skill_id skill_firstaid( "firstaid" );
+static const skill_id skill_mechanics( "mechanics" );
+static const skill_id skill_survival( "survival" );
+
+static const species_id HUMAN( "HUMAN" );
+static const species_id ZOMBIE( "ZOMBIE" );
+
 class npc;
 
 std::unique_ptr<iuse_actor> iuse_transform::clone() const
diff --git a/src/map_extras.cpp b/src/map_extras.cpp
index caf08d0a45d4b..5550dd46e5e12 100644
--- a/src/map_extras.cpp
+++ b/src/map_extras.cpp
@@ -52,6 +52,15 @@
 #include "rng.h"
 #include "cata_string_consts.h"
 
+static const ter_str_id ter_dirt( "t_dirt" );
+static const ter_str_id ter_grass_dead( "t_grass_dead" );
+static const ter_str_id ter_stump( "t_stump" );
+static const ter_str_id ter_tree_dead( "t_tree_dead" );
+static const ter_str_id ter_tree_deadpine( "t_tree_deadpine" );
+static const ter_str_id ter_tree_birch_harvested( "t_tree_birch_harvested" );
+static const ter_str_id ter_tree_hickory_dead( "t_tree_hickory_dead" );
+static const ter_str_id ter_trunk( "t_trunk" );
+
 class npc_template;
 
 namespace io
diff --git a/src/map_field.cpp b/src/map_field.cpp
index a7c5529b087cb..7a339d560136e 100644
--- a/src/map_field.cpp
+++ b/src/map_field.cpp
@@ -61,6 +61,10 @@
 #include "teleport.h"
 #include "cata_string_consts.h"
 
+static const species_id FUNGUS( "FUNGUS" );
+static const species_id INSECT( "INSECT" );
+static const species_id SPIDER( "SPIDER" );
+
 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/martialarts.cpp b/src/martialarts.cpp
index eb2e4fecba27b..1f05bc8a592d7 100644
--- a/src/martialarts.cpp
+++ b/src/martialarts.cpp
@@ -31,6 +31,8 @@
 #include "optional.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_unarmed( "unarmed" );
+
 namespace
 {
 generic_factory<ma_technique> ma_techniques( "martial art technique" );
diff --git a/src/mission_companion.cpp b/src/mission_companion.cpp
index 60d58886562b2..90a7d1686780a 100644
--- a/src/mission_companion.cpp
+++ b/src/mission_companion.cpp
@@ -59,6 +59,16 @@
 #include "weather.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_bashing( "bashing" );
+static const skill_id skill_cutting( "cutting" );
+static const skill_id skill_dodge( "dodge" );
+static const skill_id skill_fabrication( "fabrication" );
+static const skill_id skill_gun( "gun" );
+static const skill_id skill_melee( "melee" );
+static const skill_id skill_stabbing( "stabbing" );
+static const skill_id skill_survival( "survival" );
+static const skill_id skill_unarmed( "unarmed" );
+
 struct comp_rank {
     int industry;
     int combat;
diff --git a/src/monattack.cpp b/src/monattack.cpp
index 881eff257d1a3..a8d493645e6de 100644
--- a/src/monattack.cpp
+++ b/src/monattack.cpp
@@ -74,6 +74,16 @@
 #include "units.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_gun( "gun" );
+static const skill_id skill_launcher( "launcher" );
+static const skill_id skill_melee( "melee" );
+static const skill_id skill_rifle( "rifle" );
+static const skill_id skill_unarmed( "unarmed" );
+
+static const species_id species_BLOB( "BLOB" );
+static const species_id LEECH_PLANT( "LEECH_PLANT" );
+static const species_id ZOMBIE( "ZOMBIE" );
+
 // shared utility functions
 static bool within_visual_range( monster *z, int max_range )
 {
diff --git a/src/mondeath.cpp b/src/mondeath.cpp
index e7062b5af921a..038e37da2cbc9 100644
--- a/src/mondeath.cpp
+++ b/src/mondeath.cpp
@@ -49,6 +49,9 @@
 #include "mattack_actors.h"
 #include "cata_string_consts.h"
 
+static const species_id species_BLOB( "BLOB" );
+static const species_id ZOMBIE( "ZOMBIE" );
+
 void mdeath::normal( monster &z )
 {
     if( z.no_corpse_quiet ) {
diff --git a/src/mondefense.cpp b/src/mondefense.cpp
index 8035940b1e373..e675cc7ce869f 100644
--- a/src/mondefense.cpp
+++ b/src/mondefense.cpp
@@ -27,7 +27,9 @@
 #include "enums.h"
 #include "item.h"
 #include "point.h"
-#include "cata_string_consts.h"
+
+static const skill_id skill_gun( "gun" );
+static const skill_id skill_rifle( "rifle" );
 
 void mdefense::none( monster &, Creature *, const dealt_projectile_attack * )
 {
diff --git a/src/monexamine.cpp b/src/monexamine.cpp
index 3bc628a2f3695..b66d291f7e740 100644
--- a/src/monexamine.cpp
+++ b/src/monexamine.cpp
@@ -38,6 +38,10 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_survival( "survival" );
+
+static const species_id ZOMBIE( "ZOMBIE" );
+
 bool monexamine::pet_menu( monster &z )
 {
     enum choices {
diff --git a/src/monmove.cpp b/src/monmove.cpp
index 36a5dc8edc99b..8570316d25b2c 100644
--- a/src/monmove.cpp
+++ b/src/monmove.cpp
@@ -42,6 +42,11 @@
 #include "string_formatter.h"
 #include "cata_string_consts.h"
 
+static const species_id FUNGUS( "FUNGUS" );
+static const species_id INSECT( "INSECT" );
+static const species_id SPIDER( "SPIDER" );
+static const species_id ZOMBIE( "ZOMBIE" );
+
 #define MONSTER_FOLLOW_DIST 8
 
 bool monster::wander()
diff --git a/src/monster.cpp b/src/monster.cpp
index e2f6c2fb120ab..c6c05342e25a4 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -55,6 +55,15 @@
 #include "weather.h"
 #include "cata_string_consts.h"
 
+static const species_id FISH( "FISH" );
+static const species_id FUNGUS( "FUNGUS" );
+static const species_id INSECT( "INSECT" );
+static const species_id MAMMAL( "MAMMAL" );
+static const species_id MOLLUSK( "MOLLUSK" );
+static const species_id ROBOT( "ROBOT" );
+static const species_id SPIDER( "SPIDER" );
+static const species_id ZOMBIE( "ZOMBIE" );
+
 struct pathfinding_settings;
 
 // Limit the number of iterations for next upgrade_time calculations.
diff --git a/src/mtype.cpp b/src/mtype.cpp
index fe3780a22e7e3..a312e5e2d2a19 100644
--- a/src/mtype.cpp
+++ b/src/mtype.cpp
@@ -11,7 +11,8 @@
 #include "monstergenerator.h"
 #include "translations.h"
 #include "mapdata.h"
-#include "cata_string_consts.h"
+
+static const species_id MOLLUSK( "MOLLUSK" );
 
 mtype::mtype()
 {
diff --git a/src/npc.cpp b/src/npc.cpp
index bf6fedbc81fac..5daca76c2d9c9 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -65,6 +65,17 @@
 #include "stomach.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_archery( "archery" );
+static const skill_id skill_barter( "barter" );
+static const skill_id skill_bashing( "bashing" );
+static const skill_id skill_cutting( "cutting" );
+static const skill_id skill_pistol( "pistol" );
+static const skill_id skill_rifle( "rifle" );
+static const skill_id skill_shotgun( "shotgun" );
+static const skill_id skill_smg( "smg" );
+static const skill_id skill_stabbing( "stabbing" );
+static const skill_id skill_throw( "throw" );
+
 class basecamp;
 class monfaction;
 
diff --git a/src/npcmove.cpp b/src/npcmove.cpp
index de50ef02b9263..9a6019d53a2b9 100644
--- a/src/npcmove.cpp
+++ b/src/npcmove.cpp
@@ -63,6 +63,11 @@
 #include "stomach.h"
 #include "cata_string_consts.h"
 
+static const ammotype ammo_reactor_slurry( "reactor_slurry" );
+static const ammotype ammo_plutonium( "plutonium" );
+
+static const skill_id skill_firstaid( "firstaid" );
+
 static constexpr float NPC_DANGER_VERY_LOW = 5.0f;
 static constexpr float NPC_DANGER_MAX = 150.0f;
 static constexpr float MAX_FLOAT = 5000000000.0f;
@@ -2606,7 +2611,7 @@ void npc::find_item()
     //int range = sight_range( g->light_level( posz() ) );
     //range = std::max( 1, std::min( 12, range ) );
 
-    static const zone_type_id no_pickup( "NO_NPC_PICKUP" );
+    static const zone_type_id zone_type_no_npc_pickup( "NO_NPC_PICKUP" );
 
     const item *wanted = nullptr;
 
@@ -2676,7 +2681,7 @@ void npc::find_item()
     for( const tripoint &p : closest_tripoints_first( pos(), range ) ) {
         // TODO: Make this sight check not overdraw nearby tiles
         // TODO: Optimize that zone check
-        if( is_player_ally() && g->check_zone( no_pickup, p ) ) {
+        if( is_player_ally() && g->check_zone( zone_type_no_npc_pickup, p ) ) {
             continue;
         }
 
diff --git a/src/npctalk.cpp b/src/npctalk.cpp
index acb04f8226bf9..378d5a1fe1ffb 100644
--- a/src/npctalk.cpp
+++ b/src/npctalk.cpp
@@ -74,6 +74,13 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const itype_id fuel_type_animal( "animal" );
+
+static const zone_type_id zone_type_npc_investigate_only( "NPC_INVESTIGATE_ONLY" );
+static const zone_type_id zone_type_npc_no_investigate( "NPC_NO_INVESTIGATE" );
+
+static const skill_id skill_speech( "speech" );
+
 class basecamp;
 
 static std::map<std::string, json_talk_topic> json_talk_topics;
@@ -599,10 +606,10 @@ void npc::handle_sound( const sounds::sound_t spriority, const std::string &desc
             bool should_check = rl_dist( pos(), spos ) < investigate_dist;
             if( should_check ) {
                 const zone_manager &mgr = zone_manager::get_manager();
-                if( mgr.has( zone_no_investigate, s_abs_pos, fac_id ) ) {
+                if( mgr.has( zone_type_npc_no_investigate, s_abs_pos, fac_id ) ) {
                     should_check = false;
-                } else if( mgr.has( zone_investigate_only, my_abs_pos, fac_id ) &&
-                           !mgr.has( zone_investigate_only, s_abs_pos, fac_id ) ) {
+                } else if( mgr.has( zone_type_npc_investigate_only, my_abs_pos, fac_id ) &&
+                           !mgr.has( zone_type_npc_investigate_only, s_abs_pos, fac_id ) ) {
                     should_check = false;
                 }
             }
diff --git a/src/npctrade.cpp b/src/npctrade.cpp
index a161ccecb5bf1..90ca0cc5da79f 100644
--- a/src/npctrade.cpp
+++ b/src/npctrade.cpp
@@ -31,9 +31,10 @@
 #include "type_id.h"
 #include "faction.h"
 #include "pimpl.h"
-#include "cata_string_consts.h"
 #include "item_category.h"
 
+static const skill_id skill_barter( "barter" );
+
 void npc_trading::transfer_items( std::vector<item_pricing> &stuff, player &giver,
                                   player &receiver, std::list<item_location *> &from_map,
                                   bool npc_gives )
diff --git a/src/overmap.cpp b/src/overmap.cpp
index 555b786d0b879..cf7cb9db7b3e7 100644
--- a/src/overmap.cpp
+++ b/src/overmap.cpp
@@ -51,6 +51,8 @@
 #include "string_formatter.h"
 #include "cata_string_consts.h"
 
+static const species_id ZOMBIE( "ZOMBIE" );
+
 class map_extra;
 
 #define dbg(x) DebugLog((x),D_MAP_GEN) << __FILE__ << ":" << __LINE__ << ": "
diff --git a/src/player.cpp b/src/player.cpp
index b0e4e7ee05fbf..88e9106d05755 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -98,7 +98,12 @@
 #include "flat_set.h"
 #include "stomach.h"
 #include "teleport.h"
-#include "cata_string_consts.h"
+
+static const trait_id trait_DEBUG_NODMG( "DEBUG_NODMG" );
+
+static const skill_id skill_dodge( "dodge" );
+static const skill_id skill_gun( "gun" );
+static const skill_id skill_swimming( "swimming" );
 
 const double MAX_RECOIL = 3000;
 
diff --git a/src/player_hardcoded_effects.cpp b/src/player_hardcoded_effects.cpp
index 18d492f81925c..02aa3c1b23c96 100644
--- a/src/player_hardcoded_effects.cpp
+++ b/src/player_hardcoded_effects.cpp
@@ -39,6 +39,8 @@
 #include <functional>
 #include <algorithm>
 
+const vitamin_id vitamin_iron( "iron" );
+
 static void eff_fun_onfire( player &u, effect &it )
 {
     const int intense = it.get_intensity();
diff --git a/src/ranged.cpp b/src/ranged.cpp
index 90d4811d0c906..732a86317b3ce 100644
--- a/src/ranged.cpp
+++ b/src/ranged.cpp
@@ -65,6 +65,19 @@
 #include "skill.h"
 #include "cata_string_consts.h"
 
+static const trap_str_id tr_practice_target( "tr_practice_target" );
+
+static const fault_id fault_gun_blackpowder( "fault_gun_blackpowder" );
+static const fault_id fault_gun_chamber_spent( "fault_gun_chamber_spent" );
+static const fault_id fault_gun_dirt( "fault_gun_dirt" );
+static const fault_id fault_gun_unlubricated( "fault_gun_unlubricated" );
+
+static const skill_id skill_dodge( "dodge" );
+static const skill_id skill_driving( "driving" );
+static const skill_id skill_gun( "gun" );
+static const skill_id skill_launcher( "launcher" );
+static const skill_id skill_throw( "throw" );
+
 static projectile make_gun_projectile( const item &gun );
 int time_to_attack( const Character &p, const itype &firing );
 static void cycle_action( item &weap, const tripoint &pos );
diff --git a/src/trap.cpp b/src/trap.cpp
index 256a5f505217f..48dcba841a1e4 100644
--- a/src/trap.cpp
+++ b/src/trap.cpp
@@ -23,6 +23,8 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_traps( "traps" );
+
 namespace
 {
 
diff --git a/src/trapfunc.cpp b/src/trapfunc.cpp
index 61b1daefeb034..da0f4eda0d55e 100644
--- a/src/trapfunc.cpp
+++ b/src/trapfunc.cpp
@@ -35,6 +35,10 @@
 #include "teleport.h"
 #include "cata_string_consts.h"
 
+static const skill_id skill_throw( "throw" );
+
+static const species_id ROBOT( "ROBOT" );
+
 // A pit becomes less effective as it fills with corpses.
 static float pit_effectiveness( const tripoint &p )
 {
diff --git a/src/turret.cpp b/src/turret.cpp
index 22a085a543d36..4b019e7b9a11b 100644
--- a/src/turret.cpp
+++ b/src/turret.cpp
@@ -26,6 +26,8 @@
 #include "vpart_range.h"
 #include "cata_string_consts.h"
 
+static const itype_id fuel_type_battery( "battery" );
+
 std::vector<vehicle_part *> vehicle::turrets()
 {
     std::vector<vehicle_part *> res;
diff --git a/src/veh_interact.cpp b/src/veh_interact.cpp
index 65eaafc51ed45..712e387f3c932 100644
--- a/src/veh_interact.cpp
+++ b/src/veh_interact.cpp
@@ -59,6 +59,14 @@
 #include "material.h"
 #include "cata_string_consts.h"
 
+static const itype_id fuel_type_battery( "battery" );
+
+static const skill_id skill_mechanics( "mechanics" );
+
+static const quality_id qual_JACK( "JACK" );
+static const quality_id qual_LIFT( "LIFT" );
+static const quality_id qual_SELF_JACK( "SELF_JACK" );
+
 class player;
 
 static inline std::string status_color( bool status )
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 075fd9ab73d1a..57424b822ae3c 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -62,13 +62,26 @@
  * Speed up all those if ( blarg == "structure" ) statements that are used everywhere;
  *   assemble "structure" once here instead of repeatedly later.
  */
+static const std::string part_location_structure( "structure" );
+static const std::string part_location_center( "center" );
+static const std::string part_location_onroof( "on_roof" );
+
+static const itype_id fuel_type_animal( "animal" );
+static const itype_id fuel_type_battery( "battery" );
+static const itype_id fuel_type_muscle( "muscle" );
+static const itype_id fuel_type_plutonium_cell( "plut_cell" );
+static const itype_id fuel_type_wind( "wind" );
+
+static const fault_id fault_belt( "fault_engine_belt_drive" );
+static const fault_id fault_filter_air( "fault_engine_filter_air" );
+static const fault_id fault_filter_fuel( "fault_engine_filter_fuel" );
+static const fault_id fault_immobiliser( "fault_engine_immobiliser" );
 
 static bool is_sm_tile_outside( const tripoint &real_global_pos );
 static bool is_sm_tile_over_water( const tripoint &real_global_pos );
 
 // 1 kJ per battery charge
 const int bat_energy_j = 1000;
-//
 
 // For reference what each function is supposed to do, see their implementation in
 // @ref DefaultRemovePartHandler. Add compatible code for it into @ref MapgenRemovePartHandler,
diff --git a/src/vehicle_move.cpp b/src/vehicle_move.cpp
index dfeaaebdb052d..c681fe9e822ce 100644
--- a/src/vehicle_move.cpp
+++ b/src/vehicle_move.cpp
@@ -38,6 +38,12 @@
 
 #define dbg(x) DebugLog((x),D_MAP) << __FILE__ << ":" << __LINE__ << ": "
 
+static const itype_id fuel_type_muscle( "muscle" );
+static const itype_id fuel_type_animal( "animal" );
+
+static const skill_id skill_driving( "driving" );
+
+static const std::string part_location_structure( "structure" );
 // tile height in meters
 static const float tile_height = 4;
 // miles per hour to vehicle 100ths of miles per hour
diff --git a/src/vehicle_part.cpp b/src/vehicle_part.cpp
index e0ec7c28d48c1..810915b0d2df2 100644
--- a/src/vehicle_part.cpp
+++ b/src/vehicle_part.cpp
@@ -24,7 +24,9 @@
 #include "color.h"
 #include "enums.h"
 #include "flat_set.h"
-#include "cata_string_consts.h"
+
+static const itype_id fuel_type_battery( "battery" );
+static const itype_id fuel_type_none( "null" );
 
 /*-----------------------------------------------------------------------------
  *                              VEHICLE_PART
diff --git a/src/vehicle_use.cpp b/src/vehicle_use.cpp
index e14c4f5253297..96df8ae81fba5 100644
--- a/src/vehicle_use.cpp
+++ b/src/vehicle_use.cpp
@@ -54,6 +54,19 @@
 #include "weather.h"
 #include "cata_string_consts.h"
 
+static const itype_id fuel_type_battery( "battery" );
+static const itype_id fuel_type_muscle( "muscle" );
+static const itype_id fuel_type_none( "null" );
+static const itype_id fuel_type_wind( "wind" );
+
+static const fault_id fault_diesel( "fault_engine_pump_diesel" );
+static const fault_id fault_glowplug( "fault_engine_glow_plug" );
+static const fault_id fault_immobiliser( "fault_engine_immobiliser" );
+static const fault_id fault_pump( "fault_engine_pump_fuel" );
+static const fault_id fault_starter( "fault_engine_starter" );
+
+static const skill_id skill_mechanics( "mechanics" );
+
 enum change_types : int {
     OPENCURTAINS = 0,
     OPENBOTH,
diff --git a/src/visitable.cpp b/src/visitable.cpp
index 279effe7e4b4b..b1184a65555db 100644
--- a/src/visitable.cpp
+++ b/src/visitable.cpp
@@ -27,6 +27,8 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const quality_id qual_BUTCHER( "BUTCHER" );
+
 /** @relates visitable */
 template <typename T>
 item *visitable<T>::find_parent( const item &it )
diff --git a/tests/food_fun_for_test.cpp b/tests/food_fun_for_test.cpp
index b38f225bf0d6f..000c6279652f5 100644
--- a/tests/food_fun_for_test.cpp
+++ b/tests/food_fun_for_test.cpp
@@ -1,10 +1,19 @@
 #include "avatar.h"
-#include "cata_string_consts.h"
 #include "catch/catch.hpp"
 #include "itype.h"
 #include "player_helpers.h"
 #include "type_id.h"
 
+static const bionic_id bio_taste_blocker( "bio_taste_blocker" );
+
+static const std::string flag_COLD( "COLD" );
+static const std::string flag_EATEN_COLD( "EATEN_COLD" );
+static const std::string flag_FELINE( "FELINE" );
+static const std::string flag_FROZEN( "FROZEN" );
+static const std::string flag_LUPINE( "LUPINE" );
+static const std::string flag_MELTS( "MELTS" );
+static const trait_id trait_THRESH_FELINE( "THRESH_FELINE" );
+static const trait_id trait_THRESH_LUPINE( "THRESH_LUPINE" );
 
 // Test cases for `Character::fun_for` defined in `src/consumption.cpp`
 
diff --git a/tests/item_tname_test.cpp b/tests/item_tname_test.cpp
index 6b7ad0997749e..d9b2908161202 100644
--- a/tests/item_tname_test.cpp
+++ b/tests/item_tname_test.cpp
@@ -1,11 +1,24 @@
 #include "avatar.h"
-#include "cata_string_consts.h"
 #include "catch/catch.hpp"
 #include "game.h"
 #include "item.h"
 #include "itype.h"
 #include "options_helpers.h"
 
+static const std::string flag_COLD( "COLD" );
+static const std::string flag_DIAMOND( "DIAMOND" );
+static const std::string flag_FILTHY( "FILTHY" );
+static const std::string flag_FROZEN( "FROZEN" );
+static const std::string flag_HIDDEN_HALLU( "HIDDEN_HALLU" );
+static const std::string flag_HIDDEN_POISON( "HIDDEN_POISON" );
+static const std::string flag_HOT( "HOT" );
+static const std::string flag_MELTS( "MELTS" );
+static const std::string flag_WET( "WET" );
+
+static const fault_id fault_gun_dirt( "fault_gun_dirt" );
+
+static const skill_id skill_survival( "survival" );
+
 // Test cases focused on item::tname
 
 // TODO: Add test cases to cover other aspects of tname such as:
diff --git a/tests/iuse_test.cpp b/tests/iuse_test.cpp
index 595c00cf73ce4..90c73911dd88f 100644
--- a/tests/iuse_test.cpp
+++ b/tests/iuse_test.cpp
@@ -1,6 +1,5 @@
 #include "avatar.h"
 #include "bodypart.h"
-#include "cata_string_consts.h"
 #include "catch/catch.hpp"
 #include "game.h"
 #include "item.h"
@@ -10,6 +9,8 @@
 #include "string_id.h"
 #include "type_id.h"
 
+static const std::string flag_WET( "WET" );
+
 TEST_CASE( "eyedrops", "[iuse][eyedrops]" )
 {
     avatar dummy;
diff --git a/tests/modify_morale_test.cpp b/tests/modify_morale_test.cpp
index 740fe8b93fdd4..68851dfcaf511 100644
--- a/tests/modify_morale_test.cpp
+++ b/tests/modify_morale_test.cpp
@@ -1,6 +1,5 @@
 #include "avatar.h"
 #include "character.h"
-#include "cata_string_consts.h"
 #include "game.h"
 #include "map.h"
 #include "morale.h"
@@ -8,6 +7,37 @@
 #include "catch/catch.hpp"
 #include "map_helpers.h"
 
+static const std::string flag_ALLERGEN_JUNK( "ALLERGEN_JUNK" );
+static const std::string flag_CANNIBALISM( "CANNIBALISM" );
+static const std::string flag_EATEN_HOT( "EATEN_HOT" );
+static const std::string flag_HOT( "HOT" );
+static const std::string flag_URSINE_HONEY( "URSINE_HONEY" );
+
+static const trait_id trait_ANTIFRUIT( "ANTIFRUIT" );
+static const trait_id trait_ANTIJUNK( "ANTIJUNK" );
+static const trait_id trait_ANTIWHEAT( "ANTIWHEAT" );
+static const trait_id trait_BADTEMPER( "BADTEMPER" );
+static const trait_id trait_CANNIBAL( "CANNIBAL" );
+static const trait_id trait_CARNIVORE( "CARNIVORE" );
+static const trait_id trait_CLAWS( "CLAWS" );
+static const trait_id trait_FAT( "FAT" );
+static const trait_id trait_HIBERNATE( "HIBERNATE" );
+static const trait_id trait_LACTOSE( "LACTOSE" );
+static const trait_id trait_LARGE( "LARGE" );
+static const trait_id trait_MEATARIAN( "MEATARIAN" );
+static const trait_id trait_PADDED_FEET( "PADDED_FEET" );
+static const trait_id trait_PROJUNK( "PROJUNK" );
+static const trait_id trait_PROJUNK2( "PROJUNK2" );
+static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" );
+static const trait_id trait_SAPIOVORE( "SAPIOVORE" );
+static const trait_id trait_SAPROPHAGE( "SAPROPHAGE" );
+static const trait_id trait_SPIRITUAL( "SPIRITUAL" );
+static const trait_id trait_TABLEMANNERS( "TABLEMANNERS" );
+static const trait_id trait_THRESH_URSINE( "THRESH_URSINE" );
+static const trait_id trait_URSINE_EYE( "URSINE_EYE" );
+static const trait_id trait_URSINE_FUR( "URSINE_FUR" );
+static const trait_id trait_VEGETARIAN( "VEGETARIAN" );
+
 // Test cases for `Character::modify_morale` defined in `src/consumption.cpp`
 
 TEST_CASE( "food enjoyability", "[food][modify_morale][fun]" )
diff --git a/tests/reading_test.cpp b/tests/reading_test.cpp
index 3dd361cf4ced9..d9812ab9fbf18 100644
--- a/tests/reading_test.cpp
+++ b/tests/reading_test.cpp
@@ -2,7 +2,6 @@
 #include <vector>
 
 #include "avatar.h"
-#include "cata_string_consts.h"
 #include "catch/catch.hpp"
 #include "game.h"
 #include "item.h"
@@ -12,6 +11,12 @@
 #include "skill.h"
 #include "type_id.h"
 
+static const trait_id trait_HATES_BOOKS( "HATES_BOOKS" );
+static const trait_id trait_HYPEROPIC( "HYPEROPIC" );
+static const trait_id trait_ILLITERATE( "ILLITERATE" );
+static const trait_id trait_LOVES_BOOKS( "LOVES_BOOKS" );
+static const trait_id trait_SPIRITUAL( "SPIRITUAL" );
+
 TEST_CASE( "identifying unread books", "[reading][book][identify]" )
 {
     avatar dummy;