diff --git a/src/fevent.cpp b/src/fevent.cpp
index 7f213231..e3885c76 100644
--- a/src/fevent.cpp
+++ b/src/fevent.cpp
@@ -21,7 +21,6 @@
 ***********************************************************************/
 
 #include <cstdio>
-
 #include "final/fevent.h"
 
 namespace finalcut
diff --git a/src/fkeyboard.cpp b/src/fkeyboard.cpp
index 27d48ab3..91b12a68 100644
--- a/src/fkeyboard.cpp
+++ b/src/fkeyboard.cpp
@@ -26,6 +26,7 @@
   #include <sys/select.h>  // need for FD_ZERO, FD_SET, FD_CLR, ...
 #endif
 
+#include <algorithm>
 #include <string>
 
 #include "final/fkeyboard.h"
diff --git a/src/fterm_functions.cpp b/src/fterm_functions.cpp
index e7afe543..7a6d71c9 100644
--- a/src/fterm_functions.cpp
+++ b/src/fterm_functions.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include <algorithm>
+#include <array>
 #include <limits>
 #include <numeric>
 #include <utility>
diff --git a/src/include/final/fcombobox.h b/src/include/final/fcombobox.h
index 5949deb8..ec23e70f 100644
--- a/src/include/final/fcombobox.h
+++ b/src/include/final/fcombobox.h
@@ -47,6 +47,8 @@
   #error "Only <final/final.h> can be included directly."
 #endif
 
+#include <utility>
+
 #include "final/fdata.h"
 #include "final/flineedit.h"
 #include "final/flistbox.h"
diff --git a/src/include/final/fevent.h b/src/include/final/fevent.h
index 74a27d04..d59610ac 100644
--- a/src/include/final/fevent.h
+++ b/src/include/final/fevent.h
@@ -81,6 +81,7 @@
 #endif
 
 #include <memory>
+#include <utility>
 
 #include "final/fc.h"
 #include "final/fdata.h"
diff --git a/src/include/final/flistbox.h b/src/include/final/flistbox.h
index e2a99540..4680048a 100644
--- a/src/include/final/flistbox.h
+++ b/src/include/final/flistbox.h
@@ -50,6 +50,7 @@
 
 #include <memory>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "final/fdata.h"
@@ -386,7 +387,7 @@ constexpr clean_fdata_t<Container>& getContainer(FDataAccess* container)
   return static_cast<FData<clean_fdata_t<Container>>&>(*container).get();
 }
 
-}  // namespace FListBoxHelper
+}  // namespace flistboxhelper
 
 // FListBox inline functions
 //----------------------------------------------------------------------