diff --git a/client/client_application.cpp b/client/client_application.cpp
index 53099fe..2725314 100644
--- a/client/client_application.cpp
+++ b/client/client_application.cpp
@@ -49,11 +49,7 @@ void ClientApplication::Init(int argc, char* argv[]) {
 
 	//load the prerequisites
 	ConfigUtility& config = ConfigUtility::GetSingleton();
-#ifdef __unix__
 	config.Load("rsc/config.cfg", argc, argv);
-#else
-	config.Load("rsc\\config.cfg", argc, argv);
-#endif
 
 	//-------------------------
 	//Initialize the APIs
diff --git a/client/makefile b/client/makefile
index a242417..39c104f 100644
--- a/client/makefile
+++ b/client/makefile
@@ -1,11 +1,15 @@
-#config
+#include directories
 INCLUDES+=. client_utilities renderable scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
 
-LIBS+=client.a ../libcommon.a -lSDL_net -lSDLmain -lSDL -llua
-ifeq ($(OS),Windows_NT )
+#libraries
+#the order of the $(LIBS) is important, at least for MinGW
+LIBS+=client.a ../libcommon.a -lSDL_net
+ifeq ($(OS),Windows_NT)
 	LIBS+=-lwsock32 -liphlpapi -lmingw32
 endif
+LIBS+=-lSDLmain -lSDL
 
+#flags
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
diff --git a/common/graphics/makefile b/common/graphics/makefile
index 049bb9a..9013447 100644
--- a/common/graphics/makefile
+++ b/common/graphics/makefile
@@ -29,7 +29,7 @@ $(OUTDIR):
 	mkdir $(OUTDIR)
 
 $(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $< -llua
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 clean:
 	$(RM) *.o *.a *.exe
diff --git a/server/makefile b/server/makefile
index ef20867..b4a33a1 100644
--- a/server/makefile
+++ b/server/makefile
@@ -1,11 +1,15 @@
-#config
+#include directories
 INCLUDES+=. accounts characters rooms server_utilities ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
 
-LIBS+=server.a ../libcommon.a -lSDL_net -lSDLmain -lSDL -llua -lsqlite3
+#libraries
+#the order of the $(LIBS) is important, at least for MinGW
+LIBS+=server.a ../libcommon.a -lSDL_net
 ifeq ($(OS),Windows_NT)
 	LIBS+=-lwsock32 -liphlpapi -lmingw32
 endif
+LIBS+=-lSDLmain -lSDL -llua -lsqlite3
 
+#flags
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
diff --git a/server/server_logic.cpp b/server/server_logic.cpp
index 08b07b2..c83447b 100644
--- a/server/server_logic.cpp
+++ b/server/server_logic.cpp
@@ -40,11 +40,7 @@ void ServerApplication::Init(int argc, char* argv[]) {
 	std::cout << "Beginning " << argv[0] << std::endl;
 
 	//load the prerequisites
-#ifdef __unix__
 	config.Load("rsc/config.cfg", argc, argv);
-#else
-	config.Load("rsc\\config.cfg", argc, argv);
-#endif
 
 	//-------------------------
 	//Initialize the APIs