diff --git uppsrc/Core/Core.h uppsrc/Core/Core.h
--- uppsrc/Core/Core.h
+++ uppsrc/Core/Core.h
@@ -57,7 +57,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
-#include <math.h>
 #include <ctype.h>
 
 #if defined(PLATFORM_POSIX)
@@ -168,7 +167,6 @@
 					#define STRICT 1
 				#endif
 			#endif
-			#include <stdarg.h>
 			#include <windef.h>
 			#include <winbase.h>
 			#include <wingdi.h>
diff --git uppsrc/Core/Path.cpp uppsrc/Core/Path.cpp
--- uppsrc/Core/Path.cpp
+++ uppsrc/Core/Path.cpp
@@ -1,5 +1,4 @@
 #include "Core.h"
-#include "Core.h"
 //#BLITZ_APPROVE
 
 #ifdef PLATFORM_POSIX
diff --git uppsrc/CtrlLib/ArrayCtrl.cpp uppsrc/CtrlLib/ArrayCtrl.cpp
--- uppsrc/CtrlLib/ArrayCtrl.cpp
+++ uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -1,5 +1,4 @@
 #include "CtrlLib.h"
-#include "CtrlLib.h"
 
 namespace Upp {
 
diff --git uppsrc/CtrlLib/TabCtrl.cpp uppsrc/CtrlLib/TabCtrl.cpp
--- uppsrc/CtrlLib/TabCtrl.cpp
+++ uppsrc/CtrlLib/TabCtrl.cpp
@@ -1,5 +1,4 @@
 #include "CtrlLib.h"
-#include "CtrlLib.h"
 
 namespace Upp {
 
diff --git uppsrc/Painter/SvgParser.cpp uppsrc/Painter/SvgParser.cpp
--- uppsrc/Painter/SvgParser.cpp
+++ uppsrc/Painter/SvgParser.cpp
@@ -1,5 +1,4 @@
 #include "Painter.h"
-#include "Painter.h"
 
 #define LLOG(x)
 
diff --git uppsrc/RichText/TablePaint.cpp uppsrc/RichText/TablePaint.cpp
--- uppsrc/RichText/TablePaint.cpp
+++ uppsrc/RichText/TablePaint.cpp
@@ -13,8 +13,6 @@ RichTable::Format::Format()
 	keep = newpage = newhdrftr = false;
 }
 
-#include "RichText.h"
-
 void RichTable::ExpandFrr(VectorMap<int, Rect>& frr, int pi, int l, int r, int t, int b)
 {
 	Rect& fr = frr.GetAdd(pi, Rect(INT_MAX, INT_MAX, INT_MIN, INT_MIN));
diff --git uppsrc/ide/FindInFiles.cpp uppsrc/ide/FindInFiles.cpp
--- uppsrc/ide/FindInFiles.cpp
+++ uppsrc/ide/FindInFiles.cpp
@@ -1,5 +1,4 @@
 #include "ide.h"
-#include "ide.h"
 
 FileSel& sSD()
 {
diff --git uppsrc/ide/idewin.cpp uppsrc/ide/idewin.cpp
--- uppsrc/ide/idewin.cpp
+++ uppsrc/ide/idewin.cpp
@@ -1,5 +1,4 @@
 #include "ide.h"
-#include "ide.h"
 
 #define IMAGECLASS IdeImg
 #define IMAGEFILE  <ide/ide.iml>