diff --git a/gfx/common/d3d_common.h b/gfx/common/d3d_common.h
index 14a724a3e7..a33e759914 100644
--- a/gfx/common/d3d_common.h
+++ b/gfx/common/d3d_common.h
@@ -97,7 +97,8 @@ void *d3d_matrix_rotation_z(void *_pout, float angle);
 
 int32_t d3d_translate_filter(unsigned type);
 
-void d3d_input_driver(const char* input_name, const char* joypad_name, const input_driver_t** input, void** input_data);
+void d3d_input_driver(const char* input_name,
+   const char* joypad_name, const input_driver_t** input, void** input_data);
 
 RETRO_END_DECLS
 
diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c
index 69a38a61a8..abee78c5dd 100644
--- a/gfx/drivers/d3d10.c
+++ b/gfx/drivers/d3d10.c
@@ -627,7 +627,7 @@ d3d10_gfx_init(const video_info_t* video,
       desc.BufferDesc.RefreshRate.Numerator   = 60;
       desc.BufferDesc.RefreshRate.Denominator = 1;
       desc.BufferUsage           = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-#if HAVE_WINDOW
+#ifdef HAVE_WINDOW
       desc.OutputWindow          = main_window.hwnd;
 #endif
       desc.SampleDesc.Count      = 1;
diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c
index 8e0293be3e..e5aab6026c 100644
--- a/gfx/drivers/d3d11.c
+++ b/gfx/drivers/d3d11.c
@@ -656,7 +656,7 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
       desc.BufferDesc.RefreshRate.Denominator = 1;
 #endif
       desc.BufferUsage                        = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-#if HAVE_WINDOW
+#ifdef HAVE_WINDOW
       desc.OutputWindow                       = main_window.hwnd;
 #endif
       desc.SampleDesc.Count                   = 1;
@@ -664,7 +664,7 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
 #if 0
       desc.Scaling                            = DXGI_SCALING_STRETCH;
 #endif
-#if HAVE_WINDOW
+#ifdef HAVE_WINDOW
       desc.Windowed                           = TRUE;
 #endif
 #if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
index 00917d4bbe..63d4ac0e39 100644
--- a/gfx/drivers/d3d9.c
+++ b/gfx/drivers/d3d9.c
@@ -1297,7 +1297,8 @@ static bool d3d9_init_internal(d3d9_video_t *d3d,
    if (!d3d9_initialize(d3d, &d3d->video_info))
       return false;
 
-   d3d_input_driver(settings->arrays.input_joypad_driver, input, input_data);
+   d3d_input_driver(settings->arrays.input_joypad_driver,
+      settings->arrays.input_joypad_driver, input, input_data);
 
    RARCH_LOG("[D3D9]: Init complete.\n");
    return true;