diff --git a/include/amuse/AudioGroupData.hpp b/include/amuse/AudioGroupData.hpp
index 8419830..15ff8e6 100644
--- a/include/amuse/AudioGroupData.hpp
+++ b/include/amuse/AudioGroupData.hpp
@@ -116,8 +116,8 @@ public:
     IntrusiveAudioGroupData(const IntrusiveAudioGroupData&) = delete;
     IntrusiveAudioGroupData& operator=(const IntrusiveAudioGroupData&) = delete;
 
-    IntrusiveAudioGroupData(IntrusiveAudioGroupData&& other);
-    IntrusiveAudioGroupData& operator=(IntrusiveAudioGroupData&& other);
+    IntrusiveAudioGroupData(IntrusiveAudioGroupData&& other) noexcept;
+    IntrusiveAudioGroupData& operator=(IntrusiveAudioGroupData&& other) noexcept;
 
     void dangleOwnership() { m_owns = false; }
 };
diff --git a/lib/ContainerRegistry.cpp b/lib/ContainerRegistry.cpp
index af1af63..7638bb1 100644
--- a/lib/ContainerRegistry.cpp
+++ b/lib/ContainerRegistry.cpp
@@ -1,6 +1,7 @@
 #include "amuse/ContainerRegistry.hpp"
 #include "amuse/Common.hpp"
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <string>
 #include <memory>