diff --git a/cpp/negentropy_wrapper.c b/cpp/negentropy_wrapper.c
index d744fea..32e2b1f 100644
--- a/cpp/negentropy_wrapper.c
+++ b/cpp/negentropy_wrapper.c
@@ -1,4 +1,5 @@
-
+#include "negentropy.h"
+#include "negentropy/storage/BTreeMem.h"
 #include "negentropy_wrapper.h"
 
 //This is a C-wrapper for the C++ library that helps in integrating negentropy with nim code.
diff --git a/cpp/negentropy_wrapper.h b/cpp/negentropy_wrapper.h
index d145025..9ee90e6 100644
--- a/cpp/negentropy_wrapper.h
+++ b/cpp/negentropy_wrapper.h
@@ -2,10 +2,6 @@
 #ifndef _NEGENTROPY_WRAPPER_H
 #define _NEGENTROPY_WRAPPER_H
 
-#include "negentropy.h"
-#include "negentropy/storage/BTreeMem.h"
-
-#define length(array) ((sizeof(array)) / (sizeof(array[0])))
 
 //This is a C-wrapper for the C++ library that helps in integrating negentropy with nim code.
 //TODO: Do error handling by catching exceptions