diff --git a/Doxyfile b/Doxyfile
index bd27ce8..993a931 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -74,7 +74,7 @@ PROJECT_ICON           =
 # entered, it will be relative to the location where Doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = build/docs
+OUTPUT_DIRECTORY       = ./build/docs
 
 # If the CREATE_SUBDIRS tag is set to YES then Doxygen will create up to 4096
 # sub-directories (in 2 levels) under the output directory of each output format
@@ -991,8 +991,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = vst.h \
-                         vst.hpp \
+INPUT                  = include/ \
                          README.md
 
 # This tag can be used to specify the character encoding of the source files
@@ -2533,7 +2532,8 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             =
+PREDEFINED             = __cplusplus:=999999L \
+                         __STDC_VERSION__:=999999L
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/public.sdk/source/vst2.x/aeffect.h b/include/public.sdk/source/vst2.x/aeffect.h
similarity index 100%
rename from public.sdk/source/vst2.x/aeffect.h
rename to include/public.sdk/source/vst2.x/aeffect.h
diff --git a/public.sdk/source/vst2.x/aeffectx.h b/include/public.sdk/source/vst2.x/aeffectx.h
similarity index 100%
rename from public.sdk/source/vst2.x/aeffectx.h
rename to include/public.sdk/source/vst2.x/aeffectx.h
diff --git a/public.sdk/source/vst2.x/aeffeditor.cpp b/include/public.sdk/source/vst2.x/aeffeditor.cpp
similarity index 100%
rename from public.sdk/source/vst2.x/aeffeditor.cpp
rename to include/public.sdk/source/vst2.x/aeffeditor.cpp
diff --git a/public.sdk/source/vst2.x/aeffeditor.h b/include/public.sdk/source/vst2.x/aeffeditor.h
similarity index 100%
rename from public.sdk/source/vst2.x/aeffeditor.h
rename to include/public.sdk/source/vst2.x/aeffeditor.h
diff --git a/public.sdk/source/vst2.x/aeffeditor.hpp b/include/public.sdk/source/vst2.x/aeffeditor.hpp
similarity index 100%
rename from public.sdk/source/vst2.x/aeffeditor.hpp
rename to include/public.sdk/source/vst2.x/aeffeditor.hpp
diff --git a/public.sdk/source/vst2.x/audioeffect.cpp b/include/public.sdk/source/vst2.x/audioeffect.cpp
similarity index 100%
rename from public.sdk/source/vst2.x/audioeffect.cpp
rename to include/public.sdk/source/vst2.x/audioeffect.cpp
diff --git a/public.sdk/source/vst2.x/audioeffect.hpp b/include/public.sdk/source/vst2.x/audioeffect.hpp
similarity index 100%
rename from public.sdk/source/vst2.x/audioeffect.hpp
rename to include/public.sdk/source/vst2.x/audioeffect.hpp
diff --git a/public.sdk/source/vst2.x/audioeffectx.cpp b/include/public.sdk/source/vst2.x/audioeffectx.cpp
similarity index 100%
rename from public.sdk/source/vst2.x/audioeffectx.cpp
rename to include/public.sdk/source/vst2.x/audioeffectx.cpp
diff --git a/public.sdk/source/vst2.x/audioeffectx.h b/include/public.sdk/source/vst2.x/audioeffectx.h
similarity index 100%
rename from public.sdk/source/vst2.x/audioeffectx.h
rename to include/public.sdk/source/vst2.x/audioeffectx.h
diff --git a/public.sdk/source/vst2.x/audioeffectx.hpp b/include/public.sdk/source/vst2.x/audioeffectx.hpp
similarity index 100%
rename from public.sdk/source/vst2.x/audioeffectx.hpp
rename to include/public.sdk/source/vst2.x/audioeffectx.hpp
diff --git a/public.sdk/source/vst2.x/vstevent.h b/include/public.sdk/source/vst2.x/vstevent.h
similarity index 100%
rename from public.sdk/source/vst2.x/vstevent.h
rename to include/public.sdk/source/vst2.x/vstevent.h
diff --git a/public.sdk/source/vst2.x/vstkey.h b/include/public.sdk/source/vst2.x/vstkey.h
similarity index 100%
rename from public.sdk/source/vst2.x/vstkey.h
rename to include/public.sdk/source/vst2.x/vstkey.h
diff --git a/public.sdk/source/vst2.x/vstmidi.h b/include/public.sdk/source/vst2.x/vstmidi.h
similarity index 100%
rename from public.sdk/source/vst2.x/vstmidi.h
rename to include/public.sdk/source/vst2.x/vstmidi.h
diff --git a/public.sdk/source/vst2.x/vstparameter.h b/include/public.sdk/source/vst2.x/vstparameter.h
similarity index 100%
rename from public.sdk/source/vst2.x/vstparameter.h
rename to include/public.sdk/source/vst2.x/vstparameter.h
diff --git a/public.sdk/source/vst2.x/vstpin.h b/include/public.sdk/source/vst2.x/vstpin.h
similarity index 100%
rename from public.sdk/source/vst2.x/vstpin.h
rename to include/public.sdk/source/vst2.x/vstpin.h
diff --git a/public.sdk/source/vst2.x/vstspeaker.h b/include/public.sdk/source/vst2.x/vstspeaker.h
similarity index 100%
rename from public.sdk/source/vst2.x/vstspeaker.h
rename to include/public.sdk/source/vst2.x/vstspeaker.h
diff --git a/public.sdk/source/vst2.x/vsttime.h b/include/public.sdk/source/vst2.x/vsttime.h
similarity index 100%
rename from public.sdk/source/vst2.x/vsttime.h
rename to include/public.sdk/source/vst2.x/vsttime.h
diff --git a/public.sdk/source/vst2.x/vsttypes.h b/include/public.sdk/source/vst2.x/vsttypes.h
similarity index 100%
rename from public.sdk/source/vst2.x/vsttypes.h
rename to include/public.sdk/source/vst2.x/vsttypes.h
diff --git a/public.sdk/source/vst2.x/vstversion.h b/include/public.sdk/source/vst2.x/vstversion.h
similarity index 100%
rename from public.sdk/source/vst2.x/vstversion.h
rename to include/public.sdk/source/vst2.x/vstversion.h
diff --git a/vst.h b/include/vst.h
similarity index 99%
rename from vst.h
rename to include/vst.h
index 2b737df..e51b75a 100644
--- a/vst.h
+++ b/include/vst.h
@@ -24,7 +24,6 @@
 /* Protect against double inclusion in practically every compiler available. */
 #pragma once
 #ifndef VST2SDK_VST_H
-/** @private */
 #define VST2SDK_VST_H
 
 /* The VST 2.x alignment appears to be 8 for both 32 and 64-bit. This alignment is ignored by some earlier Windows
diff --git a/vst.hpp b/include/vst.hpp
similarity index 100%
rename from vst.hpp
rename to include/vst.hpp