diff --git a/src/lib/netlist/analog/nld_twoterm.h b/src/lib/netlist/analog/nld_twoterm.h
index 1ad39247660..1ed284a9e59 100644
--- a/src/lib/netlist/analog/nld_twoterm.h
+++ b/src/lib/netlist/analog/nld_twoterm.h
@@ -40,23 +40,4 @@
 #define CS(name, pI)                                                           \
 		NET_REGISTER_DEVEXT(CS, name, pI)
 
-// -----------------------------------------------------------------------------
-// Generic macros
-// -----------------------------------------------------------------------------
-
-#ifdef RES_R
-#warning "Do not include rescap.h in a netlist environment"
-#endif
-#ifndef RES_R
-#define RES_R(res) (res)
-#define RES_K(res) ((res) * 1e3)
-#define RES_M(res) ((res) * 1e6)
-#define CAP_U(cap) ((cap) * 1e-6)
-#define CAP_N(cap) ((cap) * 1e-9)
-#define CAP_P(cap) ((cap) * 1e-12)
-#define IND_U(ind) ((ind) * 1e-6)
-#define IND_N(ind) ((ind) * 1e-9)
-#define IND_P(ind) ((ind) * 1e-12)
-#endif
-
 #endif // NLD_TWOTERM_H_
diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
index bae49e160f2..b7a6a691222 100644
--- a/src/lib/netlist/devices/net_lib.h
+++ b/src/lib/netlist/devices/net_lib.h
@@ -14,10 +14,6 @@
 
 //#define NL_AUTO_DEVICES 1
 
-#ifdef NL_AUTO_DEVICES
-#include "nld_devinc.h"
-
-// FIXME: copied from nld_twoterm.h
 #ifdef RES_R
 #warning "Do not include rescap.h in a netlist environment"
 #endif
@@ -33,6 +29,9 @@
 #define IND_P(ind) ((ind) * 1e-12)
 #endif
 
+#ifdef NL_AUTO_DEVICES
+#include "nld_devinc.h"
+
 #include "netlist/macro/nlm_cd4xxx.h"
 #include "netlist/macro/nlm_opamp.h"
 #include "netlist/macro/nlm_other.h"