diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 88349db..bfefcd0 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -12,8 +12,12 @@ jobs:
     - name: Update package list for i386
       run: sudo dpkg --add-architecture i386 && sudo apt-get -y update
     - name: Install packages
-      run: sudo apt-get -y install build-essential g++-multilib gcc-mingw-w64
+      run: sudo apt-get -y install build-essential g++-multilib gcc-mingw-w64 g++-mingw-w64
     - name: make
       run: make
+    - name: cleanup 1
+      run: git clean -xdf
     - name: make win32
       run: make OSTYPE=win32
+    - name: cleanup 2
+      run: git clean -xdf
diff --git a/Makefile b/Makefile
index a7c28d6..8008a3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,20 @@
 ##
 ## compiling under ubuntu:
-##  for compiling linux: make 
+##  for compiling linux: make
 ##  for compiling win32: make OSTYPE=win32
 ##
 
 ifeq ($(OSTYPE),win32)
-	CPP = i686-w64-mingw32-gcc -m32
+	CPP = i686-w64-mingw32-g++ -m32
+	CC = i686-w64-mingw32-gcc -m32
 	AR = i686-w64-mingw32-ar rc
 	RANLIB = i686-w64-mingw32-ranlib
 	LINKFLAGS = -mdll -lm -lwsock32 -lws2_32 -Xlinker --add-stdcall-alias -s
 	DLLEND = .dll
 	ZLIB_OSFLAGS =
 else
-	CPP = gcc -m32
+	CPP = g++ -m32
+	CC = gcc -m32
 	AR = ar rc
 	RANLIB = ranlib
 	ARCHFLAG = -fPIC
@@ -23,15 +25,13 @@ endif
 
 TARGET = jk_botti_mm
 BASEFLAGS = -Wall -Wno-write-strings
+BASEFLAGS += -fno-strict-aliasing -fno-strict-overflow
 ARCHFLAG += -march=i686 -mtune=generic -msse -msse2 -msse3
 
 ifeq ($(DBG_FLGS),1)
 	OPTFLAGS = -O0 -g
 else
 	OPTFLAGS = -O2 -fomit-frame-pointer -g
-	OPTFLAGS += -funsafe-math-optimizations
-	LTOFLAGS = -flto -fvisibility=hidden
-	LINKFLAGS += ${OPTFLAGS} ${LTOFLAGS}
 endif
 
 INCLUDES = -I"./metamod" \
@@ -41,7 +41,7 @@ INCLUDES = -I"./metamod" \
 	-I"./pm_shared"
 
 CFLAGS = ${BASEFLAGS} ${OPTFLAGS} ${ARCHFLAG} ${INCLUDES}
-CPPFLAGS = -fno-rtti -fno-exceptions ${CFLAGS} 
+CPPFLAGS = -fno-rtti -fno-exceptions ${CFLAGS}
 
 SRC = 	bot.cpp \
 	bot_chat.cpp \
@@ -66,15 +66,15 @@ SRC = 	bot.cpp \
 
 OBJ = $(SRC:%.cpp=%.o)
 
-${TARGET}${DLLEND}: zlib/libz.a ${OBJ} 
-	${CPP} -o $@ ${OBJ} zlib/libz.a ${LINKFLAGS}
+${TARGET}${DLLEND}: zlib/libz.a ${OBJ}
+	${CC} -o $@ ${OBJ} zlib/libz.a ${LINKFLAGS}
 	cp $@ addons/jk_botti/dlls/
 
 zlib/libz.a:
-	(cd zlib; AR="${AR}" RANLIB="${RANLIB}" CC="${CPP} ${OPTFLAGS} ${ARCHFLAG} ${ZLIB_OSFLAGS} -DASMV" ./configure; $(MAKE) OBJA=match.o; cd ..)
+	(cd zlib; AR="${AR}" RANLIB="${RANLIB}" CC="${CC} ${OPTFLAGS} ${ARCHFLAG} ${ZLIB_OSFLAGS} -DASMV" ./configure; $(MAKE) OBJA=match.o; cd ..)
 
 clean:
-	rm -f *.o ${TARGET}${DLLEND} Rules.depend zlib/*.exe 
+	rm -f *.o ${TARGET}${DLLEND} Rules.depend zlib/*.exe
 	(cd zlib; $(MAKE) clean; cd ..)
 	rm -f zlib/Makefile
 
@@ -89,10 +89,10 @@ distclean:
 #	${CPP} ${CPPFLAGS} -funroll-loops -c $< -o $@
 
 %.o: %.cpp
-	${CPP} ${CPPFLAGS} ${LTOFLAGS} -c $< -o $@
+	${CPP} ${CPPFLAGS} -c $< -o $@
 
 %.o: %.c
-	${CPP} ${CFLAGS} ${LTOFLAGS} -c $< -o $@
+	${CPP} ${CFLAGS} -c $< -o $@
 
 depend: Rules.depend
 
diff --git a/dlls/extdll.h b/dlls/extdll.h
index b42abc0..1cbc657 100644
--- a/dlls/extdll.h
+++ b/dlls/extdll.h
@@ -56,9 +56,9 @@
 #endif
 
 // Misc C-runtime library headers
-#include "stdio.h"
-#include "stdlib.h"
-#include "math.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
 
 // Header file containing definition of globalvars_t and entvars_t
 typedef int	func_t;					//