diff --git a/src/v2i-hub/MapPlugin/src/MapPlugin.cpp b/src/v2i-hub/MapPlugin/src/MapPlugin.cpp
index 18a9ab3d3..f0850e544 100644
--- a/src/v2i-hub/MapPlugin/src/MapPlugin.cpp
+++ b/src/v2i-hub/MapPlugin/src/MapPlugin.cpp
@@ -1,7 +1,4 @@
 #include "MapPlugin.h"
-#include <chrono>
-#include <fstream>
-#include <boost/algorithm/string.hpp>
 
 namespace MapPlugin {
 
diff --git a/src/v2i-hub/MapPlugin/src/MapPlugin.h b/src/v2i-hub/MapPlugin/src/MapPlugin.h
index accdf0f8c..c2f34da8a 100644
--- a/src/v2i-hub/MapPlugin/src/MapPlugin.h
+++ b/src/v2i-hub/MapPlugin/src/MapPlugin.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef MAPPLUGIN_H_
-#define MAPPLUGIN_H_
-
 #include <atomic>
 #include <iostream>
 #include <map>
@@ -17,6 +14,9 @@
 #include <sys/time.h>
 #include <string>
 #include <cstdio>
+#include <chrono>
+#include <fstream>
+#include <boost/algorithm/string.hpp>
 
 #include <tmx/tmx.h>
 #include <tmx/IvpPlugin.h>
@@ -97,7 +97,7 @@ class MapPlugin: public PluginClientClockAware {
 	int sendFrequency = 1000;
 	FrequencyThrottle<int> errThrottle;
 
-	char mapID_buffer[5];
+	char mapID_buffer[5] = {0};
 
 	bool LoadMapFiles();
 	void DebugPrintMapFiles();
@@ -107,5 +107,3 @@ class MapPlugin: public PluginClientClockAware {
 };
 
 } // namespace MapPlugin
-
-#endif /* MAPPLUGIN_H_ */