diff --git a/pol-core/clib/CMakeLists.txt b/pol-core/clib/CMakeLists.txt
index c84f5ec00f..fd0cac98c7 100644
--- a/pol-core/clib/CMakeLists.txt
+++ b/pol-core/clib/CMakeLists.txt
@@ -19,6 +19,7 @@ SET (SOURCES  # sorted !
 	boostutils.cpp 
 	cfgfile.cpp 
 	cfgsect.cpp
+	clib_MD5.cpp
 	clib_utils.cpp 
 	cmdargs.cpp 
 	dirlist.cpp
@@ -29,7 +30,6 @@ SET (SOURCES  # sorted !
 	iohelp.cpp
 	kbhit.cpp
 	logfacility.cpp
-	MD5.cpp
 	mlog.cpp 
 	opnew.cpp
 	passert.cpp
diff --git a/pol-core/clib/MD5.cpp b/pol-core/clib/clib_MD5.cpp
similarity index 96%
rename from pol-core/clib/MD5.cpp
rename to pol-core/clib/clib_MD5.cpp
index a86eb5c269..445d660e47 100644
--- a/pol-core/clib/MD5.cpp
+++ b/pol-core/clib/clib_MD5.cpp
@@ -9,7 +9,7 @@ Notes
 
 */
 
-#include "MD5.h"
+#include "clib_MD5.h"
 
 #include "stlutil.h"
 #include "logfacility.h"
@@ -109,7 +109,7 @@ void MD5_Cleanup()
 
 #else
 extern "C"{
-#include "MD5.h"
+#include "MD5.h" //TODO: rework the following code - does not work with up-to-date header files anymore
 }
 namespace Pol {
   namespace Clib {
diff --git a/pol-core/clib/MD5.h b/pol-core/clib/clib_MD5.h
similarity index 100%
rename from pol-core/clib/MD5.h
rename to pol-core/clib/clib_MD5.h
diff --git a/pol-core/pol/accounts/account.cpp b/pol-core/pol/accounts/account.cpp
index 6176cc76bf..845739aaeb 100644
--- a/pol-core/pol/accounts/account.cpp
+++ b/pol-core/pol/accounts/account.cpp
@@ -15,7 +15,7 @@ Notes
 #include "accounts.h"
 
 #include "../../clib/cfgelem.h"
-#include "../../clib/MD5.h"
+#include "../../clib/clib_MD5.h"
 #include "../../clib/streamsaver.h"
 
 #include "../globals/uvars.h"
diff --git a/pol-core/pol/accounts/acscrobj.cpp b/pol-core/pol/accounts/acscrobj.cpp
index 43a65ce0a6..314b876bd8 100644
--- a/pol-core/pol/accounts/acscrobj.cpp
+++ b/pol-core/pol/accounts/acscrobj.cpp
@@ -28,7 +28,7 @@ Notes
 #include "account.h"
 #include "accounts.h"
 
-#include "../../clib/MD5.h"
+#include "../../clib/clib_MD5.h"
 
 #include "../../bscript/berror.h"
 #include "../../bscript/executor.h"
diff --git a/pol-core/pol/globals/uvars.cpp b/pol-core/pol/globals/uvars.cpp
index aa27270e7e..485075ba98 100644
--- a/pol-core/pol/globals/uvars.cpp
+++ b/pol-core/pol/globals/uvars.cpp
@@ -25,7 +25,7 @@ Notes
 
 #include "../../clib/clib.h"
 #include "../../clib/logfacility.h"
-#include "../../clib/MD5.h"
+#include "../../clib/clib_MD5.h"
 #include "../../clib/stlutil.h"
 
 #include "../../plib/systemstate.h"
diff --git a/pol-core/pol/login.cpp b/pol-core/pol/login.cpp
index 2e3b25f6ed..e0a85fde61 100644
--- a/pol-core/pol/login.cpp
+++ b/pol-core/pol/login.cpp
@@ -43,7 +43,7 @@ Notes
 #include "ufunc.h"
 
 #include "../clib/stlutil.h"
-#include "../clib/MD5.h"
+#include "../clib/clib_MD5.h"
 #include "../clib/clib.h"
 #include "../clib/clib_endian.h"
 #include "../clib/logfacility.h"
diff --git a/pol-core/pol/module/polsystemmod.cpp b/pol-core/pol/module/polsystemmod.cpp
index 986fc0d616..08453c5063 100644
--- a/pol-core/pol/module/polsystemmod.cpp
+++ b/pol-core/pol/module/polsystemmod.cpp
@@ -42,7 +42,7 @@ Notes
 
 #include "../../clib/dirlist.h"
 #include "../../clib/fileutil.h"
-#include "../../clib/MD5.h"
+#include "../../clib/clib_MD5.h"
 #include "../../clib/strutil.h"
 #include "../../clib/threadhelp.h"
 
diff --git a/pol-core/pol/module/uomod2.cpp b/pol-core/pol/module/uomod2.cpp
index c9922f8c48..30bd05ed02 100644
--- a/pol-core/pol/module/uomod2.cpp
+++ b/pol-core/pol/module/uomod2.cpp
@@ -53,7 +53,7 @@ Notes
 #endif
 
 #include "../../clib/strutil.h"
-#include "../../clib/MD5.h"
+#include "../../clib/clib_MD5.h"
 #include "../../clib/stlutil.h"
 
 #include "../realms/realm.h"
diff --git a/pol-core/pol/pol.cpp b/pol-core/pol/pol.cpp
index bfbba87b00..f8bd9e9627 100644
--- a/pol-core/pol/pol.cpp
+++ b/pol-core/pol/pol.cpp
@@ -123,7 +123,7 @@ Notes
 
 #include "network/clientthread.h"
 
-#include "../clib/MD5.h"
+#include "../clib/clib_MD5.h"
 #include "../clib/clib_endian.h"
 #include "../clib/esignal.h"
 #include "../clib/fdump.h"