diff --git a/code/image.cpp b/code/image.cpp
index 73b0723..4306e39 100644
--- a/code/image.cpp
+++ b/code/image.cpp
@@ -22,7 +22,8 @@
 
 #include "stdafx.h"
 #include "image.h"
-#include "png/png.h"
+//#include "png/png.h"
+#include "libpng16/png.h"
 #include <vector>
 #include <algorithm>
 #include <Wincodec.h>
diff --git a/code/restserver.cpp b/code/restserver.cpp
index bd1f82f..d3b7a3d 100644
--- a/code/restserver.cpp
+++ b/code/restserver.cpp
@@ -29,7 +29,11 @@ Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 #include "oEvent.h"
 #include "xmlparser.h"
 
-#include "restbed/restbed"
+//#include "restbed/restbed"
+//Error	C4996	'restbed::Http': HTTP client is deprecated; we will release a complimentary client framework at a future date.
+#pragma warning(suppress : 4996)
+#include "restbed"
+
 #include "meosexception.h"
 #include "restserver.h"
 #include "infoserver.h"