summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-08-02 23:35:25 +0200
committer couriersud <couriersud@arcor.de>2015-08-03 00:10:24 +0200
commit3575a923a6aa82e51d98c623e4e1238908846fb2 (patch)
treec042eea99942af6013da6122314b3505620abd06
parent7815f924eca5ffab6e374636289c63ffc60947b0 (diff)
Removed relative paths in include statements. (nw)
-rw-r--r--src/emu/netlist/analog/nld_bjt.c6
-rw-r--r--src/emu/netlist/analog/nld_bjt.h2
-rw-r--r--src/emu/netlist/analog/nld_fourterm.c4
-rw-r--r--src/emu/netlist/analog/nld_fourterm.h2
-rw-r--r--src/emu/netlist/analog/nld_opamps.c2
-rw-r--r--src/emu/netlist/analog/nld_opamps.h4
-rw-r--r--src/emu/netlist/analog/nld_switches.c2
-rw-r--r--src/emu/netlist/analog/nld_switches.h2
-rw-r--r--src/emu/netlist/analog/nld_twoterm.h2
-rw-r--r--src/emu/netlist/devices/net_lib.c2
-rw-r--r--src/emu/netlist/devices/net_lib.h22
-rw-r--r--src/emu/netlist/devices/nld_4020.h2
-rw-r--r--src/emu/netlist/devices/nld_4066.h2
-rw-r--r--src/emu/netlist/devices/nld_74107.h2
-rw-r--r--src/emu/netlist/devices/nld_74123.h4
-rw-r--r--src/emu/netlist/devices/nld_74153.h2
-rw-r--r--src/emu/netlist/devices/nld_74192.h2
-rw-r--r--src/emu/netlist/devices/nld_74193.h2
-rw-r--r--src/emu/netlist/devices/nld_7448.h2
-rw-r--r--src/emu/netlist/devices/nld_7483.h2
-rw-r--r--src/emu/netlist/devices/nld_7490.h2
-rw-r--r--src/emu/netlist/devices/nld_7493.c2
-rw-r--r--src/emu/netlist/devices/nld_7493.h2
-rw-r--r--src/emu/netlist/devices/nld_74ls629.c2
-rw-r--r--src/emu/netlist/devices/nld_74ls629.h4
-rw-r--r--src/emu/netlist/devices/nld_82S16.h2
-rw-r--r--src/emu/netlist/devices/nld_9310.h2
-rw-r--r--src/emu/netlist/devices/nld_9316.h2
-rw-r--r--src/emu/netlist/devices/nld_cmos.h4
-rw-r--r--src/emu/netlist/devices/nld_legacy.c2
-rw-r--r--src/emu/netlist/devices/nld_legacy.h2
-rw-r--r--src/emu/netlist/devices/nld_log.c2
-rw-r--r--src/emu/netlist/devices/nld_mm5837.c2
-rw-r--r--src/emu/netlist/devices/nld_mm5837.h4
-rw-r--r--src/emu/netlist/devices/nld_ne555.c2
-rw-r--r--src/emu/netlist/devices/nld_ne555.h4
-rw-r--r--src/emu/netlist/devices/nld_r2r_dac.h4
-rw-r--r--src/emu/netlist/devices/nld_signal.h2
-rw-r--r--src/emu/netlist/devices/nld_system.h8
-rw-r--r--src/emu/netlist/devices/nld_truthtable.c2
-rw-r--r--src/emu/netlist/devices/nld_truthtable.h4
-rw-r--r--src/emu/netlist/macro/nlm_cd4xxx.h2
-rw-r--r--src/emu/netlist/macro/nlm_opamp.h2
-rw-r--r--src/emu/netlist/macro/nlm_other.h2
-rw-r--r--src/emu/netlist/macro/nlm_ttl74xx.h2
-rw-r--r--src/emu/netlist/nl_base.c1
-rw-r--r--src/emu/netlist/nl_setup.c3
-rw-r--r--src/emu/netlist/solver/mat_cr.h2
-rw-r--r--src/emu/netlist/solver/nld_ms_direct.h2
-rw-r--r--src/emu/netlist/solver/nld_ms_direct1.h4
-rw-r--r--src/emu/netlist/solver/nld_ms_direct2.h4
-rw-r--r--src/emu/netlist/solver/nld_ms_gmres.h8
-rw-r--r--src/emu/netlist/solver/nld_ms_sor.h4
-rw-r--r--src/emu/netlist/solver/nld_ms_sor_mat.h4
-rw-r--r--src/emu/netlist/solver/nld_solver.c2
-rw-r--r--src/emu/netlist/solver/nld_solver.h4
-rw-r--r--src/emu/netlist/solver/vector_base.h2
57 files changed, 87 insertions, 91 deletions
diff --git a/src/emu/netlist/analog/nld_bjt.c b/src/emu/netlist/analog/nld_bjt.c
index 57c2d89c870..5f5a3611b97 100644
--- a/src/emu/netlist/analog/nld_bjt.c
+++ b/src/emu/netlist/analog/nld_bjt.c
@@ -5,9 +5,9 @@
*
*/
-#include <solver/nld_solver.h>
-#include "nld_bjt.h"
-#include "../nl_setup.h"
+#include "solver/nld_solver.h"
+#include "analog/nld_bjt.h"
+#include "nl_setup.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_bjt.h b/src/emu/netlist/analog/nld_bjt.h
index eab013b99c6..520321f2db2 100644
--- a/src/emu/netlist/analog/nld_bjt.h
+++ b/src/emu/netlist/analog/nld_bjt.h
@@ -8,7 +8,7 @@
#ifndef NLD_BJT_H_
#define NLD_BJT_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#include "nld_twoterm.h"
// -----------------------------------------------------------------------------
diff --git a/src/emu/netlist/analog/nld_fourterm.c b/src/emu/netlist/analog/nld_fourterm.c
index 58d173e6554..b217ff21f3a 100644
--- a/src/emu/netlist/analog/nld_fourterm.c
+++ b/src/emu/netlist/analog/nld_fourterm.c
@@ -5,9 +5,9 @@
*
*/
-#include <solver/nld_solver.h>
+#include "solver/nld_solver.h"
#include "nld_fourterm.h"
-#include "../nl_setup.h"
+#include "nl_setup.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_fourterm.h b/src/emu/netlist/analog/nld_fourterm.h
index 7ed6965a393..591df68dd79 100644
--- a/src/emu/netlist/analog/nld_fourterm.h
+++ b/src/emu/netlist/analog/nld_fourterm.h
@@ -9,7 +9,7 @@
#define NLD_FOURTERM_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#include "nld_twoterm.h"
// ----------------------------------------------------------------------------------------
diff --git a/src/emu/netlist/analog/nld_opamps.c b/src/emu/netlist/analog/nld_opamps.c
index 3aecce08b2a..d0b9e5da023 100644
--- a/src/emu/netlist/analog/nld_opamps.c
+++ b/src/emu/netlist/analog/nld_opamps.c
@@ -6,7 +6,7 @@
*/
#include "nld_opamps.h"
-#include "../devices/net_lib.h"
+#include "devices/net_lib.h"
NETLIST_START(opamp_lm3900)
diff --git a/src/emu/netlist/analog/nld_opamps.h b/src/emu/netlist/analog/nld_opamps.h
index 5dc0730357a..2cee8696bca 100644
--- a/src/emu/netlist/analog/nld_opamps.h
+++ b/src/emu/netlist/analog/nld_opamps.h
@@ -10,8 +10,8 @@
#ifndef NLD_OPAMPS_H_
#define NLD_OPAMPS_H_
-#include "../nl_base.h"
-#include "../nl_setup.h"
+#include "nl_base.h"
+#include "nl_setup.h"
#include "nld_twoterm.h"
#include "nld_fourterm.h"
diff --git a/src/emu/netlist/analog/nld_switches.c b/src/emu/netlist/analog/nld_switches.c
index cf5dcd09c4b..6166463c6f8 100644
--- a/src/emu/netlist/analog/nld_switches.c
+++ b/src/emu/netlist/analog/nld_switches.c
@@ -6,7 +6,7 @@
*/
#include "nld_switches.h"
-#include "../nl_setup.h"
+#include "nl_setup.h"
#define R_OFF (1.0 / netlist().gmin())
#define R_ON 0.01
diff --git a/src/emu/netlist/analog/nld_switches.h b/src/emu/netlist/analog/nld_switches.h
index 79dc989c948..6cec34ceb4c 100644
--- a/src/emu/netlist/analog/nld_switches.h
+++ b/src/emu/netlist/analog/nld_switches.h
@@ -10,7 +10,7 @@
#ifndef NLD_SWITCHES_H_
#define NLD_SWITCHES_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#include "nld_twoterm.h"
// ----------------------------------------------------------------------------------------
diff --git a/src/emu/netlist/analog/nld_twoterm.h b/src/emu/netlist/analog/nld_twoterm.h
index d29b11f0db7..c38242cd90f 100644
--- a/src/emu/netlist/analog/nld_twoterm.h
+++ b/src/emu/netlist/analog/nld_twoterm.h
@@ -33,7 +33,7 @@
#ifndef NLD_TWOTERM_H_
#define NLD_TWOTERM_H_
-#include "../nl_base.h"
+#include "nl_base.h"
// -----------------------------------------------------------------------------
// Macros
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index b33a069a832..3b8edc8ac84 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -10,7 +10,7 @@
#include "net_lib.h"
#include "nld_system.h"
-#include "../nl_factory.h"
+#include "nl_factory.h"
NETLIST_START(diode_models)
NET_MODEL("D _(IS=1e-15 N=1)")
diff --git a/src/emu/netlist/devices/net_lib.h b/src/emu/netlist/devices/net_lib.h
index 75564746a66..eed3bd6120f 100644
--- a/src/emu/netlist/devices/net_lib.h
+++ b/src/emu/netlist/devices/net_lib.h
@@ -11,7 +11,7 @@
#ifndef NET_LIB_H
#define NET_LIB_H
-#include "../nl_base.h"
+#include "nl_base.h"
#include "nld_signal.h"
#include "nld_system.h"
@@ -56,17 +56,17 @@
#include "nld_log.h"
-#include "../macro/nlm_cd4xxx.h"
-#include "../macro/nlm_ttl74xx.h"
-#include "../macro/nlm_opamp.h"
-#include "../macro/nlm_other.h"
+#include "macro/nlm_cd4xxx.h"
+#include "macro/nlm_ttl74xx.h"
+#include "macro/nlm_opamp.h"
+#include "macro/nlm_other.h"
-#include "../analog/nld_bjt.h"
-#include "../analog/nld_fourterm.h"
-#include "../analog/nld_switches.h"
-#include "../analog/nld_twoterm.h"
-#include "../analog/nld_opamps.h"
-#include "../solver/nld_solver.h"
+#include "analog/nld_bjt.h"
+#include "analog/nld_fourterm.h"
+#include "analog/nld_switches.h"
+#include "analog/nld_twoterm.h"
+#include "analog/nld_opamps.h"
+#include "solver/nld_solver.h"
#include "nld_legacy.h"
diff --git a/src/emu/netlist/devices/nld_4020.h b/src/emu/netlist/devices/nld_4020.h
index d4814471fc1..78d7199db1b 100644
--- a/src/emu/netlist/devices/nld_4020.h
+++ b/src/emu/netlist/devices/nld_4020.h
@@ -27,7 +27,7 @@
#ifndef NLD_4020_H_
#define NLD_4020_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#include "nld_cmos.h"
/* FIXME: only used in mario.c */
diff --git a/src/emu/netlist/devices/nld_4066.h b/src/emu/netlist/devices/nld_4066.h
index e9fc1bfec26..abfe321a7c4 100644
--- a/src/emu/netlist/devices/nld_4066.h
+++ b/src/emu/netlist/devices/nld_4066.h
@@ -24,7 +24,7 @@
#ifndef NLD_4066_H_
#define NLD_4066_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#include "nld_cmos.h"
#define CD4066_GATE(_name) \
diff --git a/src/emu/netlist/devices/nld_74107.h b/src/emu/netlist/devices/nld_74107.h
index 89f59822f22..b0b38ee66fd 100644
--- a/src/emu/netlist/devices/nld_74107.h
+++ b/src/emu/netlist/devices/nld_74107.h
@@ -59,7 +59,7 @@
#ifndef NLD_74107_H_
#define NLD_74107_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_74107A(_name, _CLK, _J, _K, _CLRQ) \
NET_REGISTER_DEV(TTL_74107A, _name) \
diff --git a/src/emu/netlist/devices/nld_74123.h b/src/emu/netlist/devices/nld_74123.h
index 8772103b521..7539c9ce6c3 100644
--- a/src/emu/netlist/devices/nld_74123.h
+++ b/src/emu/netlist/devices/nld_74123.h
@@ -49,9 +49,9 @@
#ifndef NLD_74123_H_
#define NLD_74123_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#include "nld_system.h"
-#include "../analog/nld_twoterm.h"
+#include "analog/nld_twoterm.h"
#define TTL_74123(_name) \
NET_REGISTER_DEV(TTL_74123, _name)
diff --git a/src/emu/netlist/devices/nld_74153.h b/src/emu/netlist/devices/nld_74153.h
index fe59759b1f7..54364ac5671 100644
--- a/src/emu/netlist/devices/nld_74153.h
+++ b/src/emu/netlist/devices/nld_74153.h
@@ -45,7 +45,7 @@
#ifndef NLD_74153_H_
#define NLD_74153_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_74153(_name, _C0, _C1, _C2, _C3, _A, _B, _G) \
NET_REGISTER_DEV(TTL_74153, _name) \
diff --git a/src/emu/netlist/devices/nld_74192.h b/src/emu/netlist/devices/nld_74192.h
index d5be6346cb2..a8b26335eb2 100644
--- a/src/emu/netlist/devices/nld_74192.h
+++ b/src/emu/netlist/devices/nld_74192.h
@@ -29,7 +29,7 @@
#ifndef NLD_74192_H_
#define NLD_74192_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#include "nld_9316.h"
#define TTL_74192(_name) \
diff --git a/src/emu/netlist/devices/nld_74193.h b/src/emu/netlist/devices/nld_74193.h
index d97095b7230..f7cecbc984c 100644
--- a/src/emu/netlist/devices/nld_74193.h
+++ b/src/emu/netlist/devices/nld_74193.h
@@ -26,7 +26,7 @@
#ifndef NLD_74193_H_
#define NLD_74193_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_74193(_name) \
NET_REGISTER_DEV(TTL_74193, _name)
diff --git a/src/emu/netlist/devices/nld_7448.h b/src/emu/netlist/devices/nld_7448.h
index f5bbdf50704..e633858dad5 100644
--- a/src/emu/netlist/devices/nld_7448.h
+++ b/src/emu/netlist/devices/nld_7448.h
@@ -24,7 +24,7 @@
#ifndef NLD_7448_H_
#define NLD_7448_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_7448(_name, _A0, _A1, _A2, _A3, _LTQ, _BIQ, _RBIQ) \
NET_REGISTER_DEV(TTL_7448, _name) \
diff --git a/src/emu/netlist/devices/nld_7483.h b/src/emu/netlist/devices/nld_7483.h
index 9bbefc88b1d..b50edf11210 100644
--- a/src/emu/netlist/devices/nld_7483.h
+++ b/src/emu/netlist/devices/nld_7483.h
@@ -27,7 +27,7 @@
#ifndef NLD_7483_H_
#define NLD_7483_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_7483(_name, _A1, _A2, _A3, _A4, _B1, _B2, _B3, _B4, _CI) \
NET_REGISTER_DEV(TTL_7483, _name) \
diff --git a/src/emu/netlist/devices/nld_7490.h b/src/emu/netlist/devices/nld_7490.h
index 72650c3dcbe..f5513dc2390 100644
--- a/src/emu/netlist/devices/nld_7490.h
+++ b/src/emu/netlist/devices/nld_7490.h
@@ -55,7 +55,7 @@
#ifndef NLD_7490_H_
#define NLD_7490_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_7490(_name, _A, _B, _R1, _R2, _R91, _R92) \
NET_REGISTER_DEV(TTL_7490, _name) \
diff --git a/src/emu/netlist/devices/nld_7493.c b/src/emu/netlist/devices/nld_7493.c
index 83a7ae1012c..b7979152f09 100644
--- a/src/emu/netlist/devices/nld_7493.c
+++ b/src/emu/netlist/devices/nld_7493.c
@@ -6,7 +6,7 @@
*/
#include "nld_7493.h"
-#include "../nl_setup.h"
+#include "nl_setup.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/devices/nld_7493.h b/src/emu/netlist/devices/nld_7493.h
index a54593c7c1f..39a969d3b02 100644
--- a/src/emu/netlist/devices/nld_7493.h
+++ b/src/emu/netlist/devices/nld_7493.h
@@ -57,7 +57,7 @@
#ifndef NLD_7493_H_
#define NLD_7493_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_7493(_name, _CLKA, _CLKB, _R1, _R2) \
NET_REGISTER_DEV(TTL_7493, _name) \
diff --git a/src/emu/netlist/devices/nld_74ls629.c b/src/emu/netlist/devices/nld_74ls629.c
index 5ee1e1679db..ce8a0dd3b79 100644
--- a/src/emu/netlist/devices/nld_74ls629.c
+++ b/src/emu/netlist/devices/nld_74ls629.c
@@ -40,7 +40,7 @@
#include "nld_74ls629.h"
-#include "../nl_setup.h"
+#include "nl_setup.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/devices/nld_74ls629.h b/src/emu/netlist/devices/nld_74ls629.h
index 11c74bb8246..433c2c32a11 100644
--- a/src/emu/netlist/devices/nld_74ls629.h
+++ b/src/emu/netlist/devices/nld_74ls629.h
@@ -28,8 +28,8 @@
#ifndef NLD_74LS629_H_
#define NLD_74LS629_H_
-#include "../nl_base.h"
-#include "../analog/nld_twoterm.h"
+#include "nl_base.h"
+#include "analog/nld_twoterm.h"
#define SN74LS629(_name, _cap) \
NET_REGISTER_DEV(SN74LS629, _name) \
diff --git a/src/emu/netlist/devices/nld_82S16.h b/src/emu/netlist/devices/nld_82S16.h
index 0c0963498c9..b6d8f6565d6 100644
--- a/src/emu/netlist/devices/nld_82S16.h
+++ b/src/emu/netlist/devices/nld_82S16.h
@@ -24,7 +24,7 @@
#ifndef NLD_82S16_H_
#define NLD_82S16_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_82S16(_name) \
NET_REGISTER_DEV(TTL_82S16, _name)
diff --git a/src/emu/netlist/devices/nld_9310.h b/src/emu/netlist/devices/nld_9310.h
index 4ab59ea038e..00c39605ac2 100644
--- a/src/emu/netlist/devices/nld_9310.h
+++ b/src/emu/netlist/devices/nld_9310.h
@@ -45,7 +45,7 @@
#ifndef NLD_9310_H_
#define NLD_9310_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_9310(_name, _CLK, _ENP, _ENT, _CLRQ, _LOADQ, _A, _B, _C, _D) \
NET_REGISTER_DEV(TTL_9310, _name) \
diff --git a/src/emu/netlist/devices/nld_9316.h b/src/emu/netlist/devices/nld_9316.h
index ec6791ed63b..e4d7a901c99 100644
--- a/src/emu/netlist/devices/nld_9316.h
+++ b/src/emu/netlist/devices/nld_9316.h
@@ -49,7 +49,7 @@
#ifndef NLD_9316_H_
#define NLD_9316_H_
-#include "../nl_base.h"
+#include "nl_base.h"
#define TTL_9316(_name, _CLK, _ENP, _ENT, _CLRQ, _LOADQ, _A, _B, _C, _D) \
NET_REGISTER_DEV(TTL_9316, _name) \
diff --git a/src/emu/netlist/devices/nld_cmos.h b/src/emu/netlist/devices/nld_cmos.h
index e3783ade423..6883993a794 100644
--- a/src/emu/netlist/devices/nld_cmos.h
+++ b/src/emu/netlist/devices/nld_cmos.h
@@ -8,8 +8,8 @@
#ifndef NLD_CMOS_H_
#define NLD_CMOS_H_
-#include "../nl_base.h"
-#include "../analog/nld_twoterm.h"
+#include "nl_base.h"
+#include "analog/nld_twoterm.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/devices/nld_legacy.c b/src/emu/netlist/devices/nld_legacy.c
index d6b926545fe..834dda31110 100644
--- a/src/emu/netlist/devices/nld_legacy.c
+++ b/src/emu/netlist/devices/nld_legacy.c
@@ -6,7 +6,7 @@
*/
#include "nld_legacy.h"
-#include "../nl_setup.h"
+#include "nl_setup.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/devices/nld_legacy.h b/src/emu/netlist/devices/nld_legacy.h
index 62cdd8b02ca..8180ae7f774 100644
--- a/src/emu/netlist/devices/nld_legacy.h
+++ b/src/emu/netlist/devices/nld_legacy.h
@@ -13,7 +13,7 @@
#ifndef NLD_LEGACY_H_
#define NLD_LEGACY_H_
-#include "../nl_base.h"
+#include "nl_base.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/devices/nld_log.c b/src/emu/netlist/devices/nld_log.c
index d7d53aec3c1..c8d734a4d6c 100644
--- a/src/emu/netlist/devices/nld_log.c
+++ b/src/emu/netlist/devices/nld_log.c
@@ -5,8 +5,6 @@
*
*/
-#include <cstdio>
-
#include "nld_log.h"
//#include "sound/wavwrite.h"
diff --git a/src/emu/netlist/devices/nld_mm5837.c b/src/emu/netlist/devices/nld_mm5837.c
index e45c0bf8198..129456c8784 100644
--- a/src/emu/netlist/devices/nld_mm5837.c
+++ b/src/emu/netlist/devices/nld_mm5837.c
@@ -7,7 +7,7 @@
#include <solver/nld_solver.h>
#include "nld_mm5837.h"
-#include "../nl_setup.h"
+#include "nl_setup.h"
#define R_LOW (1000)
#define R_HIGH (1000)
diff --git a/src/emu/netlist/devices/nld_mm5837.h b/src/emu/netlist/devices/nld_mm5837.h
index e5aad3daa81..33b42640e92 100644
--- a/src/emu/netlist/devices/nld_mm5837.h
+++ b/src/emu/netlist/devices/nld_mm5837.h
@@ -19,8 +19,8 @@
#ifndef NLD_MM5837_H_
#define NLD_MM5837_H_
-#include "../nl_base.h"
-#include "../analog/nld_twoterm.h"
+#include "nl_base.h"
+#include "analog/nld_twoterm.h"
#define MM5837_DIP(_name) \
NET_REGISTER_DEV(MM5837_DIP, _name)
diff --git a/src/emu/netlist/devices/nld_ne555.c b/src/emu/netlist/devices/nld_ne555.c
index 6705081eb3a..efa6d25aec8 100644
--- a/src/emu/netlist/devices/nld_ne555.c
+++ b/src/emu/netlist/devices/nld_ne555.c
@@ -7,7 +7,7 @@
#include <solver/nld_solver.h>
#include "nld_ne555.h"
-#include "../nl_setup.h"
+#include "nl_setup.h"
#define R_OFF (1E20)
#define R_ON (25) // Datasheet states a maximum discharge of 200mA, R = 5V / 0.2
diff --git a/src/emu/netlist/devices/nld_ne555.h b/src/emu/netlist/devices/nld_ne555.h
index f02c7763ebd..11228ffd447 100644
--- a/src/emu/netlist/devices/nld_ne555.h
+++ b/src/emu/netlist/devices/nld_ne555.h
@@ -19,8 +19,8 @@
#ifndef NLD_NE555_H_
#define NLD_NE555_H_
-#include "../nl_base.h"
-#include "../analog/nld_twoterm.h"
+#include "nl_base.h"
+#include "analog/nld_twoterm.h"
#define NE555(_name) \
NET_REGISTER_DEV(NE555, _name)
diff --git a/src/emu/netlist/devices/nld_r2r_dac.h b/src/emu/netlist/devices/nld_r2r_dac.h
index 843c827a538..15b1e7fa364 100644
--- a/src/emu/netlist/devices/nld_r2r_dac.h
+++ b/src/emu/netlist/devices/nld_r2r_dac.h
@@ -46,8 +46,8 @@
#ifndef NLD_R2R_DAC_H_
#define NLD_R2R_DAC_H_
-#include "../nl_base.h"
-#include "../analog/nld_twoterm.h"
+#include "nl_base.h"
+#include "analog/nld_twoterm.h"
#define R2R_DAC(_name, _VIN, _R, _N) \
NET_REGISTER_DEV(R2R_DAC, _name) \
diff --git a/src/emu/netlist/devices/nld_signal.h b/src/emu/netlist/devices/nld_signal.h
index 0cf2bc7c238..fa8e9e6265b 100644
--- a/src/emu/netlist/devices/nld_signal.h
+++ b/src/emu/netlist/devices/nld_signal.h
@@ -8,7 +8,7 @@
#ifndef NLD_SIGNAL_H_
#define NLD_SIGNAL_H_
-#include "../nl_base.h"
+#include "nl_base.h"
// ----------------------------------------------------------------------------------------
// MACROS
diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h
index 27ed157b3f2..a2ae9d10d01 100644
--- a/src/emu/netlist/devices/nld_system.h
+++ b/src/emu/netlist/devices/nld_system.h
@@ -9,10 +9,10 @@
#ifndef NLD_SYSTEM_H_
#define NLD_SYSTEM_H_
-#include "../nl_setup.h"
-#include "../nl_base.h"
-#include "../nl_factory.h"
-#include "../analog/nld_twoterm.h"
+#include "nl_setup.h"
+#include "nl_base.h"
+#include "nl_factory.h"
+#include "analog/nld_twoterm.h"
// -----------------------------------------------------------------------------
// Macros
diff --git a/src/emu/netlist/devices/nld_truthtable.c b/src/emu/netlist/devices/nld_truthtable.c
index 4ae30d23cbf..b0a75183257 100644
--- a/src/emu/netlist/devices/nld_truthtable.c
+++ b/src/emu/netlist/devices/nld_truthtable.c
@@ -6,7 +6,7 @@
*/
#include "nld_truthtable.h"
-#include "../plib/plists.h"
+#include "plib/plists.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/devices/nld_truthtable.h b/src/emu/netlist/devices/nld_truthtable.h
index fdf2aa58fe2..1044d58e9b2 100644
--- a/src/emu/netlist/devices/nld_truthtable.h
+++ b/src/emu/netlist/devices/nld_truthtable.h
@@ -10,8 +10,8 @@
#ifndef NLD_TRUTHTABLE_H_
#define NLD_TRUTHTABLE_H_
-#include "../nl_base.h"
-#include "../nl_factory.h"
+#include "nl_base.h"
+#include "nl_factory.h"
#define NETLIB_TRUTHTABLE(_name, _nIN, _nOUT, _state) \
class NETLIB_NAME(_name) : public nld_truthtable_t<_nIN, _nOUT, _state> \
diff --git a/src/emu/netlist/macro/nlm_cd4xxx.h b/src/emu/netlist/macro/nlm_cd4xxx.h
index e841fb89afc..94c5d04aef8 100644
--- a/src/emu/netlist/macro/nlm_cd4xxx.h
+++ b/src/emu/netlist/macro/nlm_cd4xxx.h
@@ -1,7 +1,7 @@
#ifndef NLD_CD4XXX_H_
#define NLD_CD4XXX_H_
-#include "../nl_setup.h"
+#include "nl_setup.h"
/*
* Devices:
diff --git a/src/emu/netlist/macro/nlm_opamp.h b/src/emu/netlist/macro/nlm_opamp.h
index 5b24ffc4842..8612f72e453 100644
--- a/src/emu/netlist/macro/nlm_opamp.h
+++ b/src/emu/netlist/macro/nlm_opamp.h
@@ -1,7 +1,7 @@
#ifndef NLM_OPAMP_H_
#define NLM_OPAMP_H_
-#include "../nl_setup.h"
+#include "nl_setup.h"
#ifndef __PLIB_PREPROCESSOR__
diff --git a/src/emu/netlist/macro/nlm_other.h b/src/emu/netlist/macro/nlm_other.h
index 3bf574d6973..cc104968ed3 100644
--- a/src/emu/netlist/macro/nlm_other.h
+++ b/src/emu/netlist/macro/nlm_other.h
@@ -1,7 +1,7 @@
#ifndef NLM_OTHER_H_
#define NLM_OTHER_H_
-#include "../nl_setup.h"
+#include "nl_setup.h"
#ifndef __PLIB_PREPROCESSOR__
diff --git a/src/emu/netlist/macro/nlm_ttl74xx.h b/src/emu/netlist/macro/nlm_ttl74xx.h
index d322588eb52..0fed60235c1 100644
--- a/src/emu/netlist/macro/nlm_ttl74xx.h
+++ b/src/emu/netlist/macro/nlm_ttl74xx.h
@@ -1,7 +1,7 @@
#ifndef NLD_TTL74XX_H_
#define NLD_TTL74XX_H_
-#include "../nl_setup.h"
+#include "nl_setup.h"
#ifndef __PLIB_PREPROCESSOR__
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index 0c0b8e4d0fd..f9887de1349 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -8,7 +8,6 @@
#include <solver/nld_solver.h>
#include <cstring>
#include <algorithm>
-#include <cstdio>
#include "plib/palloc.h"
diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c
index 1900cfaed91..3cb615a2906 100644
--- a/src/emu/netlist/nl_setup.c
+++ b/src/emu/netlist/nl_setup.c
@@ -5,8 +5,7 @@
*
*/
-#include <solver/nld_solver.h>
-#include <cstdio>
+#include "solver/nld_solver.h"
#include "plib/palloc.h"
#include "nl_base.h"
diff --git a/src/emu/netlist/solver/mat_cr.h b/src/emu/netlist/solver/mat_cr.h
index 195e856784b..21f68366bc9 100644
--- a/src/emu/netlist/solver/mat_cr.h
+++ b/src/emu/netlist/solver/mat_cr.h
@@ -11,7 +11,7 @@
#define MAT_CR_H_
#include <algorithm>
-#include "../plib/pconfig.h"
+#include "plib/pconfig.h"
template<int _storage_N>
struct mat_cr_t
diff --git a/src/emu/netlist/solver/nld_ms_direct.h b/src/emu/netlist/solver/nld_ms_direct.h
index f64514a1c7c..4a304a54dde 100644
--- a/src/emu/netlist/solver/nld_ms_direct.h
+++ b/src/emu/netlist/solver/nld_ms_direct.h
@@ -10,7 +10,7 @@
#include <algorithm>
-#include "../solver/nld_solver.h"
+#include "solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/solver/nld_ms_direct1.h b/src/emu/netlist/solver/nld_ms_direct1.h
index d2009846053..85bb0388168 100644
--- a/src/emu/netlist/solver/nld_ms_direct1.h
+++ b/src/emu/netlist/solver/nld_ms_direct1.h
@@ -8,8 +8,8 @@
#ifndef NLD_MS_DIRECT1_H_
#define NLD_MS_DIRECT1_H_
-#include "../solver/nld_ms_direct.h"
-#include "../solver/nld_solver.h"
+#include "solver/nld_ms_direct.h"
+#include "solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/solver/nld_ms_direct2.h b/src/emu/netlist/solver/nld_ms_direct2.h
index 79f9e55d908..10060f2a767 100644
--- a/src/emu/netlist/solver/nld_ms_direct2.h
+++ b/src/emu/netlist/solver/nld_ms_direct2.h
@@ -8,8 +8,8 @@
#ifndef NLD_MS_DIRECT2_H_
#define NLD_MS_DIRECT2_H_
-#include "../solver/nld_ms_direct.h"
-#include "../solver/nld_solver.h"
+#include "solver/nld_ms_direct.h"
+#include "solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/solver/nld_ms_gmres.h b/src/emu/netlist/solver/nld_ms_gmres.h
index 102549b9194..9b8eca08b78 100644
--- a/src/emu/netlist/solver/nld_ms_gmres.h
+++ b/src/emu/netlist/solver/nld_ms_gmres.h
@@ -14,10 +14,10 @@
#include <algorithm>
-#include "../solver/mat_cr.h"
-#include "../solver/nld_ms_direct.h"
-#include "../solver/nld_solver.h"
-#include "../solver/vector_base.h"
+#include "solver/mat_cr.h"
+#include "solver/nld_ms_direct.h"
+#include "solver/nld_solver.h"
+#include "solver/vector_base.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/solver/nld_ms_sor.h b/src/emu/netlist/solver/nld_ms_sor.h
index 82c10c5c9d8..d91fe1d1412 100644
--- a/src/emu/netlist/solver/nld_ms_sor.h
+++ b/src/emu/netlist/solver/nld_ms_sor.h
@@ -14,8 +14,8 @@
#include <algorithm>
-#include "../solver/nld_ms_direct.h"
-#include "../solver/nld_solver.h"
+#include "solver/nld_ms_direct.h"
+#include "solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/solver/nld_ms_sor_mat.h b/src/emu/netlist/solver/nld_ms_sor_mat.h
index d5ce05ef8b1..ffdb2813f89 100644
--- a/src/emu/netlist/solver/nld_ms_sor_mat.h
+++ b/src/emu/netlist/solver/nld_ms_sor_mat.h
@@ -14,8 +14,8 @@
#include <algorithm>
-#include "../solver/nld_ms_direct.h"
-#include "../solver/nld_solver.h"
+#include "solver/nld_ms_direct.h"
+#include "solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/solver/nld_solver.c b/src/emu/netlist/solver/nld_solver.c
index 9bae485e2f9..47413820d19 100644
--- a/src/emu/netlist/solver/nld_solver.c
+++ b/src/emu/netlist/solver/nld_solver.c
@@ -44,7 +44,7 @@
#include "nld_ms_sor_mat.h"
#include "nld_ms_gmres.h"
//#include "nld_twoterm.h"
-#include "../nl_lists.h"
+#include "nl_lists.h"
#if HAS_OPENMP
#include "omp.h"
diff --git a/src/emu/netlist/solver/nld_solver.h b/src/emu/netlist/solver/nld_solver.h
index 682483dfde3..67e76f45e1c 100644
--- a/src/emu/netlist/solver/nld_solver.h
+++ b/src/emu/netlist/solver/nld_solver.h
@@ -8,8 +8,8 @@
#ifndef NLD_SOLVER_H_
#define NLD_SOLVER_H_
-#include "../nl_setup.h"
-#include "../nl_base.h"
+#include "nl_setup.h"
+#include "nl_base.h"
//#define ATTR_ALIGNED(N) __attribute__((aligned(N)))
#define ATTR_ALIGNED(N) ATTR_ALIGN
diff --git a/src/emu/netlist/solver/vector_base.h b/src/emu/netlist/solver/vector_base.h
index c5b86cdb5e8..be0d59692a3 100644
--- a/src/emu/netlist/solver/vector_base.h
+++ b/src/emu/netlist/solver/vector_base.h
@@ -11,7 +11,7 @@
#define VECTOR_BASE_H_
#include <algorithm>
-#include "../plib/pconfig.h"
+#include "plib/pconfig.h"
#if 0
template <unsigned _storage_N>