diff --git a/src/map.cpp b/src/map.cpp
index c6b4769d..88c32bbd 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1925,9 +1925,8 @@ void ServerMap::save(ModifiedState save_level)
 	// Don't do anything with sqlite unless something is really saved
 	bool save_started = false;
 
-	for(std::map<v2s16, MapSector*>::iterator i = m_sectors.begin();
-		i != m_sectors.end(); ++i) {
-		ServerMapSector *sector = (ServerMapSector*)i->second;
+	for (auto &sector_it : m_sectors) {
+		ServerMapSector *sector = (ServerMapSector*) sector_it.second;
 		assert(sector->getId() == MAPSECTOR_SERVER);
 
 		if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN) {
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index d8b3193a..e4ddc164 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -30,7 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
-#include "content_sao.h"
 #include "nodedef.h"
 #include "voxelalgorithms.h"
 #include "settings.h" // For g_settings
diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index b06b42ba..2f92f0a2 100644
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -455,7 +455,7 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
 	}
 	else // NODEBOX_REGULAR
 	{
-		boxes.push_back(aabb3f(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2));
+		boxes.emplace_back(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2);
 	}
 }
 
@@ -764,7 +764,7 @@ void MapNode::deSerializeBulk(std::istream &is, int version,
 /*
 	Legacy serialization
 */
-void MapNode::deSerialize_pre22(u8 *source, u8 version)
+void MapNode::deSerialize_pre22(const u8 *source, u8 version)
 {
 	if(version <= 1)
 	{
diff --git a/src/mapnode.h b/src/mapnode.h
index 4b75fe22..1e7597e4 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -300,5 +300,5 @@ struct MapNode
 
 private:
 	// Deprecated serialization methods
-	void deSerialize_pre22(u8 *source, u8 version);
+	void deSerialize_pre22(const u8 *source, u8 version);
 };
diff --git a/src/mesh_generator_thread.h b/src/mesh_generator_thread.h
index 7df9a4e2..9a42852a 100644
--- a/src/mesh_generator_thread.h
+++ b/src/mesh_generator_thread.h
@@ -32,7 +32,7 @@ struct CachedMapBlockData
 	int refcount_from_queue = 0;
 	std::time_t last_used_timestamp = std::time(0);
 
-	CachedMapBlockData() {}
+	CachedMapBlockData() = default;
 	~CachedMapBlockData();
 };
 
@@ -45,7 +45,7 @@ struct QueuedMeshUpdate
 	v3s16 crack_pos;
 	MeshMakeData *data = nullptr; // This is generated in MeshUpdateQueue::pop()
 
-	QueuedMeshUpdate(){};
+	QueuedMeshUpdate() = default;
 	~QueuedMeshUpdate();
 };
 
@@ -105,7 +105,7 @@ struct MeshUpdateResult
 	MapBlockMesh *mesh = nullptr;
 	bool ack_block_to_server = false;
 
-	MeshUpdateResult() {}
+	MeshUpdateResult() = default;
 };
 
 class MeshUpdateThread : public UpdateThread
diff --git a/src/metadata.cpp b/src/metadata.cpp
index 83373546..628e38c1 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -18,12 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "metadata.h"
-#include "exceptions.h"
-#include "gamedef.h"
 #include "log.h"
-#include <sstream>
-#include "constants.h" // MAP_BLOCKSIZE
-#include <sstream>
 
 /*
 	Metadata
@@ -36,7 +31,7 @@ void Metadata::clear()
 
 bool Metadata::empty() const
 {
-	return m_stringvars.size() == 0;
+	return m_stringvars.empty();
 }
 
 size_t Metadata::size() const
@@ -54,10 +49,9 @@ bool Metadata::operator==(const Metadata &other) const
 	if (size() != other.size())
 		return false;
 
-	for (StringMap::const_iterator it = m_stringvars.begin();
-			it != m_stringvars.end(); ++it) {
-		if (!other.contains(it->first) ||
-				other.getString(it->first) != it->second)
+	for (const auto &sv : m_stringvars) {
+		if (!other.contains(sv.first) ||
+				other.getString(sv.first) != sv.second)
 			return false;
 	}
 
@@ -102,7 +96,7 @@ const std::string &Metadata::resolveString(const std::string &str, u16 recursion
 {
 	if (recursion <= 1 && str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
 		return getString(str.substr(2, str.length() - 3), recursion + 1);
-	} else {
-		return str;
 	}
+
+	return str;
 }
diff --git a/src/metadata.h b/src/metadata.h
index f923e6ff..d95a0ed5 100644
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Metadata
 {
 public:
-	virtual ~Metadata() {}
+	virtual ~Metadata() = default;
 
 	virtual void clear();
 	virtual bool empty() const;
diff --git a/src/mg_ore.h b/src/mg_ore.h
index eaaf2b88..253b115a 100644
--- a/src/mg_ore.h
+++ b/src/mg_ore.h
@@ -64,7 +64,7 @@ public:
 	Noise *noise = nullptr;
 	std::unordered_set<u8> biomes;
 
-	Ore() {};
+	Ore() = default;;
 	virtual ~Ore();
 
 	virtual void resolveNodeNames();
@@ -136,7 +136,7 @@ public:
 class OreManager : public ObjDefManager {
 public:
 	OreManager(IGameDef *gamedef);
-	virtual ~OreManager() {}
+	virtual ~OreManager() = default;
 
 	const char *getObjectTitle() const
 	{
diff --git a/src/mg_schematic.cpp b/src/mg_schematic.cpp
index c50e90b3..8874abd4 100644
--- a/src/mg_schematic.cpp
+++ b/src/mg_schematic.cpp
@@ -56,7 +56,7 @@ void SchematicManager::clear()
 			DecoSchematic *dschem = dynamic_cast<DecoSchematic *>(deco);
 			if (dschem)
 				dschem->schematic = NULL;
-		} catch (std::bad_cast) {
+		} catch (const std::bad_cast &) {
 		}
 	}
 
@@ -68,8 +68,7 @@ void SchematicManager::clear()
 
 
 Schematic::Schematic()
-{
-}
+= default;
 
 
 Schematic::~Schematic()
diff --git a/src/minimap.cpp b/src/minimap.cpp
index 5b9b27b8..59753e24 100644
--- a/src/minimap.cpp
+++ b/src/minimap.cpp
@@ -115,7 +115,6 @@ void MinimapUpdateThread::doUpdate()
 
 void MinimapUpdateThread::getMap(v3s16 pos, s16 size, s16 height)
 {
-	v3s16 region(size, 0, size);
 	v3s16 pos_min(pos.X - size / 2, pos.Y - height / 2, pos.Z - size / 2);
 	v3s16 pos_max(pos_min.X + size - 1, pos.Y + height / 2, pos_min.Z + size - 1);
 	v3s16 blockpos_min = getNodeBlockPos(pos_min);
diff --git a/src/mods.cpp b/src/mods.cpp
index d28288a8..148ea6c5 100644
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -19,13 +19,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <cctype>
 #include <fstream>
+#include <json/json.h>
 #include "mods.h"
 #include "filesys.h"
 #include "log.h"
 #include "subgame.h"
 #include "settings.h"
-#include "convert_json.h"
-#include "exceptions.h"
 #include "porting.h"
 
 static bool parseDependsLine(std::istream &is,