diff --git a/ChangeLog b/ChangeLog
index b9fe9b8..74fe8e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2004-02-20  Gernot Hillier  <gernot@hillier.de>
+	* src/application/capisuite.cpp: changed include order to get rid of
+	  the "_POSIX_C_SOURCE redefined" warning (thx to Hartmut Goebel)
+	* src/application/capisuitemodule.cpp: Likewise.
+	* src/application/idlescript.cpp: Likewise.
+	* src/application/incomingscript.cpp: Likewise.
+	* src/application/pythonscript.h: Likewise.
 	* scripts/answering_machine.confin: remove spaces in example which
 	  confused the config file parser when not deleted by the user
 	* scripts/fax.confin: Likewise.
diff --git a/src/application/capisuite.cpp b/src/application/capisuite.cpp
index 888db5b..c83010e 100644
--- a/src/application/capisuite.cpp
+++ b/src/application/capisuite.cpp
@@ -2,7 +2,7 @@
     @brief Contains CapiSuite - Main application class, implements ApplicationInterface
 
     @author Gernot Hillier <gernot@hillier.de>
-    $Revision: 1.7 $
+    $Revision: 1.8 $
 */
 
 /***************************************************************************
@@ -14,12 +14,13 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <Python.h>
+#include <cStringIO.h>
+
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
 
-#include <Python.h>
-#include <cStringIO.h>
 #include <sstream>
 #include <signal.h>
 #include <getopt.h>
diff --git a/src/application/capisuitemodule.cpp b/src/application/capisuitemodule.cpp
index 0aa9793..092d77f 100644
--- a/src/application/capisuitemodule.cpp
+++ b/src/application/capisuitemodule.cpp
@@ -2,7 +2,7 @@
     @brief Contains the Python module and integration routines
 
     @author Gernot Hillier <gernot@hillier.de>
-    $Revision: 1.9 $
+    $Revision: 1.10 $
 */
 
 /***************************************************************************
@@ -17,6 +17,7 @@
 // IMPORTANT: every python function MUST call PyErr_Occured() before using the associated
 // Connection object! (connection can be already deleted while the python script is still running
 
+#include <Python.h>
 #include <string>
 #include <unistd.h> // for sleep()
 #include "../backend/connection.h"
diff --git a/src/application/idlescript.cpp b/src/application/idlescript.cpp
index 3299f17..a7a3fae 100644
--- a/src/application/idlescript.cpp
+++ b/src/application/idlescript.cpp
@@ -2,7 +2,7 @@
     @brief Contains IncomingScript - Incoming call handling. One object for each incoming call is created.
 
     @author Gernot Hillier <gernot@hillier.de>
-    $Revision: 1.2 $
+    $Revision: 1.3 $
 */
 
 /***************************************************************************
@@ -14,6 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <Python.h>
 #include "idlescript.h"
 #include "capisuitemodule.h"
 
diff --git a/src/application/incomingscript.cpp b/src/application/incomingscript.cpp
index 1212775..2fe63a6 100644
--- a/src/application/incomingscript.cpp
+++ b/src/application/incomingscript.cpp
@@ -2,7 +2,7 @@
     @brief Contains IncomingScript - Incoming call handling. One object for each incoming call is created.
 
     @author Gernot Hillier <gernot@hillier.de>
-    $Revision: 1.2 $
+    $Revision: 1.3 $
 */
 
 /***************************************************************************
@@ -14,6 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <Python.h>
 #include "incomingscript.h"
 #include "../modules/disconnectmodule.h"
 #include "capisuitemodule.h"
diff --git a/src/application/pythonscript.h b/src/application/pythonscript.h
index e304f1c..ec904ed 100644
--- a/src/application/pythonscript.h
+++ b/src/application/pythonscript.h
@@ -2,7 +2,7 @@
     @brief Contains PythonScript - Read a python script and call a function in own thread
 
     @author Gernot Hillier <gernot@hillier.de>
-    $Revision: 1.4 $
+    $Revision: 1.5 $
 */
 
 /***************************************************************************
@@ -17,8 +17,9 @@
 #ifndef PYTHONSCRIPT_H
 #define PYTHONSCRIPT_H
 
-#include "../../config.h"
 #include <Python.h>
+
+#include "../../config.h"
 #ifdef HAVE_OSTREAM
   #include <ostream>
 #else