netlist: Fix relative include paths and a conflict. (nw)

nl_types.h is part of libc++. Any project with a file with the same name
on the include path just fails to compile. Renamed to nltypes.h

src/devices/machine/netlist.h

@@ -13,7 +13,7 @@
 
 #include <functional>
 
-#include "../../lib/netlist/nl_types.h"
+#include "../../lib/netlist/nltypes.h"
 
 class nld_sound_out;
 class nld_sound_in;

src/lib/netlist/analog/nld_bjt.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "../solver/nld_solver.h"
-#include "../nl_setup.h"
+#include "netlist/solver/nld_solver.h"
+#include "netlist/nl_setup.h"
 #include "nlid_twoterm.h"
 
 #include <cmath>

src/lib/netlist/analog/nld_bjt.h

@@ -8,7 +8,7 @@
 #ifndef NLD_BJT_H_
 #define NLD_BJT_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 // -----------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nld_fourterm.h

@@ -9,7 +9,7 @@
 #define NLD_FOURTERM_H_
 
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 // ----------------------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nld_opamps.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "nld_opamps.h"
-#include "../nl_base.h"
-#include "../nl_errstr.h"
+#include "netlist/nl_base.h"
+#include "netlist/nl_errstr.h"
 #include "nlid_fourterm.h"
 #include "nlid_twoterm.h"
 

src/lib/netlist/analog/nld_opamps.h

@@ -10,7 +10,7 @@
 #ifndef NLD_OPAMPS_H_
 #define NLD_OPAMPS_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 // ----------------------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nld_switches.h

@@ -10,7 +10,7 @@
 #ifndef NLD_SWITCHES_H_
 #define NLD_SWITCHES_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 // ----------------------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nld_twoterm.h

@@ -4,7 +4,7 @@
 #ifndef NLD_TWOTERM_H_
 #define NLD_TWOTERM_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 // -----------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nlid_fourterm.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "../solver/nld_solver.h"
-#include "../nl_factory.h"
+#include "netlist/solver/nld_solver.h"
+#include "netlist/nl_factory.h"
 #include "nlid_fourterm.h"
 
 #include <cmath>

src/lib/netlist/analog/nlid_fourterm.h

@@ -8,7 +8,7 @@
 #ifndef NLID_FOURTERM_H_
 #define NLID_FOURTERM_H_
 
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 #include "plib/putil.h"
 
 namespace netlist {

src/lib/netlist/analog/nlid_twoterm.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "../solver/nld_solver.h"
+#include "netlist/solver/nld_solver.h"
 
-#include "../nl_factory.h"
+#include "netlist/nl_factory.h"
 #include "nlid_twoterm.h"
 
 #include <cmath>

src/lib/netlist/devices/net_lib.cpp

@@ -9,8 +9,8 @@
 ****************************************************************************/
 
 #include "net_lib.h"
-#include "../nl_factory.h"
-#include "../solver/nld_solver.h"
+#include "netlist/nl_factory.h"
+#include "netlist/solver/nld_solver.h"
 
 
 #define xstr(s) # s

src/lib/netlist/devices/net_lib.h

@@ -85,16 +85,16 @@
 
 #include "nld_log.h"
 
-#include "../macro/nlm_cd4xxx.h"
-#include "../macro/nlm_opamp.h"
-#include "../macro/nlm_other.h"
-#include "../macro/nlm_ttl74xx.h"
+#include "netlist/macro/nlm_cd4xxx.h"
+#include "netlist/macro/nlm_opamp.h"
+#include "netlist/macro/nlm_other.h"
+#include "netlist/macro/nlm_ttl74xx.h"
 
-#include "../analog/nld_bjt.h"
-#include "../analog/nld_fourterm.h"
-#include "../analog/nld_opamps.h"
-#include "../analog/nld_switches.h"
-#include "../analog/nld_twoterm.h"
+#include "netlist/analog/nld_bjt.h"
+#include "netlist/analog/nld_fourterm.h"
+#include "netlist/analog/nld_opamps.h"
+#include "netlist/analog/nld_switches.h"
+#include "netlist/analog/nld_twoterm.h"
 
 #include "nld_legacy.h"
 #endif

src/lib/netlist/devices/nld_2102A.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_2102A.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 #define ADDR2BYTE(a)    ((a) >> 3)
 #define ADDR2BIT(a)     ((a) & 0x7)

src/lib/netlist/devices/nld_2102A.h

@@ -24,7 +24,7 @@
 #ifndef NLD_2102A_H_
 #define NLD_2102A_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI)  \
 		NET_REGISTER_DEV(RAM_2102A, name)   \

src/lib/netlist/devices/nld_2716.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_2716.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_2716.h

@@ -28,7 +28,7 @@
 #ifndef NLD_2716_H_
 #define NLD_2716_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define EPROM_2716(name, cGQ, cEPQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10) \
 		NET_REGISTER_DEV(EPROM_2716, name) \

src/lib/netlist/devices/nld_4020.h

@@ -27,7 +27,7 @@
 #ifndef NLD_4020_H_
 #define NLD_4020_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 /* FIXME: only used in mario.c */
 #define CD4020_WI(name, cIP, cRESET, cVDD, cVSS)                                \

src/lib/netlist/devices/nld_4066.h

@@ -24,7 +24,7 @@
 #ifndef NLD_4066_H_
 #define NLD_4066_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define CD4066_GATE(name)                                                       \
 		NET_REGISTER_DEV(CD4066_GATE, name)

src/lib/netlist/devices/nld_4316.h

@@ -25,7 +25,7 @@
 #ifndef NLD_4316_H_
 #define NLD_4316_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define CD4316_GATE(name)                                                       \
 		NET_REGISTER_DEV(CD4316_GATE, name)

src/lib/netlist/devices/nld_74107.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74107.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74107.h

@@ -64,7 +64,7 @@
 #ifndef NLD_74107_H_
 #define NLD_74107_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74107A(name, cCLK, cJ, cK, cCLRQ)                                   \
 		NET_REGISTER_DEV(TTL_74107A, name)                                      \

src/lib/netlist/devices/nld_74123.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nlid_system.h"
-#include "../analog/nlid_twoterm.h"
+#include "netlist/analog/nlid_twoterm.h"
 
 #include <cmath>
 

src/lib/netlist/devices/nld_74123.h

@@ -49,7 +49,7 @@
 #ifndef NLD_74123_H_
 #define NLD_74123_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74123(name)                                                         \
 		NET_REGISTER_DEV(TTL_74123, name)

src/lib/netlist/devices/nld_74153.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74153.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74153.h

@@ -45,7 +45,7 @@
 #ifndef NLD_74153_H_
 #define NLD_74153_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG)                         \
 		NET_REGISTER_DEV(TTL_74153, name)                                       \

src/lib/netlist/devices/nld_74161.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74161.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74161.h

@@ -25,7 +25,7 @@
 #ifndef NLD_74161_H_
 #define NLD_74161_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74161(name, cA, cB, cC, cD, cCLRQ, cLOADQ, cCLK, cENABLEP, cENABLET)    \
 		NET_REGISTER_DEV(TTL_74161, name)   \

src/lib/netlist/devices/nld_74164.cpp

@@ -9,7 +9,7 @@
  */
 
 #include "nld_74164.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74164.h

@@ -42,7 +42,7 @@
 #ifndef NLD_74164_H_
 #define NLD_74164_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74164(name, cA, cB, cCLRQ, cCLK) \
 		NET_REGISTER_DEV(TTL_74164, name)   \

src/lib/netlist/devices/nld_74165.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74165.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74165.h

@@ -27,7 +27,7 @@
 #ifndef NLD_74165_H_
 #define NLD_74165_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH)   \
 		NET_REGISTER_DEV(TTL_74165, name)   \

src/lib/netlist/devices/nld_74166.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74166.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74166.h

@@ -27,7 +27,7 @@
 #ifndef NLD_74166_H_
 #define NLD_74166_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ)    \
 		NET_REGISTER_DEV(TTL_74166, name)   \

src/lib/netlist/devices/nld_74174.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74174.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74174.h

@@ -36,7 +36,7 @@
 #ifndef NLD_74174_H_
 #define NLD_74174_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ)  \
 		NET_REGISTER_DEV(TTL_74174, name)   \

src/lib/netlist/devices/nld_74175.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74175.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74175.h

@@ -36,7 +36,7 @@
 #ifndef NLD_74175_H_
 #define NLD_74175_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74175(name, cCLK, cD1, cD2, cD3, cD4, cCLRQ)    \
 		NET_REGISTER_DEV(TTL_74175, name)   \

src/lib/netlist/devices/nld_74192.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74192.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74192.h

@@ -29,7 +29,7 @@
 #ifndef NLD_74192_H_
 #define NLD_74192_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74192(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD)               \
 		NET_REGISTER_DEV(TTL_74192, name)   \

src/lib/netlist/devices/nld_74193.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74193.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74193.h

@@ -26,7 +26,7 @@
 #ifndef NLD_74193_H_
 #define NLD_74193_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74193(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD)   \
 		NET_REGISTER_DEV(TTL_74193, name)   \

src/lib/netlist/devices/nld_74194.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74194.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74194.h

@@ -26,7 +26,7 @@
 #ifndef NLD_74194_H_
 #define NLD_74194_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ)    \
 		NET_REGISTER_DEV(TTL_74194, name)   \

src/lib/netlist/devices/nld_74365.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_74365.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74365.h

@@ -25,7 +25,7 @@
 #ifndef NLD_74365_H_
 #define NLD_74365_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_74365(name, cG1Q, cG2Q, cA1, cA2, cA3, cA4, cA5, cA6)   \
 		NET_REGISTER_DEV(TTL_74365, name)   \

src/lib/netlist/devices/nld_7448.h

@@ -24,7 +24,7 @@
 #ifndef NLD_7448_H_
 #define NLD_7448_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #ifndef NL_AUTO_DEVICES
 

src/lib/netlist/devices/nld_7450.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_7450.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7450.h

@@ -24,7 +24,7 @@
 #ifndef NLD_7450_H_
 #define NLD_7450_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4)                          \
 		NET_REGISTER_DEV(TTL_7450_ANDORINVERT, name)                            \

src/lib/netlist/devices/nld_7473.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_7473.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7473.h

@@ -60,7 +60,7 @@
 #ifndef NLD_7473_H_
 #define NLD_7473_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_7473(name, cCLK, cJ, cK, cCLRQ) \
 		NET_REGISTER_DEV(TTL_7473, name)        \

src/lib/netlist/devices/nld_7474.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "nld_7474.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7474.h

@@ -42,7 +42,7 @@
 #ifndef NLD_7474_H_
 #define NLD_7474_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_7474(name, cCLK, cD, cCLRQ, cPREQ)                                  \
 		NET_REGISTER_DEV(TTL_7474, name)                                        \

src/lib/netlist/devices/nld_7475.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "nld_7475.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7475.h

@@ -35,7 +35,7 @@
 #ifndef NLD_7475_H_
 #define NLD_7475_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4)    \
 		NET_CONNECT(name, C1C2, cC1C2)      \

src/lib/netlist/devices/nld_7483.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_7483.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7483.h

@@ -27,7 +27,7 @@
 #ifndef NLD_7483_H_
 #define NLD_7483_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI)             \
 		NET_REGISTER_DEV(TTL_7483, name)                                        \

src/lib/netlist/devices/nld_7485.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_7485.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7485.h

@@ -23,7 +23,7 @@
 #ifndef NLD_7485_H_
 #define NLD_7485_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN)    \
 		NET_REGISTER_DEV(TTL_7485, name)    \

src/lib/netlist/devices/nld_7490.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_7490.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7490.h

@@ -55,7 +55,7 @@
 #ifndef NLD_7490_H_
 #define NLD_7490_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92)                               \
 		NET_REGISTER_DEV(TTL_7490, name)                                               \

src/lib/netlist/devices/nld_7493.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_7493.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7493.h

@@ -57,7 +57,7 @@
 #ifndef NLD_7493_H_
 #define NLD_7493_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_7493(name, cCLKA, cCLKB, cR1, cR2)                                  \
 		NET_REGISTER_DEV(TTL_7493, name)                                        \

src/lib/netlist/devices/nld_7497.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "nld_7497.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7497.h

@@ -35,7 +35,7 @@
 #ifndef NLD_7497_H_
 #define NLD_7497_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_7497(name, cCLK, cSTRB, cEN, cUNITY, cCLR, cB0, cB1, cB2, cB3, cB4, cB5) \
 		NET_REGISTER_DEV(TTL_7497, name)                                             \

src/lib/netlist/devices/nld_74ls629.cpp

@@ -40,7 +40,7 @@
 
 
 #include "nld_74ls629.h"
-#include "../analog/nlid_twoterm.h"
+#include "netlist/analog/nlid_twoterm.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74ls629.h

@@ -28,7 +28,7 @@
 #ifndef NLD_74LS629_H_
 #define NLD_74LS629_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define SN74LS629(name, p_cap)                                                  \
 		NET_REGISTER_DEV(SN74LS629, name)                                       \

src/lib/netlist/devices/nld_82S115.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_82S115.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_82S115.h

@@ -28,7 +28,7 @@
 #ifndef NLD_82S115_H_
 #define NLD_82S115_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE)    \
 		NET_REGISTER_DEV(PROM_82S115, name) \

src/lib/netlist/devices/nld_82S123.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_82S123.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_82S123.h

@@ -25,7 +25,7 @@
 #ifndef NLD_82S123_H_
 #define NLD_82S123_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define PROM_82S123(name, cCEQ, cA0, cA1, cA2, cA3, cA4)    \
 		NET_REGISTER_DEV(PROM_82S123, name) \

src/lib/netlist/devices/nld_82S126.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_82S126.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_82S126.h

@@ -24,7 +24,7 @@
 #ifndef NLD_82S126_H_
 #define NLD_82S126_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7) \
 		NET_REGISTER_DEV(PROM_82S126, name) \

src/lib/netlist/devices/nld_82S16.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_82S16.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_82S16.h

@@ -24,7 +24,7 @@
 #ifndef NLD_82S16_H_
 #define NLD_82S16_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_82S16(name)                                     \
 		NET_REGISTER_DEV(TTL_82S16, name)

src/lib/netlist/devices/nld_9310.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_9310.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 #define MAXCNT 9
 

src/lib/netlist/devices/nld_9310.h

@@ -45,7 +45,7 @@
 #ifndef NLD_9310_H_
 #define NLD_9310_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_9310(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD)         \
 		NET_REGISTER_DEV(TTL_9310, name)                                        \

src/lib/netlist/devices/nld_9316.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_9316.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_9316.h

@@ -51,7 +51,7 @@
 #ifndef NLD_9316_H_
 #define NLD_9316_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD)         \
 		NET_REGISTER_DEV(TTL_9316, name)                                        \

src/lib/netlist/devices/nld_9322.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_9322.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_9322.h

@@ -21,7 +21,7 @@
 #ifndef NLD_9322_H_
 #define NLD_9322_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE)    \
 		NET_REGISTER_DEV(TTL_9322, name)    \

src/lib/netlist/devices/nld_am2847.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_am2847.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_am2847.h

@@ -21,7 +21,7 @@
 #ifndef NLD_AM2847_H_
 #define NLD_AM2847_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_AM2847(name, cCP, cINA, cINB, cINC, cIND, cRCA, cRCB, cRCC, cRCD)   \
 		NET_REGISTER_DEV(TTL_AM2847, name)  \

src/lib/netlist/devices/nld_dm9314.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_dm9314.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_dm9314.h

@@ -21,7 +21,7 @@
 #ifndef NLD_DM9314_H_
 #define NLD_DM9314_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_9314(name, cEQ, cMRQ, cS0Q, cS1Q, cS2Q, cS3Q, cD0, cD1, cD2, cD3) \
 		NET_REGISTER_DEV(TTL_9314, name)    \

src/lib/netlist/devices/nld_dm9334.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_dm9334.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_dm9334.h

@@ -65,7 +65,7 @@
 #ifndef NLD_DM9334_H_
 #define NLD_DM9334_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define TTL_9334(name, cCQ, cEQ, cD, cA0, cA1, cA2) \
 		NET_REGISTER_DEV(TTL_9334, name)    \

src/lib/netlist/devices/nld_legacy.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "nld_legacy.h"
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_legacy.h

@@ -13,7 +13,7 @@
 #ifndef NLD_LEGACY_H_
 #define NLD_LEGACY_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 // ----------------------------------------------------------------------------------------
 // Macros

src/lib/netlist/devices/nld_log.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "../nl_base.h"
+#include "netlist/nl_base.h"
 #include "plib/pfmtlog.h"
 #include "plib/pstream.h"
 #include "nld_log.h"

src/lib/netlist/devices/nld_log.h

@@ -18,7 +18,7 @@
 #ifndef NLD_LOG_H_
 #define NLD_LOG_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define LOG(name, cI)                                                        \
 		NET_REGISTER_DEV(LOG, name)                                         \

src/lib/netlist/devices/nld_mm5837.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "nld_mm5837.h"
-#include "../analog/nlid_twoterm.h"
-#include "../solver/nld_matrix_solver.h"
+#include "netlist/analog/nlid_twoterm.h"
+#include "netlist/solver/nld_matrix_solver.h"
 
 #define R_LOW (1000.0)
 #define R_HIGH (1000.0)

src/lib/netlist/devices/nld_mm5837.h

@@ -19,7 +19,7 @@
 #ifndef NLD_MM5837_H_
 #define NLD_MM5837_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define MM5837_DIP(name)                                                        \
 		NET_REGISTER_DEV(MM5837_DIP, name)

src/lib/netlist/devices/nld_ne555.cpp

@@ -46,8 +46,8 @@
  */
 
 #include "nld_ne555.h"
-#include "../analog/nlid_twoterm.h"
-#include "../solver/nld_solver.h"
+#include "netlist/analog/nlid_twoterm.h"
+#include "netlist/solver/nld_solver.h"
 
 #define R_OFF (1E20)
 #define R_ON (25)   // Datasheet states a maximum discharge of 200mA, R = 5V / 0.2

src/lib/netlist/devices/nld_ne555.h

@@ -4,7 +4,7 @@
 #ifndef NLD_NE555_H_
 #define NLD_NE555_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define NE555(name)                                                             \
 		NET_REGISTER_DEV(NE555, name)

src/lib/netlist/devices/nld_r2r_dac.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "../nl_base.h"
-#include "../analog/nlid_twoterm.h"
-#include "../nl_factory.h"
+#include "netlist/nl_base.h"
+#include "netlist/analog/nlid_twoterm.h"
+#include "netlist/nl_factory.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_r2r_dac.h

@@ -46,7 +46,7 @@
 #ifndef NLD_R2R_DAC_H_
 #define NLD_R2R_DAC_H_
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 #define R2R_DAC(name, p_VIN, p_R, p_N)                                          \
 		NET_REGISTER_DEV(R2R_DAC, name)                                         \

src/lib/netlist/devices/nld_schmitt.cpp

@@ -7,10 +7,10 @@
 
 #include "nld_schmitt.h"
 
-#include "../analog/nlid_twoterm.h"
-#include "../nl_base.h"
-#include "../nl_errstr.h"
-#include "../solver/nld_solver.h"
+#include "netlist/analog/nlid_twoterm.h"
+#include "netlist/nl_base.h"
+#include "netlist/nl_errstr.h"
+#include "netlist/solver/nld_solver.h"
 
 #include <cmath>
 

src/lib/netlist/devices/nld_schmitt.h

@@ -11,7 +11,7 @@
 #define NLD_SCHMITT_H_
 
 
-#include "../nl_setup.h"
+#include "netlist/nl_setup.h"
 
 // ----------------------------------------------------------------------------------------
 // Macros

src/lib/netlist/devices/nld_system.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "../solver/nld_solver.h"
-#include "../solver/nld_matrix_solver.h"
+#include "netlist/solver/nld_solver.h"
+#include "netlist/solver/nld_matrix_solver.h"
 #include "nlid_system.h"
 
 namespace netlist