diff --git a/src/osdep/config.h b/src/osdep/config.h
index 436eed22..74e7eaa3 100644
--- a/src/osdep/config.h
+++ b/src/osdep/config.h
@@ -61,41 +61,25 @@
  * default: HOME (278)
  */
 #pragma once
-#ifdef USE_SDL1
 #define VK_Green SDLK_HOME
-#elif USE_SDL2
-#define VK_Green SDL_SCANCODE_HOME
-#endif
 
 /*
  * Virtual Key for CD32 Blue button
  * default: END (279)
  */
-#ifdef USE_SDL1
 #define VK_Blue SDLK_PAGEDOWN
-#elif USE_SDL2
-#define VK_Blue SDL_SCANCODE_PAGEDOWN
-#endif
 
 /*
  * Virtual Key for CD32 Red button
  * default: PAGEDOWN (281)
  */
-#ifdef USE_SDL1
 #define VK_Red SDLK_END
-#elif USE_SDL2
-#define VK_Red SDL_SCANCODE_END
-#endif
 
 /*
  * Virtual Key for (Y) button
  * default: PAGEUP (280)
  */
-#ifdef USE_SDL1
 #define VK_Yellow SDLK_PAGEUP
-#elif USE_SDL2
-#define VK_Yellow SDL_SCANCODE_PAGEUP
-#endif
 
 /*
  * Virtual Key for (Left shoulder) button
@@ -104,79 +88,47 @@
 #ifdef ANDROID
 #define VK_L SDLK_F13
 #else
-#ifdef USE_SDL1
 #define VK_LShoulder SDLK_RSHIFT
-#elif USE_SDL2
-#define VK_LShoulder SDL_SCANCODE_RSHIFT
-#endif
 #endif
 
 /*
  * Virtual Key for (Right shoulder) button
  * default: RCTRL (305)
  */
-#ifdef USE_SDL1
 #define VK_RShoulder SDLK_RCTRL
-#elif USE_SDL2
-#define VK_RShoulder SDL_SCANCODE_RCTRL
-#endif
 
 /*
  * Virtual Key for CD32 Start button
  * default: Pause/Break
  */
-#ifdef USE_SDL1
 #define VK_Play SDLK_RETURN
-#elif USE_SDL2
-#define VK_Play SDL_SCANCODE_RETURN
-#endif
 
 /*
  * Virtual Key for (up) button
  * default: UP (273)
  */
-#ifdef USE_SDL1
 #define VK_UP SDLK_UP
-#elif USE_SDL2
-#define VK_UP SDL_SCANCODE_UP
-#endif
 
 /*
  * Virtual Key for (down) button
  * default: DOWN (274)
  */
-#ifdef USE_SDL1
 #define VK_DOWN SDLK_DOWN
-#elif USE_SDL2
-#define VK_DOWN SDL_SCANCODE_DOWN
-#endif
 
 /*
  * Virtual Key for (right) button
  * default: RIGHT (275)
  */
-#ifdef USE_SDL1
 #define VK_RIGHT SDLK_RIGHT
-#elif USE_SDL2
-#define VK_RIGHT SDL_SCANCODE_RIGHT
-#endif
 
 /*
  * Virtual Key for (left) button
  * default: LEFT (276)
  */
-#ifdef USE_SDL1
 #define VK_LEFT SDLK_LEFT
-#elif USE_SDL2
-#define VK_LEFT SDL_SCANCODE_LEFT
-#endif
 
 /*
  * Virtual Key for (ESC) button
  * default: ESC (27)
  */
-#ifdef USE_SDL1
-#define VK_ESCAPE SDLK_ESCAPE
-#elif USE_SDL2
-#define VK_ESCAPE SDL_SCANCODE_ESCAPE
-#endif
\ No newline at end of file
+#define VK_ESCAPE SDLK_ESCAPE
\ No newline at end of file
diff --git a/src/osdep/gui/CreateFilesysHardfile.cpp b/src/osdep/gui/CreateFilesysHardfile.cpp
index cee18159..db5e3a70 100644
--- a/src/osdep/gui/CreateFilesysHardfile.cpp
+++ b/src/osdep/gui/CreateFilesysHardfile.cpp
@@ -227,11 +227,7 @@ static void CreateFilesysHardfileLoop()
 		{
 			if (event.type == SDL_KEYDOWN)
 			{
-#ifdef USE_SDL1
 				switch (event.key.keysym.sym)
-#elif USE_SDL2
-				switch (event.key.keysym.scancode)
-#endif
 				{
 				case VK_ESCAPE:
 					dialogFinished = true;
@@ -259,11 +255,8 @@ static void CreateFilesysHardfileLoop()
 
 				case VK_Blue:
 				case VK_Green:
-#ifdef USE_SDL1
 					event.key.keysym.sym = SDLK_RETURN;
-#elif USE_SDL2
-					event.key.keysym.scancode = SDL_SCANCODE_RETURN;
-#endif
+
 					gui_input->pushInput(event); // Fire key down
 					event.type = SDL_KEYUP; // and the key up
 					break;
diff --git a/src/osdep/gui/SelectFile.cpp b/src/osdep/gui/SelectFile.cpp
index 4a77febb..e893ce35 100644
--- a/src/osdep/gui/SelectFile.cpp
+++ b/src/osdep/gui/SelectFile.cpp
@@ -341,11 +341,7 @@ static void SelectFileLoop()
 		{
 			if (event.type == SDL_KEYDOWN)
 			{
-#ifdef USE_SDL1
 				switch (event.key.keysym.sym)
-#elif USE_SDL2
-				switch (event.key.keysym.scancode)
-#endif
 				{
 				case VK_ESCAPE:
 					dialogFinished = true;
@@ -361,11 +357,7 @@ static void SelectFileLoop()
 
 				case VK_Red:
 				case VK_Green:
-#ifdef USE_SDL1
 					event.key.keysym.sym = SDLK_RETURN;
-#elif USE_SDL2
-					event.key.keysym.scancode = SDL_SCANCODE_RETURN;
-#endif
 					gui_input->pushInput(event); // Fire key down
 					event.type = SDL_KEYUP; // and the key up
 					break;
diff --git a/src/osdep/gui/SelectFolder.cpp b/src/osdep/gui/SelectFolder.cpp
index 8c6064ec..904c8297 100644
--- a/src/osdep/gui/SelectFolder.cpp
+++ b/src/osdep/gui/SelectFolder.cpp
@@ -243,11 +243,7 @@ static void SelectFolderLoop()
 		{
 			if (event.type == SDL_KEYDOWN)
 			{
-#ifdef USE_SDL1
 				switch (event.key.keysym.sym)
-#elif USE_SDL2
-				switch (event.key.keysym.scancode)
-#endif
 				{
 				case VK_ESCAPE:
 					dialogFinished = true;
@@ -263,11 +259,7 @@ static void SelectFolderLoop()
 
 				case VK_Red:
 				case VK_Green:
-#ifdef USE_SDL1
 					event.key.keysym.sym = SDLK_RETURN;
-#elif USE_SDL2
-					event.key.keysym.scancode = SDL_SCANCODE_RETURN;
-#endif
 					gui_input->pushInput(event); // Fire key down
 					event.type = SDL_KEYUP; // and the key up
 					break;
diff --git a/src/osdep/gui/ShowHelp.cpp b/src/osdep/gui/ShowHelp.cpp
index d6483972..36f18f70 100644
--- a/src/osdep/gui/ShowHelp.cpp
+++ b/src/osdep/gui/ShowHelp.cpp
@@ -153,11 +153,7 @@ static void ShowHelpLoop(void)
 		{
 			if (event.type == SDL_KEYDOWN)
 			{
-#ifdef USE_SDL1
 				switch (event.key.keysym.sym)
-#elif USE_SDL2
-				switch (event.key.keysym.scancode)
-#endif
 				{
 				case VK_ESCAPE:
 					dialogFinished = true;
@@ -165,13 +161,8 @@ static void ShowHelpLoop(void)
 
 				case VK_Blue:
 				case VK_Green:
-#ifdef USE_SDL1
 				case SDLK_RETURN:
 					event.key.keysym.sym = SDLK_RETURN;
-#elif USE_SDL2
-				case SDL_SCANCODE_RETURN:
-					event.key.keysym.scancode = SDL_SCANCODE_RETURN;
-#endif
 					gui_input->pushInput(event); // Fire key down
 					event.type = SDL_KEYUP; // and the key up
 					break;
diff --git a/src/osdep/gui/ShowMessage.cpp b/src/osdep/gui/ShowMessage.cpp
index 92f343b6..ac554a61 100644
--- a/src/osdep/gui/ShowMessage.cpp
+++ b/src/osdep/gui/ShowMessage.cpp
@@ -185,11 +185,7 @@ static void ShowMessageLoop()
 		{
 			if (event.type == SDL_KEYDOWN)
 			{
-#ifdef USE_SDL1
 				switch (event.key.keysym.sym)
-#elif USE_SDL2
-				switch (event.key.keysym.scancode)
-#endif
 				{
 				case VK_ESCAPE:
 					dialogFinished = true;
@@ -202,13 +198,8 @@ static void ShowMessageLoop()
 
 				case VK_Blue:
 				case VK_Green:
-#ifdef USE_SDL1
 				case SDLK_RETURN:
 					event.key.keysym.sym = SDLK_RETURN;
-#elif USE_SDL2
-				case SDL_SCANCODE_RETURN:
-					event.key.keysym.scancode = SDL_SCANCODE_RETURN;
-#endif
 					gui_input->pushInput(event); // Fire key down
 					event.type = SDL_KEYUP; // and the key up
 					break;
diff --git a/src/osdep/gui/main_window.cpp b/src/osdep/gui/main_window.cpp
index 3205cb76..e2454dbf 100644
--- a/src/osdep/gui/main_window.cpp
+++ b/src/osdep/gui/main_window.cpp
@@ -495,17 +495,11 @@ namespace sdl
 					}
 				}
 				else
-#ifdef USE_SDL1
 					switch (gui_event.key.keysym.sym)
-#elif USE_SDL2
-					switch (gui_event.key.keysym.scancode)
-#endif
+
 					{
-#ifdef USE_SDL1
 					case SDLK_q:
-#elif USE_SDL2
-					case SDL_SCANCODE_Q:
-#endif
+
 						//-------------------------------------------------
 						// Quit entire program via Q on keyboard
 						//-------------------------------------------------
@@ -530,11 +524,8 @@ namespace sdl
 						//------------------------------------------------
 						// Simulate press of enter when 'X' pressed
 						//------------------------------------------------
-#ifdef USE_SDL1
 						gui_event.key.keysym.sym = SDLK_RETURN;
-#elif USE_SDL2
-						gui_event.key.keysym.scancode = SDL_SCANCODE_RETURN;
-#endif
+
 						gui_input->pushInput(gui_event); // Fire key down
 						gui_event.type = SDL_KEYUP; // and the key up
 						break;
@@ -558,11 +549,8 @@ namespace sdl
 						if (HandleNavigation(DIRECTION_RIGHT))
 							continue; // Don't change value when enter Slider -> don't send event to control
 						break;
-#ifdef USE_SDL1
+					
 					case SDLK_F1:
-#elif USE_SDL2
-					case SDL_SCANCODE_F1:
-#endif
 						ShowHelpRequested();
 						widgets::cmdHelp->requestFocus();
 						break;