--- embedaddon/smartmontools/smartd.cpp	2013/07/22 01:17:36	1.1.1.3
+++ embedaddon/smartmontools/smartd.cpp	2013/10/14 07:54:04	1.1.1.4
@@ -21,6 +21,9 @@
  *
  */
 
+#include "config.h"
+#include "int64.h"
+
 // unconditionally included files
 #include <stdio.h>
 #include <sys/types.h>
@@ -41,9 +44,6 @@
 #include <vector>
 #include <algorithm> // std::replace()
 
-// see which system files to conditionally include
-#include "config.h"
-
 // conditionally included files
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -74,7 +74,6 @@ typedef int pid_t;
 #endif // LIBCAP_NG
 
 // locally included files
-#include "int64.h"
 #include "atacmds.h"
 #include "dev_interface.h"
 #include "knowndrives.h"
@@ -107,7 +106,7 @@ typedef int pid_t;
 extern "C" int getdomainname(char *, int); // no declaration in header files!
 #endif
 
-const char * smartd_cpp_cvsid = "$Id: smartd.cpp,v 1.1.1.3 2013/07/22 01:17:36 misho Exp $"
+const char * smartd_cpp_cvsid = "$Id: smartd.cpp,v 1.1.1.4 2013/10/14 07:54:04 misho Exp $"
   CONFIG_H_CVSID;
 
 // smartd exit codes