diff --git a/source/native-plugins/zynaddsubfx-src.cpp b/source/native-plugins/zynaddsubfx-src.cpp
index 1278e278e..1e4d19992 100644
--- a/source/native-plugins/zynaddsubfx-src.cpp
+++ b/source/native-plugins/zynaddsubfx-src.cpp
@@ -112,6 +112,7 @@ extern "C" {
 #include "zynaddsubfx/Misc/PresetExtractor.cpp"
 #include "zynaddsubfx/Misc/Recorder.cpp"
 //#include "zynaddsubfx/Misc/Stereo.cpp"
+#include "zynaddsubfx/Misc/TmpFileMgr.cpp"
 #include "zynaddsubfx/Misc/Util.cpp"
 #include "zynaddsubfx/Misc/WavFile.cpp"
 #include "zynaddsubfx/Misc/WaveShapeSmps.cpp"
@@ -155,6 +156,7 @@ extern "C" {
 #include "zynaddsubfx/Synth/SUBnote.cpp"
 #include "zynaddsubfx/Synth/SynthNote.cpp"
 #include "zynaddsubfx/UI/ConnectionDummy.cpp"
+#include "zynaddsubfx/globals.cpp"
 
 // Dummy variables and functions for linking purposes
 // const char* instance_name = nullptr;
diff --git a/source/native-plugins/zynaddsubfx-synth.cpp b/source/native-plugins/zynaddsubfx-synth.cpp
index d8ef7c512..e94f9ae44 100644
--- a/source/native-plugins/zynaddsubfx-synth.cpp
+++ b/source/native-plugins/zynaddsubfx-synth.cpp
@@ -207,6 +207,7 @@ public:
 
     ZynAddSubFxPlugin(const NativeHostDescriptor* const host)
         : NativePluginAndUiClass(host, "zynaddsubfx-ui"),
+          CarlaThread("ZynAddSubFxPlugin"),
           fMiddleWare(nullptr),
           fMaster(nullptr),
           fSynth(),
diff --git a/source/native-plugins/zynaddsubfx/Misc/TmpFileMgr.h b/source/native-plugins/zynaddsubfx/Misc/TmpFileMgr.h
index fad0c0b67..8809d4e01 100644
--- a/source/native-plugins/zynaddsubfx/Misc/TmpFileMgr.h
+++ b/source/native-plugins/zynaddsubfx/Misc/TmpFileMgr.h
@@ -1,3 +1,4 @@
+#pragma once
 
 /**
     This file provides routines for using zyn's tmp files.