+--- a/hardware/openzwave/control_panel/ozwcp.cpp 2020-03-22 09:16:16.000000000 -0500
++++ b/hardware/openzwave/control_panel/ozwcp.cpp 2020-03-24 10:53:04.968630391 -0500
+@@ -49,7 +49,7 @@
+ #include <sys/stat.h>
+ #include <fstream>
+ #include <iostream>
+-#include "../../../tinyxpath/tinyxml.h"
++#include <tinyxml.h>
+
+ //#include "microhttpd.h"
+ #include "ozwcp.h"
+--- a/hardware/plugins/PluginManager.cpp 2020-03-22 09:16:16.000000000 -0500
++++ b/hardware/plugins/PluginManager.cpp 2020-03-24 13:53:05.305852598 -0500
+@@ -21,11 +21,12 @@
+ #include "../../main/Logger.h"
+ #include "../../main/SQLHelper.h"
+ #include "../../main/WebServer.h"
+-#include "../../tinyxpath/tinyxml.h"
+ #ifdef WIN32
++# include "../../tinyxpath/tinyxml.h"
+ # include <direct.h>
+ #else
+ # include <sys/stat.h>
++# include <tinyxml.h>
+ #endif
+
+ #include "DelayedLink.h"
+--- a/hardware/plugins/Plugins.cpp 2020-03-22 09:16:16.000000000 -0500
++++ b/hardware/plugins/Plugins.cpp 2020-03-24 13:45:46.056965796 -0500
+@@ -16,10 +16,11 @@
+ #include "../../main/SQLHelper.h"
+ #include "../../main/mainworker.h"
+ #include "../../main/localtime_r.h"
+-#include "../../tinyxpath/tinyxml.h"
+
+ #include "../../notifications/NotificationHelper.h"
+
++#include <tinyxml.h>
++
+ #define ADD_STRING_TO_DICT(pDict, key, value) \
+ { \
+ PyObject* pObj = Py_BuildValue("s", value.c_str()); \
+--- a/hardware/AnnaThermostat.cpp 2020-03-22 09:16:16.000000000 -0500
++++ b/hardware/AnnaThermostat.cpp 2020-03-24 10:41:00.530030798 -0500
+@@ -9,7 +9,7 @@
+ #include "../httpclient/HTTPClient.h"
+ #include "../main/mainworker.h"
+
+-#include "../tinyxpath/tinyxml.h"
++#include <tinyxml.h>
+
+ #define round(a) ( int ) ( a + .5 )
+
+--- a/hardware/EcoDevices.cpp 2020-03-22 09:16:16.000000000 -0500
++++ b/hardware/EcoDevices.cpp 2020-03-24 10:47:20.095926641 -0500
+@@ -33,11 +33,11 @@
+ #include "hardwaretypes.h"
+ #include "../main/localtime_r.h"
+ #include "../httpclient/HTTPClient.h"
+-#include "../tinyxpath/tinyxml.h"
+-#include "../tinyxpath/xpath_static.h"
+ #include "../webserver/Base64.h"
+ #include "../main/json_helper.h"
+ #include <sstream>
++#include <tinyxml.h>
++#include <xpath_static.h>
+
+ #ifdef _DEBUG
+ #define DEBUG_EcoDevices