diff --git a/toonz/sources/common/tiio/movsettings.cpp b/toonz/sources/common/tiio/movsettings.cpp
index 6918478..c2af38d 100644
--- a/toonz/sources/common/tiio/movsettings.cpp
+++ b/toonz/sources/common/tiio/movsettings.cpp
@@ -22,6 +22,9 @@
 #define map Map
 #define iterator Iterator
 #define float_t Float_t
+#define int_fast8_t QT_int_fast8_t
+#define int_fast16_t QT_int_fast16_t
+#define uint_fast16_t QT_uint_fast16_t
 
 #include "QTML.h"
 #include "Movies.h"
@@ -36,6 +39,9 @@
 #undef map
 #undef iterator
 #undef float_t
+#undef QT_int_fast8_t
+#undef QT_int_fast16_t
+#undef QT_uint_fast16_t
 
 #else
 
diff --git a/toonz/sources/common/trop/tconvolve.cpp b/toonz/sources/common/trop/tconvolve.cpp
index e6dacd7..5c38c4f 100644
--- a/toonz/sources/common/trop/tconvolve.cpp
+++ b/toonz/sources/common/trop/tconvolve.cpp
@@ -8,6 +8,8 @@
 #include "tropcm.h"
 #include "tpixelutils.h"
 
+#include <memory>
+
 #define TMIN(a, b) (a < b ? a : b)
 #define TMAX(a, b) (a > b ? a : b)
 
diff --git a/toonz/sources/common/trop/tresample.cpp b/toonz/sources/common/trop/tresample.cpp
index 4cf9735..8351c28 100644
--- a/toonz/sources/common/trop/tresample.cpp
+++ b/toonz/sources/common/trop/tresample.cpp
@@ -22,6 +22,8 @@ using namespace TConsts;
 #include <emmintrin.h> // per SSE2
 #endif
 
+#include <memory>
+
 //===========================================================================
 /*
 Versione con estensione dell'ultimo pixel e con default_value
diff --git a/toonz/sources/image/3gp/tiio_3gp.h b/toonz/sources/image/3gp/tiio_3gp.h
index 9b4f219..f90fa04 100644
--- a/toonz/sources/image/3gp/tiio_3gp.h
+++ b/toonz/sources/image/3gp/tiio_3gp.h
@@ -15,6 +15,9 @@ namespace QuickTime
 #define map Map
 #define iterator Iterator
 #define float_t Float_t
+#define int_fast8_t QT_int_fast8_t
+#define int_fast16_t QT_int_fast16_t
+#define uint_fast16_t QT_uint_fast16_t
 
 #include "QTML.h"
 #include "Movies.h"
@@ -29,6 +32,9 @@ namespace QuickTime
 #undef map
 #undef iterator
 #undef float_t
+#undef QT_int_fast8_t
+#undef QT_int_fast16_t
+#undef QT_uint_fast16_t
 }
 
 #include "tlevel_io.h"
diff --git a/toonz/sources/image/3gp/tiio_3gpW.cpp b/toonz/sources/image/3gp/tiio_3gpW.cpp
index 9354d3a..660cc38 100644
--- a/toonz/sources/image/3gp/tiio_3gpW.cpp
+++ b/toonz/sources/image/3gp/tiio_3gpW.cpp
@@ -3,17 +3,16 @@
 #ifndef x64
 
 #include "texception.h"
-#include "tiio_3gp.h"
 #include "tsound.h"
 #include "tconvert.h"
 #include "tpropertytype.h"
-//#include "trop.h"
 #include "../mov/tiio_mov.h"
-//#include "timageinfo.h"
 #include "movsettings.h"
 #include "trasterimage.h"
 #include "tsystem.h"
 
+#include "tiio_3gp.h"
+
 namespace
 {
 
diff --git a/toonz/sources/image/mov/tiio_mov.h b/toonz/sources/image/mov/tiio_mov.h
index 2162368..de65dc6 100644
--- a/toonz/sources/image/mov/tiio_mov.h
+++ b/toonz/sources/image/mov/tiio_mov.h
@@ -17,6 +17,9 @@ namespace QuickTime
 #define map Map
 #define iterator Iterator
 #define float_t Float_t
+#define int_fast8_t QT_int_fast8_t
+#define int_fast16_t QT_int_fast16_t
+#define uint_fast16_t QT_uint_fast16_t
 
 #include "QTML.h"
 #include "Movies.h"
@@ -31,6 +34,9 @@ namespace QuickTime
 #undef map
 #undef iterator
 #undef float_t
+#undef QT_int_fast8_t
+#undef QT_int_fast16_t
+#undef QT_uint_fast16_t
 } //namespace QuickTime
 
 //Toonz includes
diff --git a/toonz/sources/image/tiio.cpp b/toonz/sources/image/tiio.cpp
index 4507a63..9d97084 100644
--- a/toonz/sources/image/tiio.cpp
+++ b/toonz/sources/image/tiio.cpp
@@ -20,12 +20,16 @@
 #ifdef _WIN32
 
 #ifndef x64
+
 #define float_t Float_t
 #define GetProcessInformation GetProcessInformation_
+
 #include "QuickTimeComponents.h"
 #include "tquicktime.h"
+
 #undef float_t
 #undef GetProcessInformation
+
 #endif
 
 #include "./mov/tiio_mov.h"
diff --git a/toonz/sources/include/movsettings.h b/toonz/sources/include/movsettings.h
index e32e2ed..1ced7db 100644
--- a/toonz/sources/include/movsettings.h
+++ b/toonz/sources/include/movsettings.h
@@ -22,6 +22,9 @@
 #define iterator Iterator
 #define float_t Float_t
 #define GetProcessInformation GetProcessInformation_
+#define int_fast8_t QT_int_fast8_t
+#define int_fast16_t QT_int_fast16_t
+#define uint_fast16_t QT_uint_fast16_t
 
 #include "QTML.h"
 #include "Movies.h"
@@ -37,6 +40,9 @@
 #undef iterator
 #undef float_t
 #undef GetProcessInformation
+#undef QT_int_fast8_t
+#undef QT_int_fast16_t
+#undef QT_uint_fast16_t
 
 #include "texception.h"
 #include "tpropertytype.h"
diff --git a/toonz/sources/include/tsmartpointer.h b/toonz/sources/include/tsmartpointer.h
index 346f1c0..6544eea 100644
--- a/toonz/sources/include/tsmartpointer.h
+++ b/toonz/sources/include/tsmartpointer.h
@@ -1,8 +1,6 @@
 #ifndef TSMARTPOINTER_INCLUDED
 #define TSMARTPOINTER_INCLUDED
 
-#include <memory>
-
 #include "tutil.h"
 #include "tatomicvar.h"
 
diff --git a/toonz/sources/tnzbase/tscanner/tscannerepson.cpp b/toonz/sources/tnzbase/tscanner/tscannerepson.cpp
index d696a2b..ce94afa 100644
--- a/toonz/sources/tnzbase/tscanner/tscannerepson.cpp
+++ b/toonz/sources/tnzbase/tscanner/tscannerepson.cpp
@@ -10,7 +10,7 @@
 #include "tconvert.h"
 #include "trop.h"
 #include <fstream>
-
+#include <memory>
 #include "TScannerIO/TUSBScannerIO.h"
 
 using namespace TScannerUtil;
diff --git a/toonz/sources/tnzbase/tscanner/tscannerepson.h b/toonz/sources/tnzbase/tscanner/tscannerepson.h
index 5657fc5..65096d1 100644
--- a/toonz/sources/tnzbase/tscanner/tscannerepson.h
+++ b/toonz/sources/tnzbase/tscanner/tscannerepson.h
@@ -6,6 +6,8 @@
 #include "tscanner.h"
 #include "TScannerIO/TScannerIO.h"
 
+#include <memory>
+
 /*
 PLEASE DO NOT REMOVE unreferenced methods... they are useful for debugging  :)
 max
diff --git a/toonz/sources/toonzlib/sandor_fxs/blend.cpp b/toonz/sources/toonzlib/sandor_fxs/blend.cpp
index ad4be77..a2c0a6b 100644
--- a/toonz/sources/toonzlib/sandor_fxs/blend.cpp
+++ b/toonz/sources/toonzlib/sandor_fxs/blend.cpp
@@ -10,6 +10,7 @@
 #include "tpixelutils.h"
 
 #include <vector>
+#include <memory>
 
 //=================================================================================