diff --git a/include/Plugin.h b/include/Plugin.h
index b91999aec..7c937dc8c 100644
--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -22,18 +22,15 @@
  *
  */
 
-#ifndef _PLUGIN_H
-#define _PLUGIN_H
+#ifndef PLUGIN_H
+#define PLUGIN_H
 
-#include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QList>
+#include <QtCore/QMap>
 #include <QtXml/QDomDocument>
 
 #include "JournallingObject.h"
 #include "Model.h"
-#include "base64.h"
-
 
 
 class QWidget;
diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp
index 682f470a6..881ac8695 100644
--- a/plugins/bit_invader/bit_invader.cpp
+++ b/plugins/bit_invader/bit_invader.cpp
@@ -26,6 +26,7 @@
 #include <QtXml/QDomElement>
 
 #include "bit_invader.h"
+#include "base64.h"
 #include "engine.h"
 #include "graph.h"
 #include "InstrumentTrack.h"
diff --git a/plugins/dynamics_processor/dynamics_processor_controls.cpp b/plugins/dynamics_processor/dynamics_processor_controls.cpp
index ffe9d2d96..108ecb8ab 100644
--- a/plugins/dynamics_processor/dynamics_processor_controls.cpp
+++ b/plugins/dynamics_processor/dynamics_processor_controls.cpp
@@ -28,6 +28,7 @@
 
 #include "dynamics_processor_controls.h"
 #include "dynamics_processor.h"
+#include "base64.h"
 #include "graph.h"
 #include "engine.h"
 #include "song.h"
diff --git a/plugins/papu/papu_instrument.cpp b/plugins/papu/papu_instrument.cpp
index 510042a4c..fa3c4425e 100644
--- a/plugins/papu/papu_instrument.cpp
+++ b/plugins/papu/papu_instrument.cpp
@@ -29,6 +29,7 @@
 #include "Basic_Gb_Apu.h"
 
 #include "papu_instrument.h"
+#include "base64.h"
 #include "InstrumentTrack.h"
 #include "knob.h"
 #include "NotePlayHandle.h"
diff --git a/plugins/watsyn/Watsyn.cpp b/plugins/watsyn/Watsyn.cpp
index 72af13771..16cd223e6 100644
--- a/plugins/watsyn/Watsyn.cpp
+++ b/plugins/watsyn/Watsyn.cpp
@@ -25,6 +25,7 @@
 #include <QtXml/QDomElement>
 
 #include "Watsyn.h"
+#include "base64.h"
 #include "engine.h"
 #include "InstrumentTrack.h"
 #include "templates.h"
diff --git a/plugins/waveshaper/waveshaper_controls.cpp b/plugins/waveshaper/waveshaper_controls.cpp
index 4dfda0ca7..7b7e43379 100644
--- a/plugins/waveshaper/waveshaper_controls.cpp
+++ b/plugins/waveshaper/waveshaper_controls.cpp
@@ -28,6 +28,7 @@
 
 #include "waveshaper_controls.h"
 #include "waveshaper.h"
+#include "base64.h"
 #include "graph.h"
 #include "engine.h"
 #include "song.h"
diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
index b7b43c4a0..c109e2828 100644
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -40,6 +40,7 @@
 #include "SongEditor.h"
 #include "Effect.h"
 #include "lmmsversion.h"
+#include "base64.h"
 
 // bbTCO::defaultColor()
 #include "bb_track.h"