diff --git a/Source/EngineMkI.h b/Source/EngineMkI.h
index 6f9be3a..280510f 100644
--- a/Source/EngineMkI.h
+++ b/Source/EngineMkI.h
@@ -18,11 +18,11 @@
 #ifndef ENGINEMKI_H_INCLUDED
 #define ENGINEMKI_H_INCLUDED
 
-#include "synth.h"
-#include "aligned_buf.h"
-#include "fm_op_kernel.h"
-#include "controllers.h"
-#include "fm_core.h"
+#include "msfa/synth.h"
+#include "msfa/aligned_buf.h"
+#include "msfa/fm_op_kernel.h"
+#include "msfa/controllers.h"
+#include "msfa/fm_core.h"
 
 
 class EngineMkI : public FmCore {
diff --git a/Source/EngineOpl.cpp b/Source/EngineOpl.cpp
index 3b3dee8..cd2cbe8 100644
--- a/Source/EngineOpl.cpp
+++ b/Source/EngineOpl.cpp
@@ -25,7 +25,11 @@
 
 #include "EngineOpl.h"
 
-const int32_t __attribute__ ((aligned(16))) zeros[N] = {0};
+#ifdef _WIN32
+    __declspec(align(16)) int zeros[N] = {0};
+#else
+    const int32_t __attribute__ ((aligned(16))) zeros[N] = {0};
+#endif
 
 uint16_t SignBit = 0x8000;
 
diff --git a/Source/EngineOpl.h b/Source/EngineOpl.h
index f614dc5..a8d6109 100644
--- a/Source/EngineOpl.h
+++ b/Source/EngineOpl.h
@@ -1,21 +1,31 @@
-/*
-  ==============================================================================
-
-    ExtraKernels.h
-    Created: 20 Aug 2014 8:21:43pm
-    Author:  Pascal Gauthier
-
-  ==============================================================================
-*/
+/**
+ *
+ * Copyright (c) 2014 Pascal Gauthier.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ */
 
 #ifndef ENGINEOPL_H_INCLUDED
 #define ENGINEOPL_H_INCLUDED
 
-#include "synth.h"
-#include "aligned_buf.h"
-#include "fm_op_kernel.h"
-#include "controllers.h"
-#include "fm_core.h"
+#include "msfa/synth.h"
+#include "msfa/aligned_buf.h"
+#include "msfa/fm_op_kernel.h"
+#include "msfa/controllers.h"
+#include "msfa/fm_core.h"
 
 
 class EngineOpl : public FmCore {
diff --git a/Source/msfa/controllers.h b/Source/msfa/controllers.h
index d307784..873e2e0 100755
--- a/Source/msfa/controllers.h
+++ b/Source/msfa/controllers.h
@@ -17,6 +17,8 @@
 #ifndef __CONTROLLERS_H
 #define __CONTROLLERS_H
 
+#include "synth.h"
+
 // State of MIDI controllers
 const int kControllerModWheel = 1;
 const int kControllerPitch = 128;