diff --git a/src/Mod/Draft/App/dxf.cpp b/src/Mod/Draft/App/dxf.cpp
index 68df930de8..4331bbd985 100644
--- a/src/Mod/Draft/App/dxf.cpp
+++ b/src/Mod/Draft/App/dxf.cpp
@@ -3,6 +3,9 @@
 // This program is released under the BSD license. See the file COPYING for details.
 
 #include "dxf.h"
+#include <fstream>
+#include <sstream>
+#include <iostream>
 
 using namespace std;
 static const double Pi = 3.14159265358979323846264338327950288419716939937511;
diff --git a/src/Mod/Draft/App/dxf.h b/src/Mod/Draft/App/dxf.h
index 8137ba4341..72e8fa8d95 100644
--- a/src/Mod/Draft/App/dxf.h
+++ b/src/Mod/Draft/App/dxf.h
@@ -8,12 +8,10 @@
 #include <vector>
 #include <map>
 #include <set>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <iosfwd>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 
 //Following is required to be defined on Ubuntu with OCC 6.3.1
 #ifndef HAVE_IOSTREAM
diff --git a/src/Mod/Import/App/dxf.cpp b/src/Mod/Import/App/dxf.cpp
index 0645265a09..874f33e79e 100644
--- a/src/Mod/Import/App/dxf.cpp
+++ b/src/Mod/Import/App/dxf.cpp
@@ -10,6 +10,9 @@
 #include <cmath>
 
 #include <iomanip>
+#include <fstream>
+#include <sstream>
+#include <iostream>
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Import/App/dxf.h b/src/Mod/Import/App/dxf.h
index 51b47a467c..1cf811dd64 100644
--- a/src/Mod/Import/App/dxf.h
+++ b/src/Mod/Import/App/dxf.h
@@ -13,12 +13,10 @@
 #include <vector>
 #include <map>
 #include <set>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <iosfwd>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/Path/libarea/dxf.cpp b/src/Mod/Path/libarea/dxf.cpp
index d15acd4f19..290ed46be7 100644
--- a/src/Mod/Path/libarea/dxf.cpp
+++ b/src/Mod/Path/libarea/dxf.cpp
@@ -4,6 +4,9 @@
 // This program is released under the BSD license. See the file COPYING for details.
 
 #include "dxf.h"
+#include <fstream>
+#include <sstream>
+#include <iostream>
 
 using namespace std;
 static const double Pi = 3.14159265358979323846264338327950288419716939937511;
diff --git a/src/Mod/Path/libarea/dxf.h b/src/Mod/Path/libarea/dxf.h
index cb228d8c64..2e7163fa42 100644
--- a/src/Mod/Path/libarea/dxf.h
+++ b/src/Mod/Path/libarea/dxf.h
@@ -8,12 +8,10 @@
 #include <vector>
 #include <map>
 #include <set>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <iosfwd>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 
 //Following is required to be defined on Ubuntu with OCC 6.3.1
 #ifndef HAVE_IOSTREAM