diff --git a/Buffer.h b/Buffer.h
index a48327d0..95aea6dd 100644
--- a/Buffer.h
+++ b/Buffer.h
@@ -9,7 +9,7 @@
 #ifndef _BUFFER_H
 #define _BUFFER_H
 
-#include "String.h"
+#include "ZNCString.h"
 #include <vector>
 
 using std::vector;
diff --git a/Chan.h b/Chan.h
index 0d3baac7..24fa2a85 100644
--- a/Chan.h
+++ b/Chan.h
@@ -11,7 +11,7 @@
 
 #include "FileUtils.h"
 #include "Nick.h"
-#include "String.h"
+#include "ZNCString.h"
 #include <map>
 #include <set>
 #include <vector>
diff --git a/FileUtils.h b/FileUtils.h
index 2bf5f881..9b8c9a34 100644
--- a/FileUtils.h
+++ b/FileUtils.h
@@ -10,7 +10,7 @@
 #define _FILEUTILS_H
 
 #include "Csocket.h"
-#include "String.h"
+#include "ZNCString.h"
 #include <dirent.h>
 #include <map>
 #include <signal.h>
diff --git a/Makefile.in b/Makefile.in
index cf3d900e..11126da5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ LDFLAGS  := @LDFLAGS@
 INCLUDES := @INCLUDES@
 LIBS     := @LIBS@
 
-SRCS := String.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
+SRCS := ZNCString.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
 	DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
 	FileUtils.cpp HTTPSock.cpp Template.cpp ClientCommand.cpp
 OBJS := $(patsubst %cpp,%o,$(SRCS))
diff --git a/Nick.h b/Nick.h
index 7c22ccdc..48e81538 100644
--- a/Nick.h
+++ b/Nick.h
@@ -9,7 +9,7 @@
 #ifndef _NICK_H
 #define _NICK_H
 
-#include "String.h"
+#include "ZNCString.h"
 #include <set>
 #include <vector>
 
diff --git a/Server.h b/Server.h
index 98f987f2..116b26db 100644
--- a/Server.h
+++ b/Server.h
@@ -9,7 +9,7 @@
 #ifndef _SERVER_H
 #define _SERVER_H
 
-#include "String.h"
+#include "ZNCString.h"
 
 class CServer {
 public:
diff --git a/Utils.h b/Utils.h
index 54a61eab..3aa89e98 100644
--- a/Utils.h
+++ b/Utils.h
@@ -9,7 +9,7 @@
 #ifndef _UTILS_H
 #define _UTILS_H
 
-#include "String.h"
+#include "ZNCString.h"
 #include <assert.h>
 #include <map>
 #include <sys/file.h>
diff --git a/String.cpp b/ZNCString.cpp
similarity index 99%
rename from String.cpp
rename to ZNCString.cpp
index e9224cd0..39895b49 100644
--- a/String.cpp
+++ b/ZNCString.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "String.h"
+#include "ZNCString.h"
 #include "FileUtils.h"
 #include "MD5.h"
 #include "Utils.h"
@@ -1102,17 +1102,3 @@ CString& MCString::Decode(CString& sValue) {
 	sValue = sTmp;
 	return sValue;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/String.h b/ZNCString.h
similarity index 99%
rename from String.h
rename to ZNCString.h
index fca1c40e..66baae83 100644
--- a/String.h
+++ b/ZNCString.h
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#ifndef X_STRING_H
-#define X_STRING_H
+#ifndef ZNCSTRING_H
+#define ZNCSTRING_H
 
 #include <map>
 #include <set>
@@ -181,4 +181,4 @@ public:
 	virtual CString& Decode(CString& sValue);
 };
 
-#endif // !X_STRING_H
+#endif // !ZNCSTRING_H
diff --git a/main.h b/main.h
index b9ddd1d2..05e84d7c 100644
--- a/main.h
+++ b/main.h
@@ -68,6 +68,6 @@ using std::endl;
 #warning PATH_MAX is undefined
 #endif
 
-#include "String.h"
+#include "ZNCString.h"
 
 #endif // !_MAIN_H