diff --git a/Makefile b/Makefile
index 16b28b6..93d1b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ windows-arm64: bin/TLEscope.exe
 
 win-installer: windows
 	@echo "Building Windows installer..."
-	convert logo.png $(DIST_WIN)/logo.ico 2>/dev/null || echo "Warning: ImageMagick not installed, skipping .ico generation"
+	magick logo.png -define icon:auto-resize=256,64,48,32,16 $(DIST_WIN)/logo.ico || convert logo.png -define icon:auto-resize=256,64,48,32,16 $(DIST_WIN)/logo.ico || cp logo.ico $(DIST_WIN)/
 	makensis installer.nsi
 	@echo "Installer built at dist/TLEscope-Installer.exe"
 
diff --git a/logo.ico b/logo.ico
new file mode 100644
index 0000000..320a2c4
Binary files /dev/null and b/logo.ico differ
diff --git a/src/rotator.c b/src/rotator.c
index e1f7f35..edde080 100644
--- a/src/rotator.c
+++ b/src/rotator.c
@@ -1,4 +1,10 @@
 #define _GNU_SOURCE
+#if defined(_WIN32) || defined(_WIN64)
+#define WIN32_LEAN_AND_MEAN
+#define NOGDI
+#define NOUSER
+typedef struct tagMSG *LPMSG;
+#endif
 #include "rotator.h"
 #include "astro.h"
 #include <math.h>
@@ -9,7 +15,6 @@
 #if defined(_WIN32) || defined(_WIN64)
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <windows.h>
 #else
 #include <arpa/inet.h>
 #include <netdb.h>