diff --git a/src/acs/call-funcs.cpp b/src/acs/call-funcs.cpp
index 0436c0a28..dc413ef55 100644
--- a/src/acs/call-funcs.cpp
+++ b/src/acs/call-funcs.cpp
@@ -11,6 +11,9 @@
 /// \file  call-funcs.cpp
 /// \brief Action Code Script: CallFunc instructions
 
+#include <algorithm>
+#include <cctype>
+
 #include <ACSVM/Code.hpp>
 #include <ACSVM/CodeData.hpp>
 #include <ACSVM/Environment.hpp>
diff --git a/src/acs/environment.cpp b/src/acs/environment.cpp
index 8c9e34339..a2eb093d4 100644
--- a/src/acs/environment.cpp
+++ b/src/acs/environment.cpp
@@ -11,6 +11,9 @@
 /// \file  environment.cpp
 /// \brief Action Code Script: Environment definition
 
+#include <algorithm>
+#include <vector>
+
 #include <ACSVM/Code.hpp>
 #include <ACSVM/CodeData.hpp>
 #include <ACSVM/Environment.hpp>
diff --git a/src/acs/interface.cpp b/src/acs/interface.cpp
index 2b2ed2dde..2424da11d 100644
--- a/src/acs/interface.cpp
+++ b/src/acs/interface.cpp
@@ -11,8 +11,10 @@
 /// \file  interface.cpp
 /// \brief Action Code Script: Interface for the rest of SRB2's game logic
 
-#include <cmath>
-#include <memory>
+#include <cstddef>
+#include <istream>
+#include <ostream>
+#include <vector>
 
 #include <ACSVM/Action.hpp>
 #include <ACSVM/Code.hpp>
diff --git a/src/acs/stream.hpp b/src/acs/stream.hpp
index 1c0d895f3..ebe908e1d 100644
--- a/src/acs/stream.hpp
+++ b/src/acs/stream.hpp
@@ -17,8 +17,6 @@
 #ifndef __SRB2_ACS_STREAM_HPP__
 #define __SRB2_ACS_STREAM_HPP__
 
-#include <istream>
-#include <ostream>
 #include <streambuf>
 
 #include <ACSVM/Code.hpp>