diff --git a/include/CDumper.hpp b/include/CDumper.hpp
index 0c43a27c..46143cd7 100644
--- a/include/CDumper.hpp
+++ b/include/CDumper.hpp
@@ -8,13 +8,11 @@
 #ifndef CDUMPER_HPP_
 #define CDUMPER_HPP_
 
-#include <aftercheaders.hpp>
-#include <beforecheaders.hpp>
 #include <fstream>
 #include <string>
 #include <dt_common.h>
 #include <client_class.h>
-#include <fixsdk.hpp>
+
 #include <logging.hpp>
 
 class CDumper
diff --git a/include/aftercheaders.hpp b/include/aftercheaders.hpp
deleted file mode 100644
index 928a86d6..00000000
--- a/include/aftercheaders.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef min
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a, b) (((a) > (b)) ? (a) : (b))
-#endif
diff --git a/include/beforecheaders.hpp b/include/beforecheaders.hpp
deleted file mode 100644
index c063a9b0..00000000
--- a/include/beforecheaders.hpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#undef min
-#undef max
-
-#undef private
-#undef public
diff --git a/include/chatstack.hpp b/include/chatstack.hpp
index 96761162..b8193341 100644
--- a/include/chatstack.hpp
+++ b/include/chatstack.hpp
@@ -10,11 +10,9 @@
 
 #define CHATSTACK_INTERVAL 0.8f
 
-#include <beforecheaders.hpp>
 #include <string>
 #include <stack>
 #include <functional>
-#include <aftercheaders.hpp>
 
 namespace chat_stack
 {
diff --git a/include/common.hpp b/include/common.hpp
index dfac75ee..21a3efde 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -14,7 +14,6 @@
 #undef ENABLE_IPC
 #endif
 
-#include <beforecheaders.hpp>
 #include <emmintrin.h>
 #include <vector>
 #include <bitset>
@@ -51,8 +50,6 @@
 #include "timer.hpp"
 #include "averager.hpp"
 
-#include <aftercheaders.hpp>
-
 #include "macros.hpp"
 #include <visual/colors.hpp>
 
diff --git a/include/crits.hpp b/include/crits.hpp
index 0e297330..ec210990 100644
--- a/include/crits.hpp
+++ b/include/crits.hpp
@@ -38,9 +38,7 @@ void draw();
 bool random_crits_enabled();
 }
 
-#include <beforecheaders.hpp>
 #include <unordered_map>
-#include <aftercheaders.hpp>
 
 extern int *g_PredictionRandomSeed;
 extern std::unordered_map<int, int> command_number_mod;
diff --git a/include/cvwrapper.hpp b/include/cvwrapper.hpp
index ea2e7cd5..39f97728 100644
--- a/include/cvwrapper.hpp
+++ b/include/cvwrapper.hpp
@@ -13,11 +13,9 @@ class ConVar;
 #include <sdk.hpp>
 #include <interfaces.hpp>
 
-#include <beforecheaders.hpp>
 #include <string>
 #include <vector>
 #include <functional>
-#include <aftercheaders.hpp>
 
 // Catvar types
 enum CatVar_t
diff --git a/include/entitycache.hpp b/include/entitycache.hpp
index e50b54e7..c250a389 100644
--- a/include/entitycache.hpp
+++ b/include/entitycache.hpp
@@ -8,8 +8,6 @@
 #ifndef ENTITYCACHE_HPP_
 #define ENTITYCACHE_HPP_
 
-#include <aftercheaders.hpp>
-#include <beforecheaders.hpp>
 #include "entityhitboxcache.hpp"
 #include "averager.hpp"
 #include <mathlib/vector.h>
@@ -18,7 +16,6 @@
 #include <icliententitylist.h>
 #include <cdll_int.h>
 #include <enums.hpp>
-#include <fixsdk.hpp>
 #include <interfaces.hpp>
 #include <itemtypes.hpp>
 
diff --git a/include/fixsdk.hpp b/include/fixsdk.hpp
deleted file mode 100644
index 54a5db9c..00000000
--- a/include/fixsdk.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * stdheader.h
- *
- *  Created on: Oct 3, 2016
- *      Author: nullifiedcat
- */
-
-#ifndef FIXSDK_HPP_
-#define FIXSDK_HPP_
-
-/*#define  LINUX 1
-#define _LINUX 1
-#define  POSIX 1
-#define   GNUC 1
-#define NO_MALLOC_OVERRIDE 1
-#undef min*/
-
-#endif /* FIXSDK_HPP_ */
diff --git a/include/hack.hpp b/include/hack.hpp
index 3608502f..60441e53 100644
--- a/include/hack.hpp
+++ b/include/hack.hpp
@@ -15,11 +15,9 @@ class bf_read;
 class ConCommand;
 class CCommand;
 
-#include <beforecheaders.hpp>
 #include <stack>
 #include <string>
 #include <mutex>
-#include <aftercheaders.hpp>
 
 namespace hack
 {
diff --git a/include/helpers.hpp b/include/helpers.hpp
index 56a5c3e9..9a6a929a 100644
--- a/include/helpers.hpp
+++ b/include/helpers.hpp
@@ -29,12 +29,10 @@ void SetCVarInterface(ICvar *iface);
 #include <entitycache.hpp>
 #include <logging.hpp>
 
-#include <beforecheaders.hpp>
 #include <string>
 #include <sstream>
 #include <vector>
 #include <mutex>
-#include <aftercheaders.hpp>
 
 #include <sdk.hpp>
 
diff --git a/include/https_request.hpp b/include/https_request.hpp
index b76c3e3a..f290ccb1 100644
--- a/include/https_request.hpp
+++ b/include/https_request.hpp
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <aftercheaders.hpp>
-#include <beforecheaders.hpp>
 #include <openssl/ssl.h>
 #include <netinet/in.h>
 
diff --git a/include/init.hpp b/include/init.hpp
index a1267d38..79b437b3 100644
--- a/include/init.hpp
+++ b/include/init.hpp
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <aftercheaders.hpp>
-#include <beforecheaders.hpp>
 #include <stack>
 
 std::stack<void (*)()> &init_stack();
diff --git a/include/interfaces.hpp b/include/interfaces.hpp
index 3d1d53d1..2cebea23 100644
--- a/include/interfaces.hpp
+++ b/include/interfaces.hpp
@@ -8,8 +8,6 @@
 #ifndef INTERFACES_HPP_
 #define INTERFACES_HPP_
 
-#include <aftercheaders.hpp>
-#include <beforecheaders.hpp>
 #include <sharedobj.hpp>
 #include <string>
 
diff --git a/include/ipc.hpp b/include/ipc.hpp
index 90ba8d10..65e3166b 100644
--- a/include/ipc.hpp
+++ b/include/ipc.hpp
@@ -10,11 +10,9 @@
 #ifndef IPC_H_
 #define IPC_H_
 
-#include <beforecheaders.hpp>
 #include "ipcb.hpp"
 #include "pthread.h"
 #include <time.h>
-#include <aftercheaders.hpp>
 
 class CatCommand;
 class CatVar;
diff --git a/include/itemtypes.hpp b/include/itemtypes.hpp
index af883ceb..3997785e 100644
--- a/include/itemtypes.hpp
+++ b/include/itemtypes.hpp
@@ -8,8 +8,6 @@
 #ifndef ITEMTYPES_HPP_
 #define ITEMTYPES_HPP_
 
-#include <aftercheaders.hpp>
-#include <beforecheaders.hpp>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/include/localplayer.hpp b/include/localplayer.hpp
index f1cbdc4a..b1d53930 100644
--- a/include/localplayer.hpp
+++ b/include/localplayer.hpp
@@ -8,7 +8,6 @@
 #ifndef LOCALPLAYER_HPP_
 #define LOCALPLAYER_HPP_
 
-#include <fixsdk.hpp>
 #include <mathlib/vector.h>
 
 class CachedEntity;
diff --git a/include/netmessage.hpp b/include/netmessage.hpp
index 2b9cda85..768abc92 100644
--- a/include/netmessage.hpp
+++ b/include/netmessage.hpp
@@ -9,7 +9,6 @@
 #define NETMESSAGE_HPP_
 
 #include <bitbuf.h>
-#include <fixsdk.hpp>
 #include <utlvector.h>
 #include <inetchannel.h>
 #include <inetmessage.h>
diff --git a/include/profiler.hpp b/include/profiler.hpp
index 211d7ccb..84e668ff 100644
--- a/include/profiler.hpp
+++ b/include/profiler.hpp
@@ -8,8 +8,6 @@
 #ifndef PROFILER_H_
 #define PROFILER_H_
 
-#include <aftercheaders.hpp>
-#include <beforecheaders.hpp>
 #include <chrono>
 #include <string>
 
diff --git a/include/sdk.hpp b/include/sdk.hpp
index 972a5c24..7757eba7 100644
--- a/include/sdk.hpp
+++ b/include/sdk.hpp
@@ -8,8 +8,6 @@
 #ifndef SDK_HPP_
 #define SDK_HPP_
 
-#include <fixsdk.hpp>
-
 #define private public
 #define protected public
 
diff --git a/include/sharedobj.hpp b/include/sharedobj.hpp
index 98916c4c..5de1f85a 100644
--- a/include/sharedobj.hpp
+++ b/include/sharedobj.hpp
@@ -8,10 +8,8 @@
 #ifndef SHAREDOBJ_HPP_
 #define SHAREDOBJ_HPP_
 
-#include <beforecheaders.hpp>
 #include <string>
 #include <vector>
-#include <aftercheaders.hpp>
 
 struct link_map;
 typedef void *(*fn_CreateInterface_t)(const char *, int *);
diff --git a/include/textfile.hpp b/include/textfile.hpp
index be446248..f0ea7812 100644
--- a/include/textfile.hpp
+++ b/include/textfile.hpp
@@ -8,8 +8,6 @@
 #ifndef TEXTFILE_HPP_
 #define TEXTFILE_HPP_
 
-#include <aftercheaders.hpp>
-#include <beforecheaders.hpp>
 #include <string>
 #include <vector>
 
diff --git a/include/trace.hpp b/include/trace.hpp
index 193c9b3f..44d56f27 100644
--- a/include/trace.hpp
+++ b/include/trace.hpp
@@ -9,7 +9,6 @@
 #define TRACE_HPP_
 
 #include <engine/IEngineTrace.h>
-#include <fixsdk.hpp>
 
 // This file is a mess. I need to fix it. TODO
 
diff --git a/include/usercmd.hpp b/include/usercmd.hpp
index 86f8cd3a..0a56a19c 100644
--- a/include/usercmd.hpp
+++ b/include/usercmd.hpp
@@ -8,7 +8,6 @@
 #ifndef USERCMD_HPP_
 #define USERCMD_HPP_
 
-#include <fixsdk.hpp>
 #include <stdint.h>
 
 #include <mathlib/vector.h>
diff --git a/include/visual/drawmgr.hpp b/include/visual/drawmgr.hpp
index 043d7086..4331862e 100644
--- a/include/visual/drawmgr.hpp
+++ b/include/visual/drawmgr.hpp
@@ -8,9 +8,7 @@
 #ifndef DRAWMGR_HPP_
 #define DRAWMGR_HPP_
 
-#include "beforecheaders.hpp"
 #include <mutex>
-#include "aftercheaders.hpp"
 
 extern std::mutex drawing_mutex;
 
diff --git a/makefile b/makefile
index e5125b5c..345d943a 100644
--- a/makefile
+++ b/makefile
@@ -107,7 +107,7 @@ LDLIBS+=-lssl -l:libSDL2-2.0.so.0 -l:libGLEW.so -lglez -lxoverlay
 CXXFLAGS+=$(shell sdl2-config --cflags)
 CFLAGS+=$(shell sdl2-config --cflags)
 else
-EXCL_SOURCES:=drawex.cpp hacks/ESP.cpp hacks/SkinChanger.cpp hacks/SpyAlert.cpp hacks/Radar.cpp fidgetspinner.cpp  hooks/sdl.cpp drawing.cpp drawmgr.cpp drawgl.cpp hooks/PaintTraverse.cpp EffectChams.cpp EffectGlow.cpp atlas.cpp
+EXCL_SOURCES:=visual/atlas.cpp visual/colors.cpp visual/drawex.cpp visual/drawing.cpp visual/drawmgr.cpp visual/EffectChams.cpp visual/EffectGlow.cpp hacks/ESP.cpp hacks/SkinChanger.cpp hacks/SpyAlert.cpp hacks/Radar.cpp fidgetspinner.cpp  hooks/sdl.cpp drawing.cpp hooks/PaintTraverse.cpp
 EXCL_SOURCES:=$(addprefix $(SRC_DIR)/,$(EXCL_SOURCES))
 
 SOURCES:=$(filter-out $(shell find $(SRC_DIR)/gui -name "*.cpp" -print),$(SOURCES))
diff --git a/src/interfaces.cpp b/src/interfaces.cpp
index dcf29fd8..e08c5f9c 100644
--- a/src/interfaces.cpp
+++ b/src/interfaces.cpp
@@ -10,10 +10,8 @@
 
 #include <unistd.h>
 
-#include "beforecheaders.hpp"
 #include <string>
 #include <sstream>
-#include "aftercheaders.hpp"
 
 #include <steam/isteamclient.h>
 
diff --git a/src/sdk/convar.cpp b/src/sdk/convar.cpp
index c03ce5ee..f749880d 100644
--- a/src/sdk/convar.cpp
+++ b/src/sdk/convar.cpp
@@ -6,8 +6,6 @@
 //
 //===========================================================================//
 
-#include "fixsdk.hpp"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>