diff --git a/Library/ConfigParser.cpp b/Library/ConfigParser.cpp
index 09ec422e..1c86baca 100644
--- a/Library/ConfigParser.cpp
+++ b/Library/ConfigParser.cpp
@@ -21,6 +21,7 @@
 #include "Litestep.h"
 #include "Rainmeter.h"
 #include "System.h"
+#include "Measure.h"
 
 extern CRainmeter* Rainmeter;
 
diff --git a/Library/DisableThreadLibraryCalls.h b/Library/DisableThreadLibraryCalls.h
index ce7e468e..8f8f4da2 100644
--- a/Library/DisableThreadLibraryCalls.h
+++ b/Library/DisableThreadLibraryCalls.h
@@ -16,8 +16,8 @@
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#ifndef _DISABLETHREADLIBRARYCALLS_H_
-#define _DISABLETHREADLIBRARYCALLS_H_
+#ifndef __DISABLETHREADLIBRARYCALLS_H__
+#define __DISABLETHREADLIBRARYCALLS_H__
 
 // DisableThreadLibraryCalls Function
 //   http://msdn.microsoft.com/en-us/library/ms682579.aspx
diff --git a/Library/Measure.h b/Library/Measure.h
index 2b5c6200..cace3557 100644
--- a/Library/Measure.h
+++ b/Library/Measure.h
@@ -19,7 +19,9 @@
 #ifndef __MEASURE_H__
 #define __MEASURE_H__
 
-#include "MeterWindow.h"
+#include <windows.h>
+#include <vector>
+#include <string>
 #include "Litestep.h"
 #include "Group.h"
 
@@ -36,6 +38,8 @@ enum AUTOSCALE
 };
 
 class CMeter;
+class CMeterWindow;
+class CConfigParser;
 
 class CMeasure : public CGroup
 {
diff --git a/Library/MeasureMemory.cpp b/Library/MeasureMemory.cpp
index 57d2f7d4..72ad90bd 100644
--- a/Library/MeasureMemory.cpp
+++ b/Library/MeasureMemory.cpp
@@ -18,6 +18,7 @@
 
 #include "StdAfx.h"
 #include "MeasureMemory.h"
+#include "ConfigParser.h"
 
 /*
 ** CMeasureMemory
diff --git a/Library/MeasureNet.h b/Library/MeasureNet.h
index f6b921ee..1c3fee63 100644
--- a/Library/MeasureNet.h
+++ b/Library/MeasureNet.h
@@ -20,7 +20,6 @@
 #define __MEASURENET_H__
 
 #include "Measure.h"
-#include <Iphlpapi.h>
 
 //
 // Medium the Ndis Driver is running on (OID_GEN_MEDIA_SUPPORTED/ OID_GEN_MEDIA_IN_USE).
diff --git a/Library/MeasurePhysicalMemory.cpp b/Library/MeasurePhysicalMemory.cpp
index 7f2057c6..79ce279b 100644
--- a/Library/MeasurePhysicalMemory.cpp
+++ b/Library/MeasurePhysicalMemory.cpp
@@ -18,6 +18,7 @@
 
 #include "StdAfx.h"
 #include "MeasurePhysicalMemory.h"
+#include "ConfigParser.h"
 
 /*
 ** CMeasurePhysicalMemory
diff --git a/Library/MeasureVirtualMemory.cpp b/Library/MeasureVirtualMemory.cpp
index 98595efa..d2ef5076 100644
--- a/Library/MeasureVirtualMemory.cpp
+++ b/Library/MeasureVirtualMemory.cpp
@@ -18,6 +18,7 @@
 
 #include "StdAfx.h"
 #include "MeasureVirtualMemory.h"
+#include "ConfigParser.h"
 
 /*
 ** CMeasureVirtualMemory
diff --git a/Library/Meter.h b/Library/Meter.h
index f2274231..8c45f4c0 100644
--- a/Library/Meter.h
+++ b/Library/Meter.h
@@ -20,13 +20,14 @@
 #define __METER_H__
 
 #include <windows.h>
-#include <list>
 #include <gdiplus.h>
+#include <vector>
 #include "Litestep.h"
 #include "MeterWindow.h"
 #include "Group.h"
 
 class CMeasure;
+class CConfigParser;
 
 class CMeter : public CGroup
 {
diff --git a/Library/MeterBar.h b/Library/MeterBar.h
index 1f19dd5c..07ed9231 100644
--- a/Library/MeterBar.h
+++ b/Library/MeterBar.h
@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterBar : public CMeter
 {
diff --git a/Library/MeterBitmap.h b/Library/MeterBitmap.h
index 02698390..06f0a906 100644
--- a/Library/MeterBitmap.h
+++ b/Library/MeterBitmap.h
@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterBitmap : public CMeter
 {
diff --git a/Library/MeterButton.h b/Library/MeterButton.h
index 3d6a7e2b..611b5c80 100644
--- a/Library/MeterButton.h
+++ b/Library/MeterButton.h
@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 #define BUTTON_FRAMES 3
 
diff --git a/Library/MeterHistogram.h b/Library/MeterHistogram.h
index fef10273..86047980 100644
--- a/Library/MeterHistogram.h
+++ b/Library/MeterHistogram.h
@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterHistogram : public CMeter
 {
diff --git a/Library/MeterImage.h b/Library/MeterImage.h
index ea689b9a..3a12e441 100644
--- a/Library/MeterImage.h
+++ b/Library/MeterImage.h
@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterImage : public CMeter
 {
diff --git a/Library/MeterLine.h b/Library/MeterLine.h
index a3c6dbb1..bbbd3e7c 100644
--- a/Library/MeterLine.h
+++ b/Library/MeterLine.h
@@ -20,7 +20,6 @@
 #define __METERLINE_H__
 
 #include "Meter.h"
-#include "MeterWindow.h"
 
 class CMeterLine : public CMeter
 {
diff --git a/Library/MeterRotator.h b/Library/MeterRotator.h
index b91aa0b7..3c74f894 100644
--- a/Library/MeterRotator.h
+++ b/Library/MeterRotator.h
@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterRotator : public CMeter
 {
diff --git a/Library/MeterRoundLine.h b/Library/MeterRoundLine.h
index fa6a5fb9..4d9c2a74 100644
--- a/Library/MeterRoundLine.h
+++ b/Library/MeterRoundLine.h
@@ -20,7 +20,6 @@
 #define __METERROUNDLINE_H__
 
 #include "Meter.h"
-#include "MeterWindow.h"
 
 class CMeterRoundLine : public CMeter
 {
diff --git a/Library/MeterString.h b/Library/MeterString.h
index 9328f006..eba32643 100644
--- a/Library/MeterString.h
+++ b/Library/MeterString.h
@@ -20,7 +20,6 @@
 #define __METERSTRING_H__
 
 #include "Meter.h"
-#include "MeterWindow.h"
 #include "Measure.h"
 
 namespace Gdiplus
diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp
index f4ef161e..df549aef 100644
--- a/Library/MeterWindow.cpp
+++ b/Library/MeterWindow.cpp
@@ -19,6 +19,7 @@
 #include "StdAfx.h"
 #include "MeterWindow.h"
 #include "Rainmeter.h"
+#include "TrayWindow.h"
 #include "System.h"
 #include "Error.h"
 #include "Meter.h"
@@ -33,6 +34,7 @@
 #include "MeterString.h"
 #include "TintedImage.h"
 #include "MeasureScript.h"
+#include "../Version.h"
 
 using namespace Gdiplus;
 
diff --git a/Library/MeterWindow.h b/Library/MeterWindow.h
index d2f7410c..e00e9c94 100644
--- a/Library/MeterWindow.h
+++ b/Library/MeterWindow.h
@@ -25,10 +25,8 @@
 #include <gdiplus.h>
 #include <string>
 #include <list>
-#include <vector>
 #include "ConfigParser.h"
 #include "Group.h"
-#include "Export.h"
 
 #define BEGIN_MESSAGEPROC if (Window) { switch(uMsg) {
 #define MESSAGE(handler, msg) case msg: return Window->handler(uMsg, wParam, lParam);
diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp
index ad5dbcaf..c71900e6 100644
--- a/Library/Rainmeter.cpp
+++ b/Library/Rainmeter.cpp
@@ -18,13 +18,15 @@
 
 #include "StdAfx.h"
 #include "Rainmeter.h"
+#include "TrayWindow.h"
 #include "System.h"
 #include "Error.h"
 #include "AboutDialog.h"
 #include "MeasureNet.h"
 #include "MeterString.h"
-#include "Resource.h"
+#include "resource.h"
 #include "UpdateCheck.h"
+#include "../Version.h"
 
 #include "DisableThreadLibraryCalls.h"	// contains DllMain entry point
 
diff --git a/Library/Rainmeter.h b/Library/Rainmeter.h
index 152648c0..a58e45e2 100644
--- a/Library/Rainmeter.h
+++ b/Library/Rainmeter.h
@@ -22,11 +22,10 @@
 #include <windows.h>
 #include <map>
 #include <vector>
+#include <list>
 #include <string>
 #include "Litestep.h"
 #include "MeterWindow.h"
-#include "TrayWindow.h"
-#include "../Version.h"
 
 #define MAX_LINE_LENGTH 4096
 
@@ -126,6 +125,9 @@ struct GlobalConfig
 	double netOutSpeed;
 };
 
+class CConfigParser;
+class CTrayWindow;
+
 class CRainmeter
 {
 public:
diff --git a/Library/TintedImage.cpp b/Library/TintedImage.cpp
index c7f0780c..8a6e4c39 100644
--- a/Library/TintedImage.cpp
+++ b/Library/TintedImage.cpp
@@ -18,6 +18,7 @@
 
 #include "StdAfx.h"
 #include "TintedImage.h"
+#include "ConfigParser.h"
 #include "Error.h"
 #include "Litestep.h"
 
diff --git a/Library/TintedImage.h b/Library/TintedImage.h
index 042280b0..d97ae945 100644
--- a/Library/TintedImage.h
+++ b/Library/TintedImage.h
@@ -19,8 +19,11 @@
 #ifndef __TINTEDIMAGE_H__
 #define __TINTEDIMAGE_H__
 
-#include "Meter.h"
-#include "MeterWindow.h"
+#include <windows.h>
+#include <gdiplus.h>
+#include <string>
+
+class CConfigParser;
 
 class CTintedImage
 {
diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp
index 6bb3eb83..a8359f13 100644
--- a/Library/TrayWindow.cpp
+++ b/Library/TrayWindow.cpp
@@ -18,7 +18,8 @@
 
 #include "StdAfx.h"
 #include "TrayWindow.h"
-#include "Resource.h"
+#include "Measure.h"
+#include "resource.h"
 #include "Litestep.h"
 #include "Rainmeter.h"
 #include "AboutDialog.h"
diff --git a/Library/TrayWindow.h b/Library/TrayWindow.h
index 64ee8f82..0a68f404 100644
--- a/Library/TrayWindow.h
+++ b/Library/TrayWindow.h
@@ -22,7 +22,8 @@
 #pragma warning(disable: 4786)
 
 #include <windows.h>
-#include "Measure.h"
+#include <gdiplus.h>
+#include <vector>
 
 #define WM_DELAYED_REFRESH_ALL WM_APP + 0
 
@@ -36,6 +37,9 @@ enum TRAY_METER_TYPE
 	TRAY_METER_TYPE_BITMAP
 };
 
+class CConfigParser;
+class CMeasure;
+
 class CTrayWindow
 {
 public:
diff --git a/Library/UpdateCheck.cpp b/Library/UpdateCheck.cpp
index 898be917..9af69cbc 100644
--- a/Library/UpdateCheck.cpp
+++ b/Library/UpdateCheck.cpp
@@ -19,6 +19,7 @@
 #include "StdAfx.h"
 #include "Litestep.h"
 #include "Rainmeter.h"
+#include "../Version.h"
 
 extern CRainmeter* Rainmeter;