diff --git a/src/frontend/fourier.c b/src/frontend/fourier.c
index 62310d9a7..af55f5801 100644
--- a/src/frontend/fourier.c
+++ b/src/frontend/fourier.c
@@ -16,6 +16,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "ngspice/fteparse.h"
 #include "ngspice/sperror.h"
 #include "ngspice/const.h"
+#include "ngspice/sim.h"
 
 #include "fourier.h"
 #include "variable.h"
@@ -197,7 +198,7 @@ fourier(wordlist *wl, struct plot *current_plot)
             n = alloc(struct dvec);
             ZERO(n, struct dvec);
             n->v_name = copy(newvecname);
-            n->v_type = 0;
+            n->v_type = SV_NOTYPE;
             n->v_flags = (1 | VF_PERMANENT);
             n->v_length = 3 * nfreqs;
             n->v_numdims = 2;
diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index e250540b0..5ddee8142 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -94,7 +94,7 @@ findvec(char *word, struct plot *pl)
 
     if (cieq(word, "allv")) {
         for (d = pl->pl_dvecs; d; d = d->v_next) {
-            if ((d->v_flags & VF_PERMANENT) && (d->v_type == 3)) {
+            if ((d->v_flags & VF_PERMANENT) && (d->v_type == SV_VOLTAGE)) {
                 if (d->v_link2) {
                     v = vec_copy(d);
                     vec_new(v);
@@ -113,7 +113,7 @@ findvec(char *word, struct plot *pl)
 
     if (cieq(word, "alli")) {
         for (d = pl->pl_dvecs; d; d = d->v_next) {
-            if ((d->v_flags & VF_PERMANENT) && (d->v_type == 4)) {
+            if ((d->v_flags & VF_PERMANENT) && (d->v_type == SV_CURRENT)) {
                 if (d->v_link2) {
                     v = vec_copy(d);
                     vec_new(v);