diff --git a/src/game/gameport.c b/src/game/gameport.c
index 8ae1c7d25..57476e463 100644
--- a/src/game/gameport.c
+++ b/src/game/gameport.c
@@ -15,7 +15,7 @@
  *
  *          Copyright 2016-2022 Miran Grca.
  *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2021 RichardG.
+ *          Copyright 2021      RichardG.
  *          Copyright 2021-2025 Jasmine Iwanek.
  */
 #include <stdio.h>
diff --git a/src/game/joystick_standard.c b/src/game/joystick_standard.c
index 5f200cb98..38571dc21 100644
--- a/src/game/joystick_standard.c
+++ b/src/game/joystick_standard.c
@@ -8,13 +8,14 @@
  *
  *          Implementation of a standard joystick.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2016-2018 Miran Grca.
  *          Copyright 2008-2018 Sarah Walker.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/include/86box/gameport.h b/src/include/86box/gameport.h
index 7928cdd30..6bbf89312 100644
--- a/src/include/86box/gameport.h
+++ b/src/include/86box/gameport.h
@@ -15,7 +15,7 @@
  *
  *          Copyright 2016-2022 Miran Grca.
  *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2021 RichardG.
+ *          Copyright 2021      RichardG.
  *          Copyright 2021-2025 Jasmine Iwanek.
  */
 #ifndef EMU_GAMEPORT_H
@@ -52,6 +52,26 @@
 #define GAMEPORT_8ADDR      0x080000
 #define GAMEPORT_SIO        0x1000000
 
+typedef struct joystick_if_t {
+    const char *name;
+    const char *internal_name;
+
+    void   *(*init)(void);
+    void    (*close)(void *priv);
+    uint8_t (*read)(void *priv);
+    void    (*write)(void *priv);
+    int     (*read_axis)(void *priv, int axis);
+    void    (*a0_over)(void *priv);
+
+    int         axis_count;
+    int         button_count;
+    int         pov_count;
+    int         max_joysticks;
+    const char *axis_names[MAX_JOY_AXES];
+    const char *button_names[MAX_JOY_BUTTONS];
+    const char *pov_names[MAX_JOY_POVS];
+} joystick_if_t;
+
 typedef struct plat_joystick_t {
     char name[260];
 
@@ -90,26 +110,6 @@ typedef struct joystick_t {
     int pov_mapping[MAX_JOY_POVS][2];
 } joystick_t;
 
-typedef struct joystick_if_t {
-    const char *name;
-    const char *internal_name;
-
-    void   *(*init)(void);
-    void    (*close)(void *priv);
-    uint8_t (*read)(void *priv);
-    void    (*write)(void *priv);
-    int     (*read_axis)(void *priv, int axis);
-    void    (*a0_over)(void *priv);
-
-    int         axis_count;
-    int         button_count;
-    int         pov_count;
-    int         max_joysticks;
-    const char *axis_names[MAX_JOY_AXES];
-    const char *button_names[MAX_JOY_BUTTONS];
-    const char *pov_names[MAX_JOY_POVS];
-} joystick_if_t;
-
 extern device_t game_ports[GAMEPORT_MAX];
 
 #ifdef __cplusplus
@@ -186,14 +186,6 @@ extern const joystick_if_t joystick_sw_pad;
 extern const joystick_if_t joystick_tm_fcs;
 extern const joystick_if_t joystick_tm_fcs_rcs;
 
-extern int             gameport_available(int);
-extern int             gameport_has_config(int);
-extern const char     *gameport_get_internal_name(int);
-extern int             gampeport_get_from_internal_name(char *);
-#ifdef EMU_DEVICE_H
-extern const device_t *gameport_getdevice(int);
-#endif
-
 #ifdef __cplusplus
 }
 #endif