diff --git a/src/conv.h b/src/conv.h
index 40b2548..4994b13 100644
--- a/src/conv.h
+++ b/src/conv.h
@@ -21,14 +21,6 @@ typedef struct conv_set* conv_object;
 
 conv_object conv_init(int N, int L);
 
-struct conv_set{
-	fft_real_object fobj;
-	fft_real_object iobj;
-	int ilen1;
-	int ilen2;
-	int clen;
-};
-
 int factorf(int M);
 
 int findnext(int M);
diff --git a/src/hsfft.h b/src/hsfft.h
index 95d6b71..4416c4d 100644
--- a/src/hsfft.h
+++ b/src/hsfft.h
@@ -12,6 +12,8 @@
 #include <math.h>
 #include <string.h>
 
+#include "wavelib.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,11 +24,6 @@ extern "C" {
 #define fft_type double
 #endif
 
-
-typedef struct fft_t {
-  fft_type re;
-  fft_type im;
-} fft_data;
 /*
 #define SADD(a,b) ((a)+(b))
 
@@ -39,15 +36,6 @@ typedef struct fft_set* fft_object;
 
 fft_object fft_init(int N, int sgn);
 
-struct fft_set{
-	int N;
-	int sgn;
-	int factors[64];
-	int lf;
-	int lt;
-	fft_data twiddle[1];
-};
-
 void fft_exec(fft_object obj,fft_data *inp,fft_data *oup);
 
 int divideby(int M,int d);
diff --git a/src/real.h b/src/real.h
index 42d30eb..2822bb1 100644
--- a/src/real.h
+++ b/src/real.h
@@ -18,11 +18,6 @@ typedef struct fft_real_set* fft_real_object;
 
 fft_real_object fft_real_init(int N, int sgn);
 
-struct fft_real_set{
-	fft_object cobj;
-	fft_data twiddle2[1];
-};
-
 void fft_r2c_exec(fft_real_object obj,fft_type *inp,fft_data *oup);
 
 void fft_c2r_exec(fft_real_object obj,fft_data *inp,fft_type *oup);
diff --git a/src/wavelib.c b/src/wavelib.c
index c4d8d25..c05a068 100644
--- a/src/wavelib.c
+++ b/src/wavelib.c
@@ -11,7 +11,6 @@
 #include "wavelib.h"
 #include "wtmath.h"
 
-
 wave_object wave_init(const char* wname) {
 	wave_object obj = NULL;
 	int retval;
diff --git a/unitTests/wavelibBoostTests/tst_dwt.cpp b/unitTests/wavelibBoostTests/tst_dwt.cpp
index 6fe71e6..159901f 100644
--- a/unitTests/wavelibBoostTests/tst_dwt.cpp
+++ b/unitTests/wavelibBoostTests/tst_dwt.cpp
@@ -5,6 +5,7 @@
 #include <sstream>
 #include <iostream>
 #include <cstdlib>
+#include <cstring>
 
 #include <string>
 #include <cmath>