diff --git a/server/proxy/modules/demo/demo.cpp b/server/proxy/modules/demo/demo.cpp
index f7d036f17..af454e74a 100644
--- a/server/proxy/modules/demo/demo.cpp
+++ b/server/proxy/modules/demo/demo.cpp
@@ -25,6 +25,12 @@
 
 #define TAG MODULE_TAG("demo")
 
+struct demo_custom_data
+{
+	proxyPluginsManager* mgr;
+	int somesetting;
+};
+
 static constexpr char plugin_name[] = "demo";
 static constexpr char plugin_desc[] = "this is a test plugin";
 
@@ -36,7 +42,7 @@ static BOOL demo_plugin_unload(proxyPlugin* plugin)
 
 	/* Here we have to free up our custom data storage. */
 	if (plugin)
-		delete (plugin->custom);
+		delete static_cast<struct demo_custom_data*>(plugin->custom);
 
 	return TRUE;
 }
@@ -282,11 +288,6 @@ extern "C"
 
 BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata)
 {
-	struct demo_custom_data
-	{
-		proxyPluginsManager* mgr;
-		int somesetting;
-	};
 	struct demo_custom_data* custom;
 	proxyPlugin plugin = {};
 
diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c
index b7318c448..69dcee9ee 100644
--- a/server/proxy/pf_config.c
+++ b/server/proxy/pf_config.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <winpr/crt.h>
+#include <winpr/path.h>
 #include <winpr/collections.h>
 #include <winpr/cmdline.h>