diff --git a/core-writer/src/compression/bitshuffle.c b/core-writer/external/bitshuffle/bitshuffle.c
similarity index 100%
rename from core-writer/src/compression/bitshuffle.c
rename to core-writer/external/bitshuffle/bitshuffle.c
diff --git a/core-writer/src/compression/bitshuffle.h b/core-writer/external/bitshuffle/bitshuffle.h
similarity index 100%
rename from core-writer/src/compression/bitshuffle.h
rename to core-writer/external/bitshuffle/bitshuffle.h
diff --git a/core-writer/src/compression/bitshuffle_core.c b/core-writer/external/bitshuffle/bitshuffle_core.c
similarity index 100%
rename from core-writer/src/compression/bitshuffle_core.c
rename to core-writer/external/bitshuffle/bitshuffle_core.c
diff --git a/core-writer/src/compression/bitshuffle_core.h b/core-writer/external/bitshuffle/bitshuffle_core.h
similarity index 100%
rename from core-writer/src/compression/bitshuffle_core.h
rename to core-writer/external/bitshuffle/bitshuffle_core.h
diff --git a/core-writer/src/compression/bitshuffle_internals.h b/core-writer/external/bitshuffle/bitshuffle_internals.h
similarity index 98%
rename from core-writer/src/compression/bitshuffle_internals.h
rename to core-writer/external/bitshuffle/bitshuffle_internals.h
index 7e9810e..8dbf872 100644
--- a/core-writer/src/compression/bitshuffle_internals.h
+++ b/core-writer/external/bitshuffle/bitshuffle_internals.h
@@ -25,7 +25,7 @@
 //  typedef long long           int64_t;
 //#endif
 
-#include <stdlib.h>
+#include <c++/9/stdlib.h>
 #include "iochain.h"
 
 
diff --git a/core-writer/src/compression/iochain.c b/core-writer/external/bitshuffle/iochain.c
similarity index 100%
rename from core-writer/src/compression/iochain.c
rename to core-writer/external/bitshuffle/iochain.c
diff --git a/core-writer/src/compression/iochain.h b/core-writer/external/bitshuffle/iochain.h
similarity index 100%
rename from core-writer/src/compression/iochain.h
rename to core-writer/external/bitshuffle/iochain.h
diff --git a/core-writer/src/compression/lz4.c b/core-writer/external/bitshuffle/lz4.c
similarity index 100%
rename from core-writer/src/compression/lz4.c
rename to core-writer/external/bitshuffle/lz4.c
diff --git a/core-writer/src/compression/lz4.h b/core-writer/external/bitshuffle/lz4.h
similarity index 100%
rename from core-writer/src/compression/lz4.h
rename to core-writer/external/bitshuffle/lz4.h