diff --git a/uppsrc/Core/Path.cpp b/uppsrc/Core/Path.cpp
index d5da6f331..74a1ca988 100644
--- a/uppsrc/Core/Path.cpp
+++ b/uppsrc/Core/Path.cpp
@@ -1,5 +1,4 @@
 #include "Core.h"
-#include "Core.h"
 //#BLITZ_APPROVE
 
 #ifdef PLATFORM_POSIX
diff --git a/uppsrc/CtrlCore/CtrlCore.upp b/uppsrc/CtrlCore/CtrlCore.upp
index b6a74492f..07aba46dd 100644
--- a/uppsrc/CtrlCore/CtrlCore.upp
+++ b/uppsrc/CtrlCore/CtrlCore.upp
@@ -6,7 +6,7 @@ uses
 	RichText,
 	Painter;
 
-library(WIN32) "advapi32 comdlg32 comctl32 imm32 user32 gdi32";
+library(WIN32) "advapi32 comdlg32 comctl32 imm32";
 
 pkg_config(POSIX !OSX !VIRTUALGUI) "freetype2 x11 xinerama xrender xft xdmcp fontconfig xcb xext";
 
diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp
index 44633608b..9bccfd45a 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.cpp
+++ b/uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -1,5 +1,4 @@
 #include "CtrlLib.h"
-#include "CtrlLib.h"
 
 namespace Upp {
 
diff --git a/uppsrc/CtrlLib/TabCtrl.cpp b/uppsrc/CtrlLib/TabCtrl.cpp
index 8beafafe6..aaadd1af8 100644
--- a/uppsrc/CtrlLib/TabCtrl.cpp
+++ b/uppsrc/CtrlLib/TabCtrl.cpp
@@ -1,5 +1,4 @@
 #include "CtrlLib.h"
-#include "CtrlLib.h"
 
 namespace Upp {
 
diff --git a/uppsrc/CtrlLib/Win32.cpp b/uppsrc/CtrlLib/Win32.cpp
index eaa43099a..6db0c35f2 100644
--- a/uppsrc/CtrlLib/Win32.cpp
+++ b/uppsrc/CtrlLib/Win32.cpp
@@ -1,5 +1,4 @@
 #include "CtrlLib.h"
-#include "CtrlLib.h"
 
 #ifdef GUI_WIN
 #ifndef PLATFORM_WINCE