diff --git a/brokenfft/brokenfft.h b/brokenfft/brokenfft.h
index a93ba26c..d40ecda6 100644
--- a/brokenfft/brokenfft.h
+++ b/brokenfft/brokenfft.h
@@ -1,8 +1,8 @@
 
 /* BrokenFFT 2, featuring the Super Destroy FX Windowing System! */
 
-#ifndef __DFX_BROKENFFT_H
-#define __DFX_BROKENFFT_H
+#ifndef _DFX_BROKENFFT_H
+#define _DFX_BROKENFFT_H
 
 #include <audioeffectx.h>
 #include "rfftw.h"
@@ -18,9 +18,12 @@
 
 #define MAXECHO 8192
 
+#define FOURCC(a, b, c, d) (((unsigned int)(a) << 24) | ((unsigned int)(b) << 16) | \
+                            ((unsigned int)(c) << 8) | ((unsigned int)(d)))
+
 /* change these for your plugins */
 #define PLUGIN BrokenFFT
-#define PLUGINID 'DFbf'
+#define PLUGINID FOURCC('D', 'F', 'b', 'f')
 #define PLUGINNAME "DFX BROKENFFT"
 #define PLUGINPROGRAM BrokenFFTProgram
 
diff --git a/brokenfft/oldfft.h b/brokenfft/oldfft.h
index 7a7a3527..6c143f9e 100644
--- a/brokenfft/oldfft.h
+++ b/brokenfft/oldfft.h
@@ -1,9 +1,9 @@
 
 
-/* broken fft: $Id: oldfft.h,v 1.1 2002-03-25 03:14:12 tom7 Exp $ */
+/* broken fft: $Id: oldfft.h,v 1.02 2020/06/29 00:45:26 tom7 Exp $ */
 
-#ifndef __AGAIN_H
-#define __AGAIN_H
+#ifndef _AGAIN_H
+#define _AGAIN_H
 
 #include <audioeffectx.h>
 
diff --git a/bufferoverride/bufferoverridedef.h b/bufferoverride/bufferoverridedef.h
index 4bc088ce..31fd3b0d 100644
--- a/bufferoverride/bufferoverridedef.h
+++ b/bufferoverride/bufferoverridedef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"Buffer Override"
-#define PLUGIN_ID	'buff'
+#define PLUGIN_ID		FOURCC('b', 'u', 'f', 'f')
 #define PLUGIN_VERSION_MAJOR	2
 #define PLUGIN_VERSION_MINOR	1
 #define PLUGIN_VERSION_BUGFIX	0
diff --git a/decimate/decimate.h b/decimate/decimate.h
index 6150e9b9..a2aecde2 100644
--- a/decimate/decimate.h
+++ b/decimate/decimate.h
@@ -1,6 +1,6 @@
 
-#ifndef __DECIMATE_H
-#define __DECIMATE_H
+#ifndef _DFX_DECIMATE_H
+#define _DFX_DECIMATE_H
 
 #include "audioeffectx.h"
 
diff --git a/dfx-library/dfxdefines.h b/dfx-library/dfxdefines.h
index 5f64e126..c223ff26 100644
--- a/dfx-library/dfxdefines.h
+++ b/dfx-library/dfxdefines.h
@@ -25,8 +25,8 @@ These are our general global defines and constants, to be included
 somewhere in the include tree for every file for a DfxPlugin.
 ------------------------------------------------------------------------*/
 
-#ifndef __DFX_DEFINES_H
-#define __DFX_DEFINES_H
+#ifndef _DFX_DEFINES_H
+#define _DFX_DEFINES_H
 
 
 
diff --git a/dfx-library/dfxplugin-audiosuite.h b/dfx-library/dfxplugin-audiosuite.h
index 5e45a733..764232a8 100644
--- a/dfx-library/dfxplugin-audiosuite.h
+++ b/dfx-library/dfxplugin-audiosuite.h
@@ -25,8 +25,8 @@ This is our class for E-Z plugin-making and E-Z multiple-API support.
 This is where we connect the AudioSuite API to our DfxPlugin system.
 ------------------------------------------------------------------------*/
 
-#ifndef __DFXPLUGIN_AUDIOSUITE_H
-#define __DFXPLUGIN_AUDIOSUITE_H
+#ifndef _DFXPLUGIN_AUDIOSUITE_H
+#define _DFXPLUGIN_AUDIOSUITE_H
 
 
 /* XXX this file is a hack for AudioSuite support with a separate class hierarchy */
diff --git a/dfx-library/dfxplugin-prefix.h b/dfx-library/dfxplugin-prefix.h
index 8f616901..9be5c9fc 100644
--- a/dfx-library/dfxplugin-prefix.h
+++ b/dfx-library/dfxplugin-prefix.h
@@ -24,9 +24,18 @@ Destroy FX is a sovereign entity comprised of Sophia Poirier and Tom Murphy 7.
 This file should be included by any prefix header that you use for your plugin.
 ------------------------------------------------------------------------*/
 
-#ifndef __DFXPLUGIN_PREFIX_H
-#define __DFXPLUGIN_PREFIX_H
+#ifndef _DFXPLUGIN_PREFIX_H
+#define _DFXPLUGIN_PREFIX_H
 
+/*-----------------------------------------------------------------------------*/
+/* General stuff */
+
+/* Give a plugin ID using character constants, like
+   FOURCC('D', 'F', 'x', 'p')
+   The result always in big-endian order (FOURCC(1, 2, 3, 4) == 0x01020304).
+*/
+#define FOURCC(a, b, c, d) (((unsigned int)(a) << 24) | ((unsigned int)(b) << 16) | \
+                            ((unsigned int)(c) << 8) | ((unsigned int)(d)))
 
 /*-----------------------------------------------------------------------------*/
 /* Mac stuff */
diff --git a/dfx-library/dfxplugindef-template.h b/dfx-library/dfxplugindef-template.h
index 27dbefe9..5b10a29e 100644
--- a/dfx-library/dfxplugindef-template.h
+++ b/dfx-library/dfxplugindef-template.h
@@ -22,8 +22,8 @@ To contact the author, use the contact form at http://destroyfx.org/
 ------------------------------------------------------------------------*/
 
 
-#ifndef __DFXPLUGIN_DEF_TEMPLATE_H
-#define __DFXPLUGIN_DEF_TEMPLATE_H
+#ifndef _DFXPLUGIN_DEF_TEMPLATE_H
+#define _DFXPLUGIN_DEF_TEMPLATE_H
 
 
 #include "dfxplugin-prefix.h"
@@ -31,11 +31,13 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 // required
 #define PLUGIN_NAME_STRING	""
-#define PLUGIN_ID	''
-#define PLUGIN_VERSION_MAJOR	
-#define PLUGIN_VERSION_MINOR	
-#define PLUGIN_VERSION_BUGFIX	
-#define PLUGIN_VERSION_STRING	
+// should be unique among all plugins (!) Official Destroy FX plugins use 'D' 'F'
+// for the first two characters
+#define PLUGIN_ID		FOURCC('A', 'B', 'C', 'D')
+#define PLUGIN_VERSION_MAJOR	1
+#define PLUGIN_VERSION_MINOR	0
+#define PLUGIN_VERSION_BUGFIX	0
+#define PLUGIN_VERSION_STRING	"1.0.0"
 #define PLUGIN_CLASS_NAME	
 #define PLUGIN_ENTRY_POINT	"Entry"
 #define PLUGIN_BUNDLE_IDENTIFIER	DESTROYFX_BUNDLE_ID_PREFIX "" DFX_BUNDLE_ID_SUFFIX
diff --git a/dfx-library/keys.h b/dfx-library/keys.h
index 1f4b55cc..a6bf5de1 100644
--- a/dfx-library/keys.h
+++ b/dfx-library/keys.h
@@ -1,6 +1,6 @@
 
-#ifndef __KEYS_H
-#define __KEYS_H
+#ifndef _KEYS_H
+#define _KEYS_H
 
 /* These are keys for the abstract GUI layer. */
 
diff --git a/eqsync/eqsyncdef.h b/eqsync/eqsyncdef.h
index c229ff07..0718a05f 100644
--- a/eqsync/eqsyncdef.h
+++ b/eqsync/eqsyncdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"EQ Sync"
-#define PLUGIN_ID	'EQsy'
+#define PLUGIN_ID		FOURCC('E', 'Q', 's', 'y')
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	1
 #define PLUGIN_VERSION_BUGFIX	0
diff --git a/exemplar/exemplar.cpp b/exemplar/exemplar.cpp
index c17ef1a6..72081e62 100644
--- a/exemplar/exemplar.cpp
+++ b/exemplar/exemplar.cpp
@@ -15,7 +15,7 @@
 #define STRIDE 128
 
 #if defined(TARGET_API_VST) && TARGET_PLUGIN_HAS_GUI
-  #ifndef __DFX_EXEMPLAREDITOR_H
+  #ifndef _DFX_EXEMPLAREDITOR_H
   #include "exemplareditor.hpp"
   #endif
 #endif
diff --git a/exemplar/exemplar.h b/exemplar/exemplar.h
index d14eaf02..8d80036d 100644
--- a/exemplar/exemplar.h
+++ b/exemplar/exemplar.h
@@ -1,8 +1,8 @@
 
 /* Windowingstub, starring the Super Destroy FX Windowing System! */
 
-#ifndef __DFX_EXEMPLAR_H
-#define __DFX_EXEMPLAR_H
+#ifndef _DFX_EXEMPLAR_H
+#define _DFX_EXEMPLAR_H
 
 #include <dfxplugin.h>
 #include "ANN/ANN.h"
diff --git a/exemplar/exemplardefs.h b/exemplar/exemplardefs.h
index 00cbfc31..e1ca9dd0 100644
--- a/exemplar/exemplardefs.h
+++ b/exemplar/exemplardefs.h
@@ -3,7 +3,7 @@
    see dfxplugin.h for details. */
 
 #define PLUGIN_NAME_STRING	"DFX EXEMPLAR"
-#define PLUGIN_ID	'DFex'
+#define PLUGIN_ID		FOURCC('D', 'F', 'e', 'x')
 #define PLUGIN_VERSION	0x00010100
 #define PLUGIN_ENTRY_POINT	"ExemplarEntry"
 
diff --git a/firefly/GUI/fireflyeditor.hpp b/firefly/GUI/fireflyeditor.hpp
index 90de1980..2aafde2d 100644
--- a/firefly/GUI/fireflyeditor.hpp
+++ b/firefly/GUI/fireflyeditor.hpp
@@ -1,6 +1,6 @@
 
-#ifndef __DFX_FIREFLYEDITOR_H
-#define __DFX_FIREFLYEDITOR_H
+#ifndef _DFX_FIREFLYEDITOR_H
+#define _DFX_FIREFLYEDITOR_H
 
 #include "dfxgui.h"
 #include "multikick.hpp"
diff --git a/firefly/firefly.hpp b/firefly/firefly.hpp
index 47b3cc3f..7f07b2b2 100644
--- a/firefly/firefly.hpp
+++ b/firefly/firefly.hpp
@@ -1,8 +1,8 @@
 
 /* DFX Firefly : Universal FIR filter; EXTREME style. */
 
-#ifndef __DFX_FIREFLY_H
-#define __DFX_FIREFLY_H
+#ifndef _DFX_FIREFLY_H
+#define _DFX_FIREFLY_H
 
 #include <audioeffectx.h>
 
@@ -18,9 +18,12 @@
 #define fsign(f) ((f<0.0)?-1.0:1.0)
 #define pi (3.1415926535)
 
+#define FOURCC(a, b, c, d) (((unsigned int)(a) << 24) | ((unsigned int)(b) << 16) | \
+                            ((unsigned int)(c) << 8) | ((unsigned int)(d)))
+
 /* change these for your plugins */
 #define PLUGIN FireFly
-#define PLUGINID 'DFff'
+#define PLUGINID FOURCC('D', 'F', 'f', 'f')
 #define PLUGINNAME "DFX Firefly"
 #define DEFPROGRAMNAME "Lampyridae"
 #define PLUGINPROGRAM FireFlyProgram
diff --git a/geometer/geometerdef.h b/geometer/geometerdef.h
index 594f7cb1..8ea6a3a8 100644
--- a/geometer/geometerdef.h
+++ b/geometer/geometerdef.h
@@ -1,5 +1,5 @@
 /*------------------------------------------------------------------------
-Copyright (C) 2002-2018  Tom Murphy 7 and Sophia Poirier
+Copyright (C) 2002-2020  Tom Murphy 7 and Sophia Poirier
 
 This file is part of Geometer.
 
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"Geometer"
-#define PLUGIN_ID	'DFgr'
+#define PLUGIN_ID		FOURCC('D', 'F', 'g', 'r')
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	2
 #define PLUGIN_VERSION_BUGFIX	0
@@ -41,7 +41,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 #define PLUGIN_BACKGROUND_IMAGE_FILENAME	"geometer-background.png"
 //#define PLUGIN_BACKGROUND_IMAGE_FILENAME	"geometer-background-short.png"
 #define PLUGIN_BUNDLE_IDENTIFIER	DESTROYFX_BUNDLE_ID_PREFIX PLUGIN_NAME_STRING DFX_BUNDLE_ID_SUFFIX
-#define PLUGIN_COPYRIGHT_YEAR_STRING	"2002-2018"
+#define PLUGIN_COPYRIGHT_YEAR_STRING	"2002-2020"
 
 // optional
 #define PLUGIN_DESCRIPTION_STRING	"visually oriented waveform geometry"
diff --git a/guitest/guitest.h b/guitest/guitest.h
index 0e38930d..9439404a 100644
--- a/guitest/guitest.h
+++ b/guitest/guitest.h
@@ -1,8 +1,8 @@
 
-/* Windowingstub, starring the Super Destroy FX Windowing System! */
+/* Guitest, starring the Super Destroy FX Windowing System! */
 
-#ifndef __DFX_WINDOWINGSTUB_H
-#define __DFX_WINDOWINGSTUB_H
+#ifndef _DFX_GUITEST_H
+#define _DFX_GUITEST_H
 
 #include "dfxplugin.h"
 
diff --git a/guitest/guitestdefs.h b/guitest/guitestdefs.h
index 744a1faf..2b81120e 100644
--- a/guitest/guitestdefs.h
+++ b/guitest/guitestdefs.h
@@ -2,10 +2,10 @@
 /* You need to redefine this stuff in order to make your plugin.
    see dfxplugin.h for details. */
 
-#define PLUGIN_NAME_STRING	"WINDOWINGSTUB"
-#define PLUGIN_ID	'DFws'
+#define PLUGIN_NAME_STRING	"GUITEST"
+#define PLUGIN_ID	FOURCC('D', 'F', 'g', 't')
 #define PLUGIN_VERSION	0x00010100
-#define PLUGIN_ENTRY_POINT	"WindowingstubEntry"
+#define PLUGIN_ENTRY_POINT	"GuitestEntry"
 
 #define TARGET_PLUGIN_USES_MIDI	1
 #define TARGET_PLUGIN_IS_INSTRUMENT	0
@@ -16,7 +16,7 @@
 #endif
 
 /* only necessary if using a custom GUI */
-#define PLUGIN_EDITOR_ENTRY_POINT	"WindowingstubEditorEntry"
+#define PLUGIN_EDITOR_ENTRY_POINT	"GuitestEditorEntry"
 
 // optional
 #define PLUGIN_DESCRIPTION_STRING	"i forgot to change the description"
diff --git a/guitest/guitesteditor.h b/guitest/guitesteditor.h
index 0adfa205..ab7b7c87 100644
--- a/guitest/guitesteditor.h
+++ b/guitest/guitesteditor.h
@@ -1,6 +1,6 @@
 
-#ifndef __DFX_GUITESTEDITOR_H
-#define __DFX_GUITESTEDITOR_H
+#ifndef _DFX_GUITESTEDITOR_H
+#define _DFX_GUITESTEDITOR_H
 
 #include <audioeffectx.h>
 #include <aeffeditor.hpp>
diff --git a/intercom/intercom.h b/intercom/intercom.h
index 9a0acb0f..3cc50edc 100644
--- a/intercom/intercom.h
+++ b/intercom/intercom.h
@@ -5,8 +5,8 @@
 
 ---------------------------------------------------------------*/
 
-#ifndef __DFX_INTERCOM_H
-#define __DFX_INTERCOM_H
+#ifndef _DFX_INTERCOM_H
+#define _DFX_INTERCOM_H
 
 #include "audioeffectx.h"
 
diff --git a/midigater/midigaterdef.h b/midigater/midigaterdef.h
index 898ca801..4fdd90f9 100644
--- a/midigater/midigaterdef.h
+++ b/midigater/midigaterdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"MIDI Gater"
-#define PLUGIN_ID	'Mgat'
+#define PLUGIN_ID		FOURCC('M', 'g', 'a', 't')
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	1
 #define PLUGIN_VERSION_BUGFIX	0
diff --git a/monomaker/monomakerdef.h b/monomaker/monomakerdef.h
index fa707969..0a964d98 100644
--- a/monomaker/monomakerdef.h
+++ b/monomaker/monomakerdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"Monomaker"
-#define PLUGIN_ID	'mono'
+#define PLUGIN_ID		FOURCC('m', 'o', 'n', 'o')
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	1
 #define PLUGIN_VERSION_BUGFIX	0
diff --git a/polarizer/polarizerdef.h b/polarizer/polarizerdef.h
index d1eb4227..4f149f44 100644
--- a/polarizer/polarizerdef.h
+++ b/polarizer/polarizerdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"Polarizer"
-#define PLUGIN_ID	'pola'
+#define PLUGIN_ID	FOURCC('p', 'o', 'l', 'a')
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	1
 #define PLUGIN_VERSION_BUGFIX	0
diff --git a/rezsynth/rezsynthdef.h b/rezsynth/rezsynthdef.h
index 7572e8c4..89101424 100644
--- a/rezsynth/rezsynthdef.h
+++ b/rezsynth/rezsynthdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"Rez Synth"
-#define PLUGIN_ID	'RezS'
+#define PLUGIN_ID		FOURCC('R', 'e', 'z', 'S')
 #define PLUGIN_VERSION_MAJOR	2
 #define PLUGIN_VERSION_MINOR	0
 #define PLUGIN_VERSION_BUGFIX	0
diff --git a/rmsbuddy/rmsbuddy-vst.h b/rmsbuddy/rmsbuddy-vst.h
index 0fe9e8f6..852e316e 100644
--- a/rmsbuddy/rmsbuddy-vst.h
+++ b/rmsbuddy/rmsbuddy-vst.h
@@ -1,7 +1,7 @@
 /*----------------------- by Sophia Poirier  ][  June 2001 ----------------------*/
 
-#ifndef __RMSBUDDY_VST_H
-#define __RMSBUDDY_VST_H
+#ifndef _DFX_RMSBUDDY_VST_H
+#define _DFX_RMSBUDDY_VST_H
 
 #include "audioeffectx.h"
 
diff --git a/rmsbuddy/rmsbuddydef.h b/rmsbuddy/rmsbuddydef.h
index 1fb38893..0b4aec14 100644
--- a/rmsbuddy/rmsbuddydef.h
+++ b/rmsbuddy/rmsbuddydef.h
@@ -1,9 +1,9 @@
-#ifndef __RMSBUDDY_DEF_H
-#define __RMSBUDDY_DEF_H
+#ifndef _RMSBUDDY_DEF_H
+#define _RMSBUDDY_DEF_H
 
 #define RMS_BUDDY_VERSION	0x00010105
-#define RMS_BUDDY_PLUGIN_ID	'rbud'
-#define RMS_BUDDY_MANUFACTURER_ID	'DFX!'
+#define RMS_BUDDY_PLUGIN_ID	FOURCC('r', 'b', 'u', 'd')
+#define RMS_BUDDY_MANUFACTURER_ID	FOURCC('D', 'F', 'X', '!')
 #define RMS_BUDDY_BUNDLE_ID	"org.destroyfx.RMSBuddy"
 
 #endif
diff --git a/rmsbuddy/rmsbuddyeditor-vst.h b/rmsbuddy/rmsbuddyeditor-vst.h
index 127c9854..61c68fb4 100644
--- a/rmsbuddy/rmsbuddyeditor-vst.h
+++ b/rmsbuddy/rmsbuddyeditor-vst.h
@@ -1,7 +1,7 @@
 /*----------------------- by Sophia Poirier  ][  June 2001 ----------------------*/
 
-#ifndef __RMSBUDDYEDITOR_VST_H
-#define __RMSBUDDYEDITOR_VST_H
+#ifndef _DFX_RMSBUDDYEDITOR_VST_H
+#define _DFX_RMSBUDDYEDITOR_VST_H
 
 #include "vstgui.h"
 
@@ -20,7 +20,7 @@ class RMSbuddyEditor : public AEffGUIEditor, public CControlListener
 
 	virtual void valueChanged(CDrawContext* context, CControl* control);
 
-    virtual void idle();
+	virtual void idle();
 
 private:
 	// controls
diff --git a/rmsbuddy/rmsbuddyeditor.h b/rmsbuddy/rmsbuddyeditor.h
index 9b8bc964..3c36de56 100644
--- a/rmsbuddy/rmsbuddyeditor.h
+++ b/rmsbuddy/rmsbuddyeditor.h
@@ -19,8 +19,8 @@ along with RMS Buddy.  If not, see <http://www.gnu.org/licenses/>.
 To contact the author, use the contact form at http://destroyfx.org/
 ------------------------------------------------------------------------*/
 
-#ifndef __RMS_BUDDY_EDITOR_H
-#define __RMS_BUDDY_EDITOR_H
+#ifndef _DFX_RMS_BUDDY_EDITOR_H
+#define _DFX_RMS_BUDDY_EDITOR_H
 
 
 #include "AUCarbonViewBase.h"
diff --git a/scrubby/gui/scrubbykeyboard.h b/scrubby/gui/scrubbykeyboard.h
index a097c94d..8e57c014 100644
--- a/scrubby/gui/scrubbykeyboard.h
+++ b/scrubby/gui/scrubbykeyboard.h
@@ -3,8 +3,8 @@
 //                        by Sophia Poirier, May 2002
 //=============================================================================
 
-#ifndef __scrubbykeyboard
-#define __scrubbykeyboard
+#ifndef _DFX_SCRUBBYKEYBOARD
+#define _DFX_SCRUBBYKEYBOARD
 
 #include "dfxguimulticontrols.h"
 
@@ -50,4 +50,4 @@ class ScrubbyKeyboard : public CMultiControl
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/scrubby/scrubbydef.h b/scrubby/scrubbydef.h
index f4b58c4d..ad068c1e 100644
--- a/scrubby/scrubbydef.h
+++ b/scrubby/scrubbydef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"Scrubby"
-#define PLUGIN_ID	'scub'
+#define PLUGIN_ID		FOURCC('s', 'c', 'u', 'b')
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	1
 #define PLUGIN_VERSION_BUGFIX	0
diff --git a/skidder/skidderdef.h b/skidder/skidderdef.h
index a3703275..270c909c 100644
--- a/skidder/skidderdef.h
+++ b/skidder/skidderdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING	"Skidder"
-#define PLUGIN_ID	'skid'
+#define PLUGIN_ID	FOURCC('s', 'k', 'i', 'd')
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	5
 #define PLUGIN_VERSION_BUGFIX	0
diff --git a/slowft/slowft.cpp b/slowft/slowft.cpp
index d9c54538..abf37733 100644
--- a/slowft/slowft.cpp
+++ b/slowft/slowft.cpp
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #if defined(TARGET_API_VST) && TARGET_PLUGIN_HAS_GUI
-  #ifndef __DFX_SLOWFTEDITOR_H
+  #ifndef _DFX_SLOWFTEDITOR_H
   #include "slowfteditor.hpp"
   #endif
 #endif
diff --git a/slowft/slowft.h b/slowft/slowft.h
index 44b06ad7..417853bc 100644
--- a/slowft/slowft.h
+++ b/slowft/slowft.h
@@ -1,8 +1,8 @@
 
 /* Slowft, starring the Super Destroy FX Windowing System! */
 
-#ifndef __DFX_SLOWFT_H
-#define __DFX_SLOWFT_H
+#ifndef _DFX_SLOWFT_H
+#define _DFX_SLOWFT_H
 
 #include "dfxplugin.h"
 
diff --git a/slowft/slowftdefs.h b/slowft/slowftdefs.h
index 7d24bdb6..e3c1423a 100644
--- a/slowft/slowftdefs.h
+++ b/slowft/slowftdefs.h
@@ -2,10 +2,10 @@
 /* You need to redefine this stuff in order to make your plugin.
    see dfxplugin.h for details. */
 
-#define PLUGIN_NAME_STRING	"WINDOWINGSTUB"
-#define PLUGIN_ID	'DFws'
+#define PLUGIN_NAME_STRING	"SLOWFT"
+#define PLUGIN_ID		FOURCC('D', 'F', 's', 'f')
 #define PLUGIN_VERSION	0x00010100
-#define PLUGIN_ENTRY_POINT	"WindowingstubEntry"
+#define PLUGIN_ENTRY_POINT	"SlowftEntry"
 
 #define TARGET_PLUGIN_USES_MIDI	1
 #define TARGET_PLUGIN_IS_INSTRUMENT	0
@@ -16,7 +16,7 @@
 #endif
 
 /* only necessary if using a custom GUI */
-#define PLUGIN_EDITOR_ENTRY_POINT	"WindowingstubEditorEntry"
+#define PLUGIN_EDITOR_ENTRY_POINT	"SlowftEditorEntry"
 
 // optional
 #define PLUGIN_DESCRIPTION_STRING	"i forgot to change the description"
diff --git a/stub-dfxplugin/dfxplugin-stub-def.h b/stub-dfxplugin/dfxplugin-stub-def.h
index 6c374ef4..14c9a12a 100644
--- a/stub-dfxplugin/dfxplugin-stub-def.h
+++ b/stub-dfxplugin/dfxplugin-stub-def.h
@@ -26,8 +26,8 @@ or somehow define this stuff another way (in compiler settings, or whatever).
 ------------------------------------------------------------------------*/
 
 
-#ifndef __DFXPLUGIN_STUB_DEF_H
-#define __DFXPLUGIN_STUB_DEF_H
+#ifndef _DFXPLUGIN_STUB_DEF_H
+#define _DFXPLUGIN_STUB_DEF_H
 
 
 #include "dfxplugin-prefix.h"
@@ -36,7 +36,7 @@ or somehow define this stuff another way (in compiler settings, or whatever).
 // the name of the plugin
 #define PLUGIN_NAME_STRING	"DfxPlugin stub"
 // a four-byte ID for the plugin
-#define PLUGIN_ID	'stub'
+#define PLUGIN_ID		FOURCC('s', 't', 'u', 'b')
 // the version
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	0
diff --git a/stub-plugin/stub.h b/stub-plugin/stub.h
index 70f58218..e5239faf 100644
--- a/stub-plugin/stub.h
+++ b/stub-plugin/stub.h
@@ -1,5 +1,5 @@
-#ifndef __TOM7_STUB_H
-#define __TOM7_STUB_H
+#ifndef _DFX_STUB_PLUGIN_H
+#define _DFX_STUB_PLUGIN_H
 
 #include <audioeffectx.h>
 
@@ -13,7 +13,7 @@
 #define pi (3.1415926535)
 
 #define PLUGIN Stub
-#define PLUGINID 'STUB'
+#define PLUGINID 0xAABBCCDD
 #define PLUGINNAME "DFX STUBPLUG"
 
 #define NUM_PARAMS 0
diff --git a/trans/trans.h b/trans/trans.h
index d6fbae7c..56db4d52 100644
--- a/trans/trans.h
+++ b/trans/trans.h
@@ -1,9 +1,12 @@
-#ifndef __TOM7_TRANS_H
-#define __TOM7_TRANS_H
+#ifndef _TOM7_TRANS_H
+#define _TOM7_TRANS_H
 
 #include "audioeffectx.h"
 #include "rfftw.h"
 
+// TODO: Port to DfxPlugin
+#include "dfxplugin-prefix.h"
+
 #ifdef WIN32
 /* turn off warnings about default but no cases in switch, etc. */
    #pragma warning( disable : 4065 57 4200 4244 )
@@ -13,7 +16,7 @@
 #define pi (3.1415926535)
 
 #define PLUGIN Trans
-#define PLUGINID 'T7tr'
+#define PLUGIN_ID FOURCC('D', 'F', 't', 'f')
 #define PLUGINNAME "DFX Trans"
 
 #define NUM_PARAMS 2
@@ -43,7 +46,7 @@ struct PLUGIN : public AudioEffectX {
   void setup() {
     setNumInputs(1);		/* mono in/out */
     setNumOutputs(1);
-    setUniqueID(PLUGINID);
+    setUniqueID(PLUGIN_ID);
 
     canProcessReplacing();
     strcpy(programName, PLUGINNAME);
diff --git a/transverb/transverb.h b/transverb/transverb.h
index bce720e3..8e13be70 100644
--- a/transverb/transverb.h
+++ b/transverb/transverb.h
@@ -67,7 +67,7 @@ class TransverbDSP final : public DfxPluginCore {
 
   std::vector<float> buf1;
   std::vector<float> buf2;
-  int MAXBUF = 0;  // the size of the audio buffer (dependant on sampling rate)
+  int MAXBUF = 0;  // the size of the audio buffer (dependent on sampling rate)
 
   dfx::IIRfilter filter1, filter2;
   bool speed1hasChanged = false, speed2hasChanged = false;
diff --git a/transverb/transverbdef.h b/transverb/transverbdef.h
index e600a0f5..88fee18c 100644
--- a/transverb/transverbdef.h
+++ b/transverb/transverbdef.h
@@ -19,15 +19,16 @@ along with Transverb.  If not, see <http://www.gnu.org/licenses/>.
 To contact the author, use the contact form at http://destroyfx.org/
 ------------------------------------------------------------------------*/
 
-#ifndef TOM7_TRANSVERB_DEF_H
-#define TOM7_TRANSVERB_DEF_H
+#ifndef DFX_TRANSVERBDEF_H
+#define DFX_TRANSVERBDEF_H
 
 
 #include "dfxplugin-prefix.h"
 
 
 #define PLUGIN_NAME_STRING	"Transverb"
-#define PLUGIN_ID	'DFtv'
+#define PLUGIN_ID		FOURCC('D', 'F', 't', 'v')
+
 #define PLUGIN_VERSION_MAJOR	1
 #define PLUGIN_VERSION_MINOR	5
 #define PLUGIN_VERSION_BUGFIX	1
@@ -44,8 +45,9 @@ To contact the author, use the contact form at http://destroyfx.org/
 #define PLUGIN_DESCRIPTION_STRING	"like a delay that can play back the delay buffer at different speeds"
 
 
-#define PLUGIN_COPYRIGHT_YEAR_STRING	"2001-2019"
+#define PLUGIN_COPYRIGHT_YEAR_STRING	"2001-2020"
 
+#define VST_NUM_CHANNELS 2
 
 #define USING_HERMITE	1
 #define DFX_SUPPORT_OLD_VST_SETTINGS
diff --git a/transverb/win32/makefile b/transverb/win32/makefile
index 2d52b828..b8ab543d 100755
--- a/transverb/win32/makefile
+++ b/transverb/win32/makefile
@@ -48,6 +48,11 @@ dfx-transverb-64.dll : $(OBJECTS) $(PTHREAD_OBJECTS)
 load.exe : load.o
 	$(CXX) -o $@ $^
 
+# XXX just for Tom's testing
+install : dfx-transverb-64.dll
+	rm -f /d/cakewalk_bandlab/vst/dfx-transverb-64.dll
+	cp dfx-transverb-64.dll /d/cakewalk_bandlab/vst/
+
 # 
 # rc transverb.rc
 # 
diff --git a/vardelay/vardelay.h b/vardelay/vardelay.h
index 7917875f..fb963ff6 100644
--- a/vardelay/vardelay.h
+++ b/vardelay/vardelay.h
@@ -2,8 +2,8 @@
 /* Super Destroy FX Windowing System! */
 
 
-#ifndef __DFX_VARDELAY_H
-#define __DFX_VARDELAY_H
+#ifndef _DFX_VARDELAY_H
+#define _DFX_VARDELAY_H
 
 #include <audioeffectx.h>
 #include <vstgui.h>
@@ -17,9 +17,12 @@
 #define fsign(f) ((f<0.0)?-1.0:1.0)
 #define pi (3.1415926535)
 
+#define FOURCC(a, b, c, d) (((unsigned int)(a) << 24) | ((unsigned int)(b) << 16) | \
+                            ((unsigned int)(c) << 8) | ((unsigned int)(d)))
+
 /* change these for your plugins */
 #define PLUGIN Vardelay
-#define PLUGINID 'DFvd'
+#define PLUGINID FOURCC('D', 'F', 'v', 'd')
 #define PLUGINNAME "DFX VARDELAY"
 #define PLUGINPROGRAM VardelayProgram
 
diff --git a/windowingstub/windowingstub.cpp b/windowingstub/windowingstub.cpp
index 9ed74ca6..21092647 100644
--- a/windowingstub/windowingstub.cpp
+++ b/windowingstub/windowingstub.cpp
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #if defined(TARGET_API_VST) && TARGET_PLUGIN_HAS_GUI
-  #ifndef __DFX_WINDOWINGSTUBEDITOR_H
+  #ifndef _DFX_WINDOWINGSTUBEDITOR_H
   #include "windowingstubeditor.hpp"
   #endif
 #endif
diff --git a/windowingstub/windowingstub.h b/windowingstub/windowingstub.h
index 46d645b1..7f4a6856 100644
--- a/windowingstub/windowingstub.h
+++ b/windowingstub/windowingstub.h
@@ -1,8 +1,8 @@
 
 /* Windowingstub, starring the Super Destroy FX Windowing System! */
 
-#ifndef __DFX_WINDOWINGSTUB_H
-#define __DFX_WINDOWINGSTUB_H
+#ifndef _DFX_WINDOWINGSTUB_H
+#define _DFX_WINDOWINGSTUB_H
 
 #include "dfxplugin.h"
 
diff --git a/windowingstub/windowingstubdefs.h b/windowingstub/windowingstubdefs.h
index 7d24bdb6..65a90db5 100644
--- a/windowingstub/windowingstubdefs.h
+++ b/windowingstub/windowingstubdefs.h
@@ -1,9 +1,10 @@
 
 /* You need to redefine this stuff in order to make your plugin.
+
    see dfxplugin.h for details. */
 
 #define PLUGIN_NAME_STRING	"WINDOWINGSTUB"
-#define PLUGIN_ID	'DFws'
+#define PLUGIN_ID		FOURCC('D', 'F', 'w', 's')
 #define PLUGIN_VERSION	0x00010100
 #define PLUGIN_ENTRY_POINT	"WindowingstubEntry"