diff --git a/aartfaacms.cpp b/aartfaacms.cpp
index 016bef4..6f8e66f 100644
--- a/aartfaacms.cpp
+++ b/aartfaacms.cpp
@@ -12,6 +12,7 @@
 
 #include <casacore/measures/Measures/MEpoch.h>
 
+#include <array>
 #include <stdexcept>
 #include <sstream>
 
diff --git a/aligned_ptr.h b/aligned_ptr.h
index 3c1a7f0..2e4fe3d 100644
--- a/aligned_ptr.h
+++ b/aligned_ptr.h
@@ -1,15 +1,17 @@
 #ifndef ALIGNED_PTR_H
 #define ALIGNED_PTR_H
 
+#include <cstdlib>
 #include <memory>
+#include <stdexcept>
 
 template<typename T> 
-using aligned_ptr = std::unique_ptr<T[], decltype(&free)>;
+using aligned_ptr = std::unique_ptr<T[], decltype(&std::free)>;
 
 template<typename T>
 static aligned_ptr<T> empty_aligned()
 {
-	return aligned_ptr<T>(nullptr, &free);
+	return aligned_ptr<T>(nullptr, &std::free);
 }
 
 template<typename T>
@@ -18,7 +20,7 @@ static aligned_ptr<T> make_aligned(size_t size, size_t align)
 	T* data = nullptr;
 	if(0 != posix_memalign((void**) &data, align, size*sizeof(T)))
 		throw std::runtime_error("Failed to allocate aligned memory");
-	return aligned_ptr<T>(data, &free);
+	return aligned_ptr<T>(data, &std::free);
 }
 
 #endif
diff --git a/antennaconfig.h b/antennaconfig.h
index 8b77213..16e5b56 100644
--- a/antennaconfig.h
+++ b/antennaconfig.h
@@ -1,7 +1,8 @@
 #ifndef ANTENNA_CONFIG_H
 #define ANTENNA_CONFIG_H
 
-#include <algorithm> 
+#include <algorithm>
+#include <array>
 #include <cctype>
 #include <fstream>
 #include <locale>