diff --git a/src/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h
index 5d4852142f0..fbf7b24b502 100644
--- a/src/lib/netlist/analog/nlid_twoterm.h
+++ b/src/lib/netlist/analog/nlid_twoterm.h
@@ -34,11 +34,11 @@
 ///
 //
 
-#include "nl_base.h"
 #include "../nl_setup.h"
+#include "nl_base.h"
+#include "nld_generic_models.h"
 #include "plib/pfunction.h"
 #include "solver/nld_solver.h"
-#include "nld_generic_models.h"
 
 // -----------------------------------------------------------------------------
 // Implementation
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index ad5600e9186..543097df807 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -58,7 +58,7 @@ TIDY_SOURCES = $(ALLSOURCES)
 
 #TIDY_SOURCES = $(SRC)/devices/nld_7442.cpp $(SRC)/devices/nld_7492.cpp
 
-TIDY_FLAGS = -p $(OBJ) -checks=llvm-include-order,llvm-namespace-comment,modernize-use-override,modernize-use-using -fix
+#TIDY_FLAGS = -p $(OBJ) -checks=llvm-include-order,llvm-namespace-comment,modernize-use-override,modernize-use-using -fix
 #TIDY_FLAGS = -checks=llvm-include-order -fix
 #TIDY_FLAGS = -checks=llvm-namespace-comment -fix
 #TIDY_FLAGS = -checks=modernize-use-override -fix
diff --git a/src/lib/netlist/buildVS/nlwav.vcxproj b/src/lib/netlist/buildVS/nlwav.vcxproj
index 7b191fedccd..3cadf366172 100755
--- a/src/lib/netlist/buildVS/nlwav.vcxproj
+++ b/src/lib/netlist/buildVS/nlwav.vcxproj
@@ -101,7 +101,7 @@
       </SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(SolutionDir)..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
index b5fd52bf032..9326a616647 100644
--- a/src/lib/netlist/devices/net_lib.h
+++ b/src/lib/netlist/devices/net_lib.h
@@ -84,8 +84,8 @@ NETLIST_EXTERNAL(base_lib)
 #include "nld_9322.h"
 #include "nld_tms4800.h"
 
-#include "nld_am2847.h"
 #include "nld_8277.h"
+#include "nld_am2847.h"
 #include "nld_dm9314.h"
 #include "nld_dm9334.h"
 
diff --git a/src/lib/netlist/devices/nld_4017.cpp b/src/lib/netlist/devices/nld_4017.cpp
index c8bd465089c..e721d4502f1 100644
--- a/src/lib/netlist/devices/nld_4017.cpp
+++ b/src/lib/netlist/devices/nld_4017.cpp
@@ -46,7 +46,7 @@ namespace netlist
 	namespace devices
 	{
 
-	template <std::size_t _MaxCount>
+	template <std::size_t MaxCount>
 	NETLIB_OBJECT(CD4017_base)
 	{
 		NETLIB_CONSTRUCTOR_MODEL(CD4017_base, "CD4XXX")
@@ -93,15 +93,15 @@ namespace netlist
 
 		void update_outputs(const unsigned cnt) noexcept
 		{
-			for (std::size_t i = 0; i < _MaxCount; i++)
+			for (std::size_t i = 0; i < MaxCount; i++)
 				m_Q[i].push(i == cnt, NLTIME_FROM_NS(200));
-			m_CO.push(cnt < _MaxCount / 2, NLTIME_FROM_NS(160));
+			m_CO.push(cnt < MaxCount / 2, NLTIME_FROM_NS(160));
 		}
 		logic_input_t m_CLK;
 		logic_input_t m_CLKEN;
 		logic_input_t m_RESET;
 		logic_output_t m_CO;
-		object_array_t<logic_output_t, _MaxCount> m_Q;
+		object_array_t<logic_output_t, MaxCount> m_Q;
 
 		state_var<unsigned> m_cnt;
 		nld_power_pins m_supply;
diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp
index bbca07b2c72..dad41bd0626 100644
--- a/src/lib/netlist/devices/nld_4020.cpp
+++ b/src/lib/netlist/devices/nld_4020.cpp
@@ -46,10 +46,10 @@ namespace netlist
 	namespace devices
 	{
 
-	template <unsigned _TotalBits, unsigned _LiveBitmask>
+	template <unsigned TotalBits, unsigned LiveBitmask>
 	NETLIB_OBJECT(CD4020_sub)
 	{
-		static_assert((_LiveBitmask >> _TotalBits) == 0, "Live bitmask too large");
+		static_assert((LiveBitmask >> TotalBits) == 0, "Live bitmask too large");
 
 		NETLIB_CONSTRUCTOR_MODEL(CD4020_sub, "CD4XXX")
 		, m_IP(*this, "IP", NETLIB_DELEGATE(ip))
@@ -79,8 +79,8 @@ namespace netlist
 				m_cnt = 0;
 				m_IP.inactivate();
 				/* static */ const netlist_time reset_time = netlist_time::from_nsec(140);
-				for (unsigned i = 0; i < _TotalBits; i++)
-					if (((_LiveBitmask >> i) & 1) != 0)
+				for (unsigned i = 0; i < TotalBits; i++)
+					if (((LiveBitmask >> i) & 1) != 0)
 						m_Q[i].push(0, reset_time);
 			}
 			else
@@ -100,13 +100,13 @@ namespace netlist
 					NLTIME_FROM_NS(1380), NLTIME_FROM_NS(1480),
 			};
 
-			for (unsigned i = 0; i < _TotalBits; i++)
-				if (((_LiveBitmask >> i) & 1) != 0)
+			for (unsigned i = 0; i < TotalBits; i++)
+				if (((LiveBitmask >> i) & 1) != 0)
 					m_Q[i].push((cnt >> i) & 1, out_delayQn[i]);
 		}
 		logic_input_t m_IP;
 		logic_input_t m_RESET;
-		object_array_t<logic_output_t, _TotalBits> m_Q;
+		object_array_t<logic_output_t, TotalBits> m_Q;
 
 		state_var<unsigned> m_cnt;
 		nld_power_pins m_supply;
diff --git a/src/lib/netlist/devices/nld_4053.cpp b/src/lib/netlist/devices/nld_4053.cpp
index 38b37fd3393..7a000d98a84 100644
--- a/src/lib/netlist/devices/nld_4053.cpp
+++ b/src/lib/netlist/devices/nld_4053.cpp
@@ -61,7 +61,8 @@ namespace netlist
 	private:
 		NETLIB_HANDLERI(controls)
 		{
-			bool newx = false, newy = false;
+			bool newx = false;
+			bool newy = false;
 			if (!on(m_inhibit, m_inhibit_state))
 			{
 				if (!on(m_select, m_select_state))
diff --git a/src/lib/netlist/devices/nld_7475.cpp b/src/lib/netlist/devices/nld_7475.cpp
index d8b6bbe84db..b73bc8e4fad 100644
--- a/src/lib/netlist/devices/nld_7475.cpp
+++ b/src/lib/netlist/devices/nld_7475.cpp
@@ -41,7 +41,7 @@ namespace netlist
 {
 	namespace devices
 	{
-	template<bool _HasQQ>
+	template<bool HasQQ>
 	NETLIB_OBJECT(7475_GATE_BASE)
 	{
 		NETLIB_CONSTRUCTOR(7475_GATE_BASE)
@@ -87,7 +87,7 @@ namespace netlist
 			// 0: High-to-low 40 ns, 1: Low-to-high 25 ns
 			static constexpr const std::array<netlist_time, 2> delay = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) };
 			m_Q.push(stateQ, delay[stateQ]);
-			if (_HasQQ)
+			if (HasQQ)
 				m_QQ.push(stateQQ, delay[stateQQ]);
 		}
 	};
diff --git a/src/lib/netlist/devices/nld_9321.cpp b/src/lib/netlist/devices/nld_9321.cpp
index 81bd6a86a7e..68e09fd233e 100644
--- a/src/lib/netlist/devices/nld_9321.cpp
+++ b/src/lib/netlist/devices/nld_9321.cpp
@@ -43,7 +43,7 @@ namespace netlist
 	private:
 		NETLIB_HANDLERI(in)
 		{
-			m_enable = m_E() ? 0 : 1;
+			m_enable = m_E() ? false : true;
 			m_o = (m_A[1]() << 1) | m_A[0]();
 			for (std::size_t i=0; i<4; i++)
 				m_D[i].push((i == m_o && m_enable) ? 0 : 1, NLTIME_FROM_NS(21));
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
index 10f3693bea8..c3f4cd5d270 100644
--- a/src/lib/netlist/devices/nld_system.cpp
+++ b/src/lib/netlist/devices/nld_system.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "solver/nld_solver.h"
-#include "solver/nld_matrix_solver.h"
 #include "nlid_system.h"
+#include "solver/nld_matrix_solver.h"
 
 #include "plib/pstrutil.h"
 
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index e13786e7a28..0e2857a3508 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -74,7 +74,7 @@ namespace devices
 			if (!m_func().empty())
 			{
 				std::vector<pstring> inps;
-				inps.push_back(pstring("T"));
+				inps.emplace_back("T");
 				m_vals.push_back(nlconst::zero());
 				for (int i=0; i < m_N(); i++)
 				{
diff --git a/src/lib/netlist/devices/nlid_truthtable.cpp b/src/lib/netlist/devices/nlid_truthtable.cpp
index 008426e4008..8b5e3a937c2 100644
--- a/src/lib/netlist/devices/nlid_truthtable.cpp
+++ b/src/lib/netlist/devices/nlid_truthtable.cpp
@@ -112,8 +112,6 @@ namespace devices
 			m_ign = (1<<m_NI)-1;
 		}
 
-	private:
-
 		template<bool doOUT>
 		void process() noexcept
 		{
diff --git a/src/lib/netlist/devices/nlid_truthtable.h b/src/lib/netlist/devices/nlid_truthtable.h
index fade2a6087e..35f3786e71d 100644
--- a/src/lib/netlist/devices/nlid_truthtable.h
+++ b/src/lib/netlist/devices/nlid_truthtable.h
@@ -8,8 +8,8 @@
 #ifndef NLID_TRUTHTABLE_H_
 #define NLID_TRUTHTABLE_H_
 
-#include "nl_factory.h"
 #include "../nl_setup.h"
+#include "nl_factory.h"
 
 #define USE_TT_ALTERNATIVE (0)
 
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 7016d482a92..d3da7ec899b 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -158,7 +158,7 @@ namespace netlist
 	void netlist_state_t::set_static_solver_lib(std::unique_ptr<plib::dynlib_base> &&lib)
 	{
 		m_lib = std::move(lib);
-	};
+	}
 
 
 	void netlist_t::stop()
diff --git a/src/lib/netlist/nl_factory.cpp b/src/lib/netlist/nl_factory.cpp
index 3bf1fced5c3..e0e2e70e680 100644
--- a/src/lib/netlist/nl_factory.cpp
+++ b/src/lib/netlist/nl_factory.cpp
@@ -45,7 +45,7 @@ namespace factory {
 
 	bool list_t::exists(const pstring &name) const noexcept
 	{
-		for (auto & e : *this)
+		for (const auto & e : *this)
 			if (e->name() == name)
 				return true;
 		return false;
diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h
index 89ce603ac52..f69dcc8fa26 100644
--- a/src/lib/netlist/nl_factory.h
+++ b/src/lib/netlist/nl_factory.h
@@ -11,8 +11,8 @@
 #include "nltypes.h"
 #include "plib/palloc.h"
 #include "plib/pmempool.h"
-#include "plib/ptypes.h"
 #include "plib/psource.h"
+#include "plib/ptypes.h"
 
 #include <tuple>
 #include <utility>
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index a2e1734c24c..d4b3de2c0fb 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -12,8 +12,8 @@
 #include "nl_setup.h"
 #include "plib/penum.h"
 #include "plib/pstonum.h"
-#include "plib/putil.h"
 #include "plib/pstrutil.h"
+#include "plib/putil.h"
 
 #include "solver/nld_solver.h"
 
@@ -379,12 +379,13 @@ namespace netlist
 			return parser.parse(st, name);
 		}
 #else
+		const auto filename = istrm.filename();
 		auto preprocessed = std::make_unique<std::stringstream>(putf8string(
-				plib::ppreprocessor(m_includes, &m_defines).process(std::move(istrm), istrm.filename())));
+				plib::ppreprocessor(m_includes, &m_defines).process(std::move(istrm), filename)));
 
 		parser_t::token_store st;
 		parser_t parser(*this);
-		parser.parse_tokens(plib::istream_uptr(std::move(preprocessed), istrm.filename()), st);
+		parser.parse_tokens(plib::istream_uptr(std::move(preprocessed), filename), st);
 		return parser.parse(st, name);
 #endif
 	}
@@ -1725,8 +1726,8 @@ plib::istream_uptr source_file_t::stream(const pstring &name)
 	{
 		return plib::istream_uptr(std::move(f), m_filename);
 	}
-	else
-		return plib::istream_uptr();
+
+	return plib::istream_uptr();
 }
 
 plib::istream_uptr source_pattern_t::stream(const pstring &name)
@@ -1737,8 +1738,8 @@ plib::istream_uptr source_pattern_t::stream(const pstring &name)
 	{
 		return plib::istream_uptr(std::move(f), filename);
 	}
-	else
-		return plib::istream_uptr();
+
+	return plib::istream_uptr();
 }
 
 
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 5cb312adfd7..4e9b01dac22 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -11,9 +11,9 @@
 #define NL_AUTO_DEVICES 0
 
 #include "plib/ppreprocessor.h"
+#include "plib/psource.h"
 #include "plib/pstream.h"
 #include "plib/pstring.h"
-#include "plib/psource.h"
 
 #include "nl_config.h"
 #include "nl_parser.h"
diff --git a/src/lib/netlist/plib/parray.h b/src/lib/netlist/plib/parray.h
index 2defe3bdfcb..514c231025b 100644
--- a/src/lib/netlist/plib/parray.h
+++ b/src/lib/netlist/plib/parray.h
@@ -14,10 +14,10 @@
 
 #include <array>
 #include <memory>
+#include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include <string>
 
 namespace plib {
 
diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h
index a7485f8bfe6..45f7d3e4fc1 100644
--- a/src/lib/netlist/plib/pfmtlog.h
+++ b/src/lib/netlist/plib/pfmtlog.h
@@ -9,9 +9,9 @@
 #define PFMTLOG_H_
 
 #include "penum.h"
+#include "ppmf.h"
 #include "pstring.h"
 #include "ptypes.h"
-#include "ppmf.h"
 
 #include <limits>
 #include <locale>
diff --git a/src/lib/netlist/plib/psource.h b/src/lib/netlist/plib/psource.h
index 2db2feb78d4..b21544f2b37 100644
--- a/src/lib/netlist/plib/psource.h
+++ b/src/lib/netlist/plib/psource.h
@@ -10,8 +10,8 @@
 
 #include "palloc.h"
 #include "pexception.h"
-#include "pstring.h"
 #include "pstream.h"
+#include "pstring.h"
 
 #include <algorithm>
 #include <initializer_list>
diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h
index e69671df90c..4488494e381 100644
--- a/src/lib/netlist/plib/pstream.h
+++ b/src/lib/netlist/plib/pstream.h
@@ -367,12 +367,12 @@ public:
 		pstring_t<pwchar_traits>, pstring_t<putf8_traits>>::type;
 
 	template <typename T>
-	explicit ifstream(const pstring_t<T> name, ios_base::openmode mode = ios_base::in)
+	explicit ifstream(const pstring_t<T> &name, ios_base::openmode mode = ios_base::in)
 	: std::ifstream(filename_type(name).c_str(), mode)
 	{
 	}
 
-	explicit ifstream(const std::string name, ios_base::openmode mode = ios_base::in)
+	explicit ifstream(const std::string &name, ios_base::openmode mode = ios_base::in)
 	: std::ifstream(filename_type(putf8string(name)).c_str(), mode)
 	{
 	}
@@ -388,12 +388,12 @@ public:
 		pstring_t<pwchar_traits>, pstring_t<putf8_traits>>::type;
 
 	template <typename T>
-	explicit ofstream(const pstring_t<T> name, ios_base::openmode mode = ios_base::out | ios_base::trunc)
+	explicit ofstream(const pstring_t<T> &name, ios_base::openmode mode = ios_base::out | ios_base::trunc)
 	: std::ofstream(filename_type(name).c_str(), mode)
 	{
 	}
 
-	explicit ofstream(const std::string name, ios_base::openmode mode = ios_base::out | ios_base::trunc)
+	explicit ofstream(const std::string &name, ios_base::openmode mode = ios_base::out | ios_base::trunc)
 	: std::ofstream(filename_type(putf8string(name)).c_str(), mode)
 	{
 	}
diff --git a/src/lib/netlist/plib/pstrutil.h b/src/lib/netlist/plib/pstrutil.h
index 0010bc2e7f9..84a689af834 100644
--- a/src/lib/netlist/plib/pstrutil.h
+++ b/src/lib/netlist/plib/pstrutil.h
@@ -243,7 +243,7 @@ namespace plib
 
 		auto p = str.begin();
 		auto pn = std::search(p, str.end(), onstr.begin(), onstr.end());
-		auto ol = onstr.length();
+		const auto ol = static_cast<typename T::difference_type>(onstr.length());
 
 		while (pn != str.end())
 		{
diff --git a/src/lib/netlist/plib/ptests.h b/src/lib/netlist/plib/ptests.h
index 613fac8133f..191233f26fa 100644
--- a/src/lib/netlist/plib/ptests.h
+++ b/src/lib/netlist/plib/ptests.h
@@ -124,7 +124,7 @@ namespace testing
 	{
 		using reg_entry_base::reg_entry_base;
 
-		Test *create() const override { return new T(); }
+		Test *create() const override { return new T(); } // NOLINT
 	};
 
 	template <typename C, typename T1, typename T2>
diff --git a/src/lib/netlist/plib/ptokenizer.cpp b/src/lib/netlist/plib/ptokenizer.cpp
index 1e63e79d758..f0453aa1f9b 100644
--- a/src/lib/netlist/plib/ptokenizer.cpp
+++ b/src/lib/netlist/plib/ptokenizer.cpp
@@ -3,8 +3,8 @@
 
 #include "palloc.h"
 #include "pstonum.h"
-#include "ptokenizer.h"
 #include "pstrutil.h"
+#include "ptokenizer.h"
 
 namespace plib {
 
diff --git a/src/lib/netlist/plib/ptokenizer.h b/src/lib/netlist/plib/ptokenizer.h
index 056f62dbc29..717d3fcd550 100644
--- a/src/lib/netlist/plib/ptokenizer.h
+++ b/src/lib/netlist/plib/ptokenizer.h
@@ -24,6 +24,7 @@ namespace plib {
 	public:
 		explicit ptokenizer() // NOLINT(misc-forwarding-reference-overload, bugprone-forwarding-reference-overload)
 		: m_strm(nullptr)
+		, m_unget(0)
 		, m_string('"')
 		, m_support_line_markers(true) // FIXME
 		, m_token_queue(nullptr)
@@ -61,6 +62,8 @@ namespace plib {
 
 			PCOPYASSIGNMOVE(token_id_t, default)
 
+			~token_id_t() = default;
+
 			std::size_t id() const { return m_id; }
 			const pstring & name() const { return m_name; }
 		private:
@@ -89,6 +92,8 @@ namespace plib {
 
 			PCOPYASSIGNMOVE(token_t, default)
 
+			~token_t() = default;
+
 			bool is(const token_id_t &tok_id) const noexcept { return m_id == tok_id.id(); }
 			bool is_not(const token_id_t &tok_id) const noexcept { return !is(tok_id); }
 
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 78493c64d2b..92a4af61399 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -55,14 +55,14 @@ namespace devices
 		const netlist_time_ext now(exec().time());
 		const std::size_t nthreads = m_params.m_parallel() < 2 ? 1 : std::min(static_cast<std::size_t>(m_params.m_parallel()), plib::omp::get_max_threads());
 		const netlist_time_ext sched(now + (nthreads <= 1 ? netlist_time_ext::zero() : netlist_time_ext::from_nsec(100)));
-		plib::uninitialised_array<solver::matrix_solver_t *, config::MAX_SOLVER_QUEUE_SIZE::value> tmp;
-		plib::uninitialised_array<netlist_time, config::MAX_SOLVER_QUEUE_SIZE::value> nt;
+		plib::uninitialised_array<solver::matrix_solver_t *, config::MAX_SOLVER_QUEUE_SIZE::value> tmp; //NOLINT
+		plib::uninitialised_array<netlist_time, config::MAX_SOLVER_QUEUE_SIZE::value> nt; //NOLINT
 		std::size_t p=0;
 
 		while (!m_queue.empty())
 		{
-			auto t = m_queue.top().exec_time();
-			auto o = m_queue.top().object();
+			const auto t = m_queue.top().exec_time();
+			auto *o = m_queue.top().object();
 			if (t != now)
 				if (t > sched)
 					break;
@@ -72,7 +72,7 @@ namespace devices
 
 		// FIXME: Disabled for now since parallel processing will decrease performance
 		//        for tested applications. More testing required here
-		if (1 || nthreads < 2)
+		if (true || nthreads < 2)
 		{
 			if (!KEEP_STATS)
 			{
diff --git a/src/lib/netlist/solver/nld_solver.h b/src/lib/netlist/solver/nld_solver.h
index 4b30d545bd2..40d0715ab78 100644
--- a/src/lib/netlist/solver/nld_solver.h
+++ b/src/lib/netlist/solver/nld_solver.h
@@ -8,8 +8,8 @@
 /// \file nld_solver.h
 ///
 
-#include "../plib/pstream.h"
 #include "../nl_base.h"
+#include "../plib/pstream.h"
 #include "nld_matrix_solver.h"
 
 #include <map>