--- a/src/dgt_long.h
+++ b/src/dgt_long.h
@@ -1,7 +1,7 @@
-LTFAT_EXTERN void 
-LTFAT_H_NAME(dgt_long)(const LTFAT_H_COMPLEX *f, const LTFAT_H_COMPLEX *g,
+LTFAT_EXTERN void
+LTFAT_NAME(dgt_long)(const LTFAT_COMPLEX *f, const LTFAT_COMPLEX *g,
                       const int L, const int W,  const int a,
-                      const int M, LTFAT_H_COMPLEX *cout);
+                      const int M, LTFAT_COMPLEX *cout);
 
 typedef struct
 {
@@ -11,30 +11,30 @@
   int W;
   int c;
   int h_a;
-  LTFAT_H_FFTW(plan) p_before; 
-  LTFAT_H_FFTW(plan) p_after;
-  LTFAT_H_FFTW(plan) p_veryend;
-  LTFAT_H_REAL *sbuf;
-  const LTFAT_H_COMPLEX *f;
-  LTFAT_H_COMPLEX *gf;
-  LTFAT_H_COMPLEX *cout;
-  LTFAT_H_REAL *ff, *cf;
+  LTFAT_FFTW(plan) p_before;
+  LTFAT_FFTW(plan) p_after;
+  LTFAT_FFTW(plan) p_veryend;
+  LTFAT_REAL *sbuf;
+  const LTFAT_COMPLEX *f;
+  LTFAT_COMPLEX *gf;
+  LTFAT_COMPLEX *cout;
+  LTFAT_REAL *ff, *cf;
 
-} LTFAT_H_NAME(dgt_long_plan);
+} LTFAT_NAME(dgt_long_plan);
 
 
-LTFAT_EXTERN LTFAT_H_NAME(dgt_long_plan)
-LTFAT_H_NAME(dgt_long_init)(const LTFAT_H_COMPLEX *f, const LTFAT_H_COMPLEX *g,
+LTFAT_EXTERN LTFAT_NAME(dgt_long_plan)
+LTFAT_NAME(dgt_long_init)(const LTFAT_COMPLEX *f, const LTFAT_COMPLEX *g,
                        const int L, const int W, const int a,
-                       const int M, LTFAT_H_COMPLEX *cout,
+                       const int M, LTFAT_COMPLEX *cout,
                        unsigned flags);
 
-LTFAT_EXTERN void 
-LTFAT_H_NAME(dgt_long_execute)(const LTFAT_H_NAME(dgt_long_plan) plan);
+LTFAT_EXTERN void
+LTFAT_NAME(dgt_long_execute)(const LTFAT_NAME(dgt_long_plan) plan);
 
 LTFAT_EXTERN void
-LTFAT_H_NAME(dgt_long_done)(LTFAT_H_NAME(dgt_long_plan) plan);
+LTFAT_NAME(dgt_long_done)(LTFAT_NAME(dgt_long_plan) plan);
 
 
 LTFAT_EXTERN void
-LTFAT_H_NAME(dgt_walnut_plan)(LTFAT_H_NAME(dgt_long_plan) plan);
+LTFAT_NAME(dgt_walnut_plan)(LTFAT_NAME(dgt_long_plan) plan);