diff --git a/drivers/agent/agent_imager.cpp b/drivers/agent/agent_imager.cpp

index a95e188..29091f0 100644

--- a/drivers/agent/agent_imager.cpp

+++ b/drivers/agent/agent_imager.cpp

@@ -17,12 +17,12 @@

  Boston, MA 02110-1301, USA.

  *******************************************************************************/

+#include <memory>

 #include "agent_imager.h"

 #include "indistandardproperty.h"

 #include <cstring>

 #include <algorithm>

-#include <memory>

 #include "group.h"

diff --git a/drivers/agent/group.cpp b/drivers/agent/group.cpp

index 4597178..b1b5a7d 100644

--- a/drivers/agent/group.cpp

+++ b/drivers/agent/group.cpp

@@ -18,6 +18,7 @@

  *******************************************************************************/

 #include "group.h"

+#include <memory>

 #include "agent_imager.h"

 #include <iomanip>

 #include <sstream>

diff --git a/examples/tutorial_eight/simple_spectrograph.cpp b/examples/tutorial_eight/simple_spectrograph.cpp

index 8bedef0..3e8ab1d 100644

--- a/examples/tutorial_eight/simple_spectrograph.cpp

+++ b/examples/tutorial_eight/simple_spectrograph.cpp

@@ -20,9 +20,10 @@

     refer to the INDI Generic Spectrograph driver template in INDI SVN (under 3rdparty).

 */

+#include <memory>

+

 #include "simple_spectrograph.h"

-#include <memory>

 /* Macro shortcut to Spectrograph temperature value */

 #define currentSpectrographTemperature TemperatureN[0].value