--- digikam/digikam/digikamfirstrun.cpp.orig	Sun Sep  4 17:47:15 2005
+++ digikam/digikam/digikamfirstrun.cpp	Sun Sep  4 17:48:44 2005
@@ -19,15 +19,6 @@
  *
  * ============================================================ */
 
-// C Ansi includes.
-
-extern "C"
-{
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-}
-
 // C++ Includes.
 
 #include <iostream>
@@ -64,6 +55,16 @@
 #include "firstrunUI.h"
 
 #include <iostream>
+
+// C Ansi includes.
+
+extern "C"
+{
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+}
+
 using namespace std;
 
 DigikamFirstRun::DigikamFirstRun( KConfig* config,
--- digikam/utilities/imageeditor/imlibinterface.cpp.orig	Sun Sep  4 17:49:22 2005
+++ digikam/utilities/imageeditor/imlibinterface.cpp	Sun Sep  4 17:50:00 2005
@@ -21,13 +21,6 @@
 
 #define PI 3.14159265
  
-// Lib Tiff includes.
-
-extern "C" 
-{
-#include <tiffio.h>
-}
- 
 // C++ includes.
 
 #include <cmath>
@@ -59,6 +52,13 @@
 #include "undomanager.h"
 #include "undoaction.h"
 #include "imlibinterface.h"
+
+// Lib Tiff includes.
+
+extern "C"
+{
+#include <tiffio.h>
+}
 
 namespace Digikam
 {