diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index c9e2e6a0..54bd5b77 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -1,3 +1,5 @@
+
+
 set(GETTEXT_PACKAGE "dino")
 find_package(Gettext)
 include(${GETTEXT_USE_FILE})
@@ -219,6 +221,7 @@ endif ()
 
 add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\" -DDINO_VERSION=\"${PROJECT_VERSION}\" -DDINO_NUMERIC_VERSION=${DINO_NUMERIC_VERSION})
 if(WIN32)
+    add_link_options("-Wl,--export-all-symbols")
     set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> --use-temp-file -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
     add_executable(dino ${MAIN_VALA_C} ${MAIN_GRESOURCES_TARGET} src/emojichooser.c dino-info.rc)
 else(WIN32)
diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala
index d1f130fd..df24038a 100644
--- a/main/src/ui/main_window.vala
+++ b/main/src/ui/main_window.vala
@@ -54,17 +54,6 @@ public class MainWindow : Gtk.Window {
     }
 
     private void setup_unified() {
-#if _WIN32 // WIN32 seems to not support exporting these symbols
-        {
-            new Dino.Ui.ConversationSelector();
-            new Dino.Ui.ConversationSummary.ConversationView();
-            new Dino.Ui.ChatInput.View();
-            new Dino.Ui.GlobalSearch();
-            new Dino.Ui.ConversationView();
-            new Dino.Ui.SizeRequestBox();
-            new Dino.Ui.SizingBin();
-        }
-#endif
         Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui");
         paned = (Paned) builder.get_object("paned");
         box.add(paned);