diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 97b535e..bd689b2 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -28,14 +28,17 @@ conflicts=(gens)
 source=(
   https://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz
   gens-gtk.patch
+  gens-gs-no-extern-gtk-includes.patch
 )
 sha256sums=('6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1'
-            '29b1e9755b34e00ef7d19bdc527dc4f841400a0022c81ee71c331be4a76a6c1c')
+            '29b1e9755b34e00ef7d19bdc527dc4f841400a0022c81ee71c331be4a76a6c1c'
+            '1337b9d0f18324f37f0fce981f3b110cd136c0762674a7d5c5e4faa3144e8348')
 
 prepare() {
   cd gens-gs-r7
 
   patch -Np1 -i ../gens-gtk.patch
+  patch -Np1 -i ../gens-gs-no-extern-gtk-includes.patch
 }
 
 build() {
@@ -51,6 +54,7 @@ build() {
     --libdir='/usr/lib32' \
     --with-pic \
     --disable-static
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
diff --git a/trunk/gens-gs-no-extern-gtk-includes.patch b/trunk/gens-gs-no-extern-gtk-includes.patch
new file mode 100644
index 0000000..d873945
--- /dev/null
+++ b/trunk/gens-gs-no-extern-gtk-includes.patch
@@ -0,0 +1,250 @@
+diff --git a/src/gens/ui/gtk/about/about_window.hpp b/src/gens/ui/gtk/about/about_window.hpp
+index 67288c2..468d604 100644
+--- a/src/gens/ui/gtk/about/about_window.hpp
++++ b/src/gens/ui/gtk/about/about_window.hpp
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_ABOUT_WINDOW_HPP
+ #define GENS_UI_GTK_ABOUT_WINDOW_HPP
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *about_window;
+ 
+ void about_window_show(void);
+diff --git a/src/gens/ui/gtk/bios_misc_files/bmf_window.hpp b/src/gens/ui/gtk/bios_misc_files/bmf_window.hpp
+index 175e24f..e75d3d2 100644
+--- a/src/gens/ui/gtk/bios_misc_files/bmf_window.hpp
++++ b/src/gens/ui/gtk/bios_misc_files/bmf_window.hpp
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_BIOS_MISC_FILES_WINDOW_HPP
+ #define GENS_UI_GTK_BIOS_MISC_FILES_WINDOW_HPP
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *bmf_window;
+ 
+ void bmf_window_show(void);
+diff --git a/src/gens/ui/gtk/color_adjust/ca_window.h b/src/gens/ui/gtk/color_adjust/ca_window.h
+index 7b46b8a..89a7cc4 100644
+--- a/src/gens/ui/gtk/color_adjust/ca_window.h
++++ b/src/gens/ui/gtk/color_adjust/ca_window.h
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_CA_WINDOW_H
+ #define GENS_UI_GTK_CA_WINDOW_H
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *ca_window;
+ 
+ void ca_window_show(void);
+diff --git a/src/gens/ui/gtk/controller_config/cc_window.h b/src/gens/ui/gtk/controller_config/cc_window.h
+index 9a294f2..b3b5c13 100644
+--- a/src/gens/ui/gtk/controller_config/cc_window.h
++++ b/src/gens/ui/gtk/controller_config/cc_window.h
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_CC_WINDOW_H
+ #define GENS_UI_GTK_CC_WINDOW_H
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ // BOOL macros.
+ #include "libgsft/gsft_bool.h"
+ 
+diff --git a/src/gens/ui/gtk/country_code/ccode_window.h b/src/gens/ui/gtk/country_code/ccode_window.h
+index 1c0d651..be5eb39 100644
+--- a/src/gens/ui/gtk/country_code/ccode_window.h
++++ b/src/gens/ui/gtk/country_code/ccode_window.h
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_COUNTRY_CODE_WINDOW_H
+ #define GENS_UI_GTK_COUNTRY_CODE_WINDOW_H
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *ccode_window;
+ 
+ void ccode_window_show(void);
+diff --git a/src/gens/ui/gtk/directory_config/dir_window.hpp b/src/gens/ui/gtk/directory_config/dir_window.hpp
+index fefe3a3..dc084b6 100644
+--- a/src/gens/ui/gtk/directory_config/dir_window.hpp
++++ b/src/gens/ui/gtk/directory_config/dir_window.hpp
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_DIR_WINDOW_HPP
+ #define GENS_UI_GTK_DIR_WINDOW_HPP
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *dir_window;
+ 
+ void dir_window_show(void);
+diff --git a/src/gens/ui/gtk/general_options/genopt_window.hpp b/src/gens/ui/gtk/general_options/genopt_window.hpp
+index c87dda2..1eb9c3e 100644
+--- a/src/gens/ui/gtk/general_options/genopt_window.hpp
++++ b/src/gens/ui/gtk/general_options/genopt_window.hpp
+@@ -23,13 +23,13 @@
+ #ifndef GENS_GTK_GENERAL_OPTIONS_WINDOW_HPP
+ #define GENS_GTK_GENERAL_OPTIONS_WINDOW_HPP
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *genopt_window;
+ 
+ void genopt_window_show(void);
+diff --git a/src/gens/ui/gtk/gens/gens_window.h b/src/gens/ui/gtk/gens/gens_window.h
+index b48b4be..d1c2d27 100644
+--- a/src/gens/ui/gtk/gens/gens_window.h
++++ b/src/gens/ui/gtk/gens/gens_window.h
+@@ -23,13 +23,13 @@
+ #ifndef GENS_GTK_GENS_WINDOW_H
+ #define GENS_GTK_GENS_WINDOW_H
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *gens_window;
+ extern GtkWidget *gens_window_sdlsock;
+ extern GtkWidget *gens_menu_bar;
+diff --git a/src/gens/ui/gtk/gens/gens_window_callbacks.hpp b/src/gens/ui/gtk/gens/gens_window_callbacks.hpp
+index bd0e5c8..6279564 100644
+--- a/src/gens/ui/gtk/gens/gens_window_callbacks.hpp
++++ b/src/gens/ui/gtk/gens/gens_window_callbacks.hpp
+@@ -23,12 +23,12 @@
+ #ifndef GTK_GENS_WINDOW_CALLBACKS_H
+ #define GTK_GENS_WINDOW_CALLBACKS_H
+ 
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#include <gtk/gtk.h>
+-
+ // Window is closed.
+ gboolean on_gens_window_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
+ 
+diff --git a/src/gens/ui/gtk/opengl_resolution/glres_window.hpp b/src/gens/ui/gtk/opengl_resolution/glres_window.hpp
+index b1b336f..5032539 100644
+--- a/src/gens/ui/gtk/opengl_resolution/glres_window.hpp
++++ b/src/gens/ui/gtk/opengl_resolution/glres_window.hpp
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_GLRES_WINDOW_HPP
+ #define GENS_UI_GTK_GLRES_WINDOW_HPP
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *glres_window;
+ 
+ void glres_window_show(void);
+diff --git a/src/gens/ui/gtk/plugin_manager/pmgr_window.hpp b/src/gens/ui/gtk/plugin_manager/pmgr_window.hpp
+index 3ea2118..a5d38cb 100644
+--- a/src/gens/ui/gtk/plugin_manager/pmgr_window.hpp
++++ b/src/gens/ui/gtk/plugin_manager/pmgr_window.hpp
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_PLUGIN_MANAGER_WINDOW_HPP
+ #define GENS_UI_GTK_PLUGIN_MANAGER_WINDOW_HPP
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *pmgr_window;
+ 
+ void pmgr_window_show(void);
+diff --git a/src/gens/ui/gtk/select_cdrom/selcd_window.hpp b/src/gens/ui/gtk/select_cdrom/selcd_window.hpp
+index e02f13f..24175df 100644
+--- a/src/gens/ui/gtk/select_cdrom/selcd_window.hpp
++++ b/src/gens/ui/gtk/select_cdrom/selcd_window.hpp
+@@ -23,13 +23,13 @@
+ #ifndef GENS_UI_GTK_SELCD_WINDOW_HPP
+ #define GENS_UI_GTK_SELCD_WINDOW_HPP
+ 
++// GTK+ includes.
++#include <gtk/gtk.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-// GTK+ includes.
+-#include <gtk/gtk.h>
+-
+ extern GtkWidget *selcd_window;
+ 
+ void selcd_window_show(void);