Cleaned up header dependencies to avoid unnecessary compiling.

Library/ConfigParser.cpp

@@ -21,6 +21,7 @@
 #include "Litestep.h"
 #include "Rainmeter.h"
 #include "System.h"
+#include "Measure.h"
 
 extern CRainmeter* Rainmeter;
 

Library/DisableThreadLibraryCalls.h

@@ -16,8 +16,8 @@
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#ifndef _DISABLETHREADLIBRARYCALLS_H_
+#ifndef __DISABLETHREADLIBRARYCALLS_H__
-#define _DISABLETHREADLIBRARYCALLS_H_
+#define __DISABLETHREADLIBRARYCALLS_H__
 
 // DisableThreadLibraryCalls Function
 //   http://msdn.microsoft.com/en-us/library/ms682579.aspx

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
 {

Library/MeasureMemory.cpp

@@ -18,6 +18,7 @@
 
 #include "StdAfx.h"
 #include "MeasureMemory.h"
+#include "ConfigParser.h"
 
 /*
 ** CMeasureMemory

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).

Library/MeasurePhysicalMemory.cpp

@@ -18,6 +18,7 @@
 
 #include "StdAfx.h"
 #include "MeasurePhysicalMemory.h"
+#include "ConfigParser.h"
 
 /*
 ** CMeasurePhysicalMemory

Library/MeasureVirtualMemory.cpp

@@ -18,6 +18,7 @@
 
 #include "StdAfx.h"
 #include "MeasureVirtualMemory.h"
+#include "ConfigParser.h"
 
 /*
 ** CMeasureVirtualMemory

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
 {

Library/MeterBar.h

@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterBar : public CMeter
 {

Library/MeterBitmap.h

@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterBitmap : public CMeter
 {

Library/MeterButton.h

@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 #define BUTTON_FRAMES 3
 

Library/MeterHistogram.h

@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterHistogram : public CMeter
 {

Library/MeterImage.h

@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterImage : public CMeter
 {

Library/MeterLine.h

@@ -20,7 +20,6 @@
 #define __METERLINE_H__
 
 #include "Meter.h"
-#include "MeterWindow.h"
 
 class CMeterLine : public CMeter
 {

Library/MeterRotator.h

@@ -21,7 +21,6 @@
 
 #include "Meter.h"
 #include "TintedImage.h"
-#include "MeterWindow.h"
 
 class CMeterRotator : public CMeter
 {

Library/MeterRoundLine.h

@@ -20,7 +20,6 @@
 #define __METERROUNDLINE_H__
 
 #include "Meter.h"
-#include "MeterWindow.h"
 
 class CMeterRoundLine : public CMeter
 {

Library/MeterString.h

@@ -20,7 +20,6 @@
 #define __METERSTRING_H__
 
 #include "Meter.h"
-#include "MeterWindow.h"
 #include "Measure.h"
 
 namespace Gdiplus

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;
 

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);

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
 

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:

Library/TintedImage.cpp

@@ -18,6 +18,7 @@
 
 #include "StdAfx.h"
 #include "TintedImage.h"
+#include "ConfigParser.h"
 #include "Error.h"
 #include "Litestep.h"
 

Library/TintedImage.h

@@ -19,8 +19,11 @@
 #ifndef __TINTEDIMAGE_H__
 #define __TINTEDIMAGE_H__
 
-#include "Meter.h"
+#include <windows.h>
-#include "MeterWindow.h"
+#include <gdiplus.h>
+#include <string>
+
+class CConfigParser;
 
 class CTintedImage
 {

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"

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:

Library/UpdateCheck.cpp

@@ -19,6 +19,7 @@
 #include "StdAfx.h"
 #include "Litestep.h"
 #include "Rainmeter.h"
+#include "../Version.h"
 
 extern CRainmeter* Rainmeter;