diff --git a/include/SDL_config_android.h b/include/SDL_config_android.h
index d057e1764..471edb4ba 100644
--- a/include/SDL_config_android.h
+++ b/include/SDL_config_android.h
@@ -136,8 +136,9 @@
 
 /* Enable various input drivers */
 #define SDL_JOYSTICK_ANDROID    1
-#define SDL_JOYSTICK_HIDAPI    1
-#define SDL_HAPTIC_ANDROID    1
+#define SDL_JOYSTICK_HIDAPI     1
+#define SDL_JOYSTICK_VIRTUAL    1
+#define SDL_HAPTIC_ANDROID  1
 
 /* Enable sensor driver */
 #define SDL_SENSOR_ANDROID  1
diff --git a/include/SDL_config_iphoneos.h b/include/SDL_config_iphoneos.h
index 38929a8b3..f3b74a637 100644
--- a/include/SDL_config_iphoneos.h
+++ b/include/SDL_config_iphoneos.h
@@ -137,8 +137,9 @@
 #define SDL_HAPTIC_DUMMY 1
 
 /* Enable MFi joystick support */
-#define SDL_JOYSTICK_MFI 1
 #define SDL_JOYSTICK_HIDAPI 1
+#define SDL_JOYSTICK_MFI 1
+#define SDL_JOYSTICK_VIRTUAL    1
 
 #ifdef __TVOS__
 #define SDL_SENSOR_DUMMY    1
diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h
index 114134593..42cba74f1 100644
--- a/include/SDL_config_macosx.h
+++ b/include/SDL_config_macosx.h
@@ -139,8 +139,9 @@
 #define SDL_AUDIO_DRIVER_DUMMY  1
 
 /* Enable various input drivers */
+#define SDL_JOYSTICK_HIDAPI 1
 #define SDL_JOYSTICK_IOKIT  1
-#define SDL_JOYSTICK_HIDAPI  1
+#define SDL_JOYSTICK_VIRTUAL    1
 #define SDL_HAPTIC_IOKIT    1
 
 /* Enable the dummy sensor driver */
diff --git a/include/SDL_config_os2.h b/include/SDL_config_os2.h
index f5799dce9..eedf79c13 100644
--- a/include/SDL_config_os2.h
+++ b/include/SDL_config_os2.h
@@ -31,7 +31,6 @@
 #define SDL_POWER_DISABLED  1
 #define SDL_JOYSTICK_DISABLED 1
 #define SDL_HAPTIC_DISABLED 1
-/*#undef SDL_JOYSTICK_HIDAPI */
 
 #define SDL_SENSOR_DUMMY 1
 #define SDL_VIDEO_DRIVER_DUMMY 1
diff --git a/include/SDL_config_pandora.h b/include/SDL_config_pandora.h
index bdc64c97c..6328b9621 100644
--- a/include/SDL_config_pandora.h
+++ b/include/SDL_config_pandora.h
@@ -112,6 +112,7 @@
 #define SDL_INPUT_LINUXEV 1
 #define SDL_INPUT_TSLIB 1
 #define SDL_JOYSTICK_LINUX 1
+#define SDL_JOYSTICK_VIRTUAL 1
 #define SDL_HAPTIC_LINUX 1
 
 #define SDL_SENSOR_DUMMY 1
diff --git a/include/SDL_config_psp.h b/include/SDL_config_psp.h
index 0cbb182e0..235fe08e9 100644
--- a/include/SDL_config_psp.h
+++ b/include/SDL_config_psp.h
@@ -136,6 +136,7 @@
 
 /* Enable the PSP joystick driver (src/joystick/psp/\*.c) */
 #define SDL_JOYSTICK_PSP        1
+#define SDL_JOYSTICK_VIRTUAL    1
 
 /* Enable the dummy sensor driver */
 #define SDL_SENSOR_DUMMY  1
diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h
index c3097bb5c..0f242d9ae 100644
--- a/include/SDL_config_windows.h
+++ b/include/SDL_config_windows.h
@@ -195,9 +195,10 @@ typedef unsigned int uintptr_t;
 
 /* Enable various input drivers */
 #define SDL_JOYSTICK_DINPUT 1
-#define SDL_JOYSTICK_XINPUT 1
 #define SDL_JOYSTICK_HIDAPI 1
-#define SDL_JOYSTICK_RAWINPUT 1
+#define SDL_JOYSTICK_RAWINPUT   1
+#define SDL_JOYSTICK_VIRTUAL    1
+#define SDL_JOYSTICK_XINPUT 1
 #define SDL_HAPTIC_DINPUT   1
 #define SDL_HAPTIC_XINPUT   1
 
diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h
index fa03389e2..dc936d310 100644
--- a/include/SDL_config_winrt.h
+++ b/include/SDL_config_winrt.h
@@ -193,6 +193,7 @@ typedef unsigned int uintptr_t;
 #define SDL_JOYSTICK_DISABLED 1
 #define SDL_HAPTIC_DISABLED 1
 #else
+#define SDL_JOYSTICK_VIRTUAL    1
 #define SDL_JOYSTICK_XINPUT 1
 #define SDL_HAPTIC_XINPUT   1
 #endif
diff --git a/include/SDL_config_wiz.h b/include/SDL_config_wiz.h
index 92b1771e5..80ca13c54 100644
--- a/include/SDL_config_wiz.h
+++ b/include/SDL_config_wiz.h
@@ -128,6 +128,7 @@
 #define SDL_INPUT_LINUXEV 1
 #define SDL_INPUT_TSLIB 1
 #define SDL_JOYSTICK_LINUX 1
+#define SDL_JOYSTICK_VIRTUAL 1
 #define SDL_HAPTIC_LINUX 1
 
 #define SDL_SENSOR_DUMMY  1