diff --git a/Library/RawString.h b/Common/RawString.h
similarity index 91%
rename from Library/RawString.h
rename to Common/RawString.h
index e63ce1e7..c93a08a0 100644
--- a/Library/RawString.h
+++ b/Common/RawString.h
@@ -16,8 +16,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef __RAWSTRING_H__
-#define __RAWSTRING_H__
+#ifndef RM_COMMON_RAWSTRING_H_
+#define RM_COMMON_RAWSTRING_H_
 
 #include <windows.h>
 
diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj
index 402f2719..1ae91f9e 100644
--- a/Library/Library.vcxproj
+++ b/Library/Library.vcxproj
@@ -314,6 +314,7 @@
     <ClInclude Include="..\Common\Gfx\Util\WICBitmapLockGDIP.h" />
     <ClInclude Include="..\Common\MenuTemplate.h" />
     <ClInclude Include="..\Common\Platform.h" />
+    <ClInclude Include="..\Common\RawString.h" />
     <ClInclude Include="..\Common\StringUtil.h" />
     <ClInclude Include="CommandHandler.h" />
     <ClInclude Include="ConfigParser.h" />
@@ -360,7 +361,6 @@
     <ClInclude Include="Rainmeter.h" />
     <ClInclude Include="Export.h" />
     <ClInclude Include="RainmeterQuery.h" />
-    <ClInclude Include="RawString.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="Section.h" />
     <ClInclude Include="StdAfx.h" />
diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters
index 8cb14987..ecf885c9 100644
--- a/Library/Library.vcxproj.filters
+++ b/Library/Library.vcxproj.filters
@@ -611,9 +611,6 @@
     <ClInclude Include="Export.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RawString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="MathParser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -692,6 +689,9 @@
     <ClInclude Include="CommandHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\Common\RawString.h">
+      <Filter>Common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Library.rc">
diff --git a/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp b/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp
index fc63f94f..3f6aec77 100644
--- a/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp
+++ b/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp
@@ -25,7 +25,7 @@
 #include "../PluginPerfMon/ObjList.h"
 #include "../PluginPerfMon/ObjInst.h"
 #include "../API/RainmeterAPI.h"
-#include "../../Library/RawString.h"
+#include "../../Common/RawString.h"
 #include "../../Library/DisableThreadLibraryCalls.h"	// contains DllMain entry point
 
 struct MeasureData
diff --git a/Plugins/PluginFolderInfo/FolderInfo.h b/Plugins/PluginFolderInfo/FolderInfo.h
index 087e8545..f4fb50e1 100644
--- a/Plugins/PluginFolderInfo/FolderInfo.h
+++ b/Plugins/PluginFolderInfo/FolderInfo.h
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <windows.h>
-#include "../../Library/RawString.h"
+#include "../../Common/RawString.h"
 #include "../../Library/pcre-8.10/config.h"
 #include "../../Library/pcre-8.10/pcre.h"
 
diff --git a/Plugins/PluginPerfMon/PerfData.cpp b/Plugins/PluginPerfMon/PerfData.cpp
index e547c050..f910a861 100644
--- a/Plugins/PluginPerfMon/PerfData.cpp
+++ b/Plugins/PluginPerfMon/PerfData.cpp
@@ -25,7 +25,7 @@
 #include "ObjList.h"
 #include "ObjInst.h"
 #include "../API/RainmeterAPI.h"
-#include "../../Library/RawString.h"
+#include "../../Common/RawString.h"
 #include "../../Library/DisableThreadLibraryCalls.h"	// contains DllMain entry point
 
 struct MeasureData
diff --git a/Plugins/PluginPower/PowerPlugin.cpp b/Plugins/PluginPower/PowerPlugin.cpp
index e1a80e7f..6566f92e 100644
--- a/Plugins/PluginPower/PowerPlugin.cpp
+++ b/Plugins/PluginPower/PowerPlugin.cpp
@@ -21,7 +21,7 @@
 #include <time.h>
 #include <errno.h>
 #include <crtdbg.h>
-#include "../../Library/RawString.h"
+#include "../../Common/RawString.h"
 #include "../../Library/Export.h"	// Rainmeter's exported functions
 #include "../../Library/DisableThreadLibraryCalls.h"	// contains DllMain entry point
 
diff --git a/Plugins/PluginProcess/PluginProcess.cpp b/Plugins/PluginProcess/PluginProcess.cpp
index 4ca46b9c..e6833ae3 100644
--- a/Plugins/PluginProcess/PluginProcess.cpp
+++ b/Plugins/PluginProcess/PluginProcess.cpp
@@ -20,7 +20,7 @@
 #include <TlHelp32.h>
 #include <algorithm>
 #include <vector>
-#include "../../Library/RawString.h"
+#include "../../Common/RawString.h"
 #include "../../Library/Export.h"	// Rainmeter's exported functions
 #include "../../Library/DisableThreadLibraryCalls.h"	// contains DllMain entry point
 
diff --git a/Plugins/PluginResMon/ResMon.cpp b/Plugins/PluginResMon/ResMon.cpp
index 23bb4def..69ee5935 100644
--- a/Plugins/PluginResMon/ResMon.cpp
+++ b/Plugins/PluginResMon/ResMon.cpp
@@ -26,7 +26,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include <psapi.h>
-#include "../../Library/RawString.h"
+#include "../../Common/RawString.h"
 #include "../../Library/Export.h"	// Rainmeter's exported functions
 #include "../../Library/DisableThreadLibraryCalls.h"	// contains DllMain entry point
 
diff --git a/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp b/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp
index 3d131859..90b08dab 100644
--- a/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp
+++ b/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp
@@ -18,7 +18,7 @@
 
 #include <windows.h>
 #include <stdio.h>
-#include "../../Library/RawString.h"
+#include "../../Common/RawString.h"
 #include "../../Library/Export.h"	// Rainmeter's exported functions
 #include "../../Library/DisableThreadLibraryCalls.h"	// contains DllMain entry point