89 files changed, 52 insertions, 63 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6040bf4..d0c39dda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ include(opentrack-install)
 set(C CMakeLists.txt)
 file(GLOB opentrack-subprojects
     "tracker-pt/${C}"
-    "protocol-*/${C}"
+    "proto-*/${C}"
     "filter-accela/${C}"
     "opentrack*/${C}"
     "gui/${C}"
diff --git a/cmake/opentrack-macros.cmake b/cmake/opentrack-macros.cmake
index a9fa5bc7..df19ddf0 100644
--- a/cmake/opentrack-macros.cmake
+++ b/cmake/opentrack-macros.cmake
@@ -32,7 +32,7 @@ endfunction()
 
 macro(opentrack_library n dir)
     cmake_parse_arguments(opentrack-foolib
-        "NO-LIBRARY;STATIC;NO-COMPAT"
+        "NO-LIBRARY;STATIC;NO-COMPAT;NO-LINKER-SCRIPT"
         "LINK;COMPILE;GNU-LINK;GNU-COMPILE"
         ""
         ${ARGN}
@@ -52,7 +52,7 @@ macro(opentrack_library n dir)
         if(NOT opentrack-foolib_NO-COMPAT)
             target_link_libraries(${n} opentrack-api ${MY_QT_LIBS} opentrack-compat)
         endif()
-        if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
+        if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE AND NOT NO-LINKER-SCRIPT)
             SET_TARGET_PROPERTIES(${n} PROPERTIES
                 LINK_FLAGS "${opentrack-foolib_LINK} ${opentrack-foolib_GNU-LINK} -Wl,--as-needed -Wl,--version-script=\"${CMAKE_SOURCE_DIR}/opentrack-compat/${version-script}-version-script.txt\""
                 COMPILE_FLAGS "${opentrack-foolib_COMPILE} ${opentrack-foolib_GNU-COMPILE} -fvisibility=hidden -fvisibility-inlines-hidden"
diff --git a/filter-kalman/CMakeLists.txt b/filter-kalman/CMakeLists.txt
index 666a35db..e2796c11 100644
--- a/filter-kalman/CMakeLists.txt
+++ b/filter-kalman/CMakeLists.txt
@@ -1,4 +1,6 @@
-find_package(OpenCV 3.0)
-opentrack_boilerplate(opentrack-filter-kalman)
-target_link_libraries(opentrack-filter-kalman ${OpenCV_LIBS})
-target_include_directories(opentrack-filter-kalman SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
+find_package(OpenCV 3.0 QUIET)
+if(OpenCV_FOUND)
+    opentrack_boilerplate(opentrack-filter-kalman)
+    target_link_libraries(opentrack-filter-kalman ${OpenCV_LIBS})
+    target_include_directories(opentrack-filter-kalman SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
+endif()
diff --git a/filter-kalman/ftnoir_kalman_filtercontrols.ui b/filter-kalman/ftnoir_kalman_filtercontrols.ui
index 69297102..df213815 100644
--- a/filter-kalman/ftnoir_kalman_filtercontrols.ui
+++ b/filter-kalman/ftnoir_kalman_filtercontrols.ui
@@ -23,7 +23,7 @@
    <string>Kalman settings</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../facetracknoir/ui-res.qrc">
+   <iconset resource="../gui/ui-res.qrc">
     <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>
   </property>
   <property name="layoutDirection">
@@ -88,7 +88,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../facetracknoir/ui-res.qrc"/>
+  <include location="../gui/ui-res.qrc"/>
  </resources>
  <connections/>
  <designerdata>
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 0b20bc9c..d9d718ed 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -1,25 +1,5 @@
 opentrack_boilerplate(opentrack NO-LIBRARY)
 
-if(UNIX OR APPLE)
-    target_include_directories(opentrack "${CMAKE_SOURCE_DIR}/qxt-mini")
-    if(APPLE)
-        set(qxt-plat mac)
-    else()
-        set(qxt-plat x11)
-    endif()
-    file(GLOB qxt-mini-c
-        ${CMAKE_SOURCE_DIR}/qxt-mini/*.h
-        ${CMAKE_SOURCE_DIR}/qxt-mini/qxtglobalshortcut.cpp
-        ${CMAKE_SOURCE_DIR}/qxt-mini/plat/qxtglobalshortcut_${qxt-plat}.cpp
-    )
-    opentrack_qt(qxt-mini)
-    add_library(opentrack-qxt-mini STATIC ${qxt-mini-all})
-    target_link_libraries(opentrack-qxt-mini ${MY_QT_LIBS})
-    if(NOT APPLE)
-            target_link_libraries(opentrack-qxt-mini X11)
-    endif()
-endif()
-
 if(WIN32)
     SET(SDK_CONSOLE_DEBUG FALSE CACHE BOOL "Console window visible at runtime")
 endif()
@@ -30,12 +10,19 @@ else()
     set(opentrack-win32-executable "")
 endif()
 
-if(UNIX OR APPLE)
-    list(APPEND opentrack-c ${CMAKE_SOURCE_DIR}/qxt-mini/qxtglobalshortcut.h)
-endif()
 opentrack_qt(opentrack)
 add_executable(opentrack ${opentrack-win32-executable} ${opentrack-all})
 opentrack_compat(opentrack)
+
+
+if(UNIX OR APPLE)
+    target_include_directories(opentrack PRIVATE "${CMAKE_SOURCE_DIR}/qxt-mini")
+    opentrack_library(opentrack-qxt-mini ${CMAKE_SOURCE_DIR}/qxt-mini NO-LINKER-SCRIPT STATIC)
+    if(NOT APPLE)
+            target_link_libraries(opentrack-qxt-mini X11)
+    endif()
+endif()
+
 if(NOT WIN32)
     set_target_properties(opentrack PROPERTIES SUFFIX ".bin")
 endif()
diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh
index 68037b67..b8234443 100644
--- a/macosx/make-app-bundle.sh
+++ b/macosx/make-app-bundle.sh
@@ -24,11 +24,11 @@ mkdir "$tmp/$APPNAME.iconset" || exit 1
 mkdir "$tmp/$APPNAME.app/Contents/Resources" || exit 1
 cp "$dir"/opentrack.sh "$tmp/$APPNAME.app/Contents/MacOS" || exit 1
 
-sips -z 16 16     "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1
-sips -z 32 32     "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1
-sips -z 32 32     "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" || exit 1
-sips -z 64 64     "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" || exit 1
-sips -z 128 128   "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" || exit 1
+sips -z 16 16     "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1
+sips -z 32 32     "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1
+sips -z 32 32     "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" || exit 1
+sips -z 64 64     "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" || exit 1
+sips -z 128 128   "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" || exit 1
 
 iconutil -c icns -o "$tmp/$APPNAME.app/Contents/Resources/$APPNAME.icns" "$tmp/$APPNAME.iconset"
 rm -r "$tmp/$APPNAME.iconset"
diff --git a/protocol-fg/CMakeLists.txt b/proto-fg/CMakeLists.txt
index 151b30ee..151b30ee 100644
--- a/protocol-fg/CMakeLists.txt
+++ b/proto-fg/CMakeLists.txt
diff --git a/protocol-fg/fg-protocol.qrc b/proto-fg/fg-protocol.qrc
index 1c685437..1c685437 100644
--- a/protocol-fg/fg-protocol.qrc
+++ b/proto-fg/fg-protocol.qrc
diff --git a/protocol-fg/fgtypes.h b/proto-fg/fgtypes.h
index 2e493f46..2e493f46 100644
--- a/protocol-fg/fgtypes.h
+++ b/proto-fg/fgtypes.h
diff --git a/protocol-fg/ftnoir_fgcontrols.ui b/proto-fg/ftnoir_fgcontrols.ui
index 575549d6..bd5b95c7 100644
--- a/protocol-fg/ftnoir_fgcontrols.ui
+++ b/proto-fg/ftnoir_fgcontrols.ui
@@ -16,10 +16,6 @@
   <property name="windowTitle">
    <string>FlightGear protocol settings</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../ftnoir_filter_ewma2/ewma-filter.qrc">
-    <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>
-  </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
   </property>
@@ -131,9 +127,6 @@
   <tabstop>spinIPFourthNibble</tabstop>
   <tabstop>spinPortNumber</tabstop>
  </tabstops>
- <resources>
-  <include location="../ftnoir_filter_ewma2/ewma-filter.qrc"/>
- </resources>
  <connections/>
  <slots>
   <slot>startEngineClicked()</slot>
diff --git a/protocol-fg/ftnoir_protocol_fg.cpp b/proto-fg/ftnoir_protocol_fg.cpp
index 660a7352..660a7352 100644
--- a/protocol-fg/ftnoir_protocol_fg.cpp
+++ b/proto-fg/ftnoir_protocol_fg.cpp
diff --git a/protocol-fg/ftnoir_protocol_fg.h b/proto-fg/ftnoir_protocol_fg.h
index de528270..de528270 100644
--- a/protocol-fg/ftnoir_protocol_fg.h
+++ b/proto-fg/ftnoir_protocol_fg.h
diff --git a/protocol-fg/ftnoir_protocol_fg_dialog.cpp b/proto-fg/ftnoir_protocol_fg_dialog.cpp
index 1d583115..1d583115 100644
--- a/protocol-fg/ftnoir_protocol_fg_dialog.cpp
+++ b/proto-fg/ftnoir_protocol_fg_dialog.cpp
diff --git a/protocol-fg/images/flightgear.png b/proto-fg/images/flightgear.png
index 2a546642..2a546642 100644
--- a/protocol-fg/images/flightgear.png
+++ b/proto-fg/images/flightgear.png
diff --git a/protocol-fsuipc/CMakeLists.txt b/proto-fsuipc/CMakeLists.txt
index ec897ae8..ec897ae8 100644
--- a/protocol-fsuipc/CMakeLists.txt
+++ b/proto-fsuipc/CMakeLists.txt
diff --git a/protocol-fsuipc/fsuipc-protocol.qrc b/proto-fsuipc/fsuipc-protocol.qrc
index 34756f84..34756f84 100644
--- a/protocol-fsuipc/fsuipc-protocol.qrc
+++ b/proto-fsuipc/fsuipc-protocol.qrc
diff --git a/protocol-fsuipc/ftnoir_fsuipccontrols.ui b/proto-fsuipc/ftnoir_fsuipccontrols.ui
index 637e4dba..637e4dba 100644
--- a/protocol-fsuipc/ftnoir_fsuipccontrols.ui
+++ b/proto-fsuipc/ftnoir_fsuipccontrols.ui
diff --git a/protocol-fsuipc/ftnoir_protocol_fsuipc.cpp b/proto-fsuipc/ftnoir_protocol_fsuipc.cpp
index 702a92d4..702a92d4 100644
--- a/protocol-fsuipc/ftnoir_protocol_fsuipc.cpp
+++ b/proto-fsuipc/ftnoir_protocol_fsuipc.cpp
diff --git a/protocol-fsuipc/ftnoir_protocol_fsuipc.h b/proto-fsuipc/ftnoir_protocol_fsuipc.h
index c8e91a42..c8e91a42 100644
--- a/protocol-fsuipc/ftnoir_protocol_fsuipc.h
+++ b/proto-fsuipc/ftnoir_protocol_fsuipc.h
diff --git a/protocol-fsuipc/ftnoir_protocol_fsuipc_dialog.cpp b/proto-fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
index d573420a..d573420a 100644
--- a/protocol-fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
+++ b/proto-fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
diff --git a/protocol-fsuipc/images/fs9.png b/proto-fsuipc/images/fs9.png
index 914c9dcb..914c9dcb 100644
--- a/protocol-fsuipc/images/fs9.png
+++ b/proto-fsuipc/images/fs9.png
diff --git a/protocol-fsuipc/images/fs91.png b/proto-fsuipc/images/fs91.png
index f9540d1d..f9540d1d 100644
--- a/protocol-fsuipc/images/fs91.png
+++ b/proto-fsuipc/images/fs91.png
diff --git a/protocol-ft/CMakeLists.txt b/proto-ft/CMakeLists.txt
index 44f95ba3..44f95ba3 100644
--- a/protocol-ft/CMakeLists.txt
+++ b/proto-ft/CMakeLists.txt
diff --git a/protocol-ft/ft-protocol.qrc b/proto-ft/ft-protocol.qrc
index c04959f0..c04959f0 100644
--- a/protocol-ft/ft-protocol.qrc
+++ b/proto-ft/ft-protocol.qrc
diff --git a/protocol-ft/ftnoir_ftcontrols.ui b/proto-ft/ftnoir_ftcontrols.ui
index 5356d2e5..5356d2e5 100644
--- a/protocol-ft/ftnoir_ftcontrols.ui
+++ b/proto-ft/ftnoir_ftcontrols.ui
diff --git a/protocol-ft/ftnoir_protocol_ft.cpp b/proto-ft/ftnoir_protocol_ft.cpp
index 05253174..05253174 100644
--- a/protocol-ft/ftnoir_protocol_ft.cpp
+++ b/proto-ft/ftnoir_protocol_ft.cpp
diff --git a/protocol-ft/ftnoir_protocol_ft.h b/proto-ft/ftnoir_protocol_ft.h
index 8e50f1cb..8e50f1cb 100644
--- a/protocol-ft/ftnoir_protocol_ft.h
+++ b/proto-ft/ftnoir_protocol_ft.h
diff --git a/protocol-ft/ftnoir_protocol_ft_dialog.cpp b/proto-ft/ftnoir_protocol_ft_dialog.cpp
index 25f3a4cb..25f3a4cb 100644
--- a/protocol-ft/ftnoir_protocol_ft_dialog.cpp
+++ b/proto-ft/ftnoir_protocol_ft_dialog.cpp
diff --git a/protocol-ft/images/freetrack.png b/proto-ft/images/freetrack.png
index c184dc88..c184dc88 100644
--- a/protocol-ft/images/freetrack.png
+++ b/proto-ft/images/freetrack.png
diff --git a/protocol-ftn/CMakeLists.txt b/proto-ftn/CMakeLists.txt
index a0b74d9c..a0b74d9c 100644
--- a/protocol-ftn/CMakeLists.txt
+++ b/proto-ftn/CMakeLists.txt
diff --git a/protocol-ftn/ftnoir_ftncontrols.ui b/proto-ftn/ftnoir_ftncontrols.ui
index ca811e99..28f8ccdf 100644
--- a/protocol-ftn/ftnoir_ftncontrols.ui
+++ b/proto-ftn/ftnoir_ftncontrols.ui
@@ -17,7 +17,7 @@
    <string>UDP protocol settings</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../facetracknoir/main-facetracknoir.qrc">
+   <iconset resource="../gui/main-facetracknoir.qrc">
     <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>
   </property>
   <property name="layoutDirection">
@@ -255,7 +255,7 @@
   <tabstop>btnCancel</tabstop>
  </tabstops>
  <resources>
-  <include location="../facetracknoir/main-facetracknoir.qrc"/>
+  <include location="../gui/main-facetracknoir.qrc"/>
  </resources>
  <connections/>
  <slots>
diff --git a/protocol-ftn/ftnoir_protocol_ftn.cpp b/proto-ftn/ftnoir_protocol_ftn.cpp
index db852f55..db852f55 100644
--- a/protocol-ftn/ftnoir_protocol_ftn.cpp
+++ b/proto-ftn/ftnoir_protocol_ftn.cpp
diff --git a/protocol-ftn/ftnoir_protocol_ftn.h b/proto-ftn/ftnoir_protocol_ftn.h
index 7fe6c225..7fe6c225 100644
--- a/protocol-ftn/ftnoir_protocol_ftn.h
+++ b/proto-ftn/ftnoir_protocol_ftn.h
diff --git a/protocol-ftn/ftnoir_protocol_ftn_dialog.cpp b/proto-ftn/ftnoir_protocol_ftn_dialog.cpp
index 77a1508a..77a1508a 100644
--- a/protocol-ftn/ftnoir_protocol_ftn_dialog.cpp
+++ b/proto-ftn/ftnoir_protocol_ftn_dialog.cpp
diff --git a/protocol-libevdev/CMakeLists.txt b/proto-libevdev/CMakeLists.txt
index 960a1271..960a1271 100644
--- a/protocol-libevdev/CMakeLists.txt
+++ b/proto-libevdev/CMakeLists.txt
diff --git a/protocol-libevdev/ftnoir_libevdev_controls.ui b/proto-libevdev/ftnoir_libevdev_controls.ui
index d2b86445..d2b86445 100644
--- a/protocol-libevdev/ftnoir_libevdev_controls.ui
+++ b/proto-libevdev/ftnoir_libevdev_controls.ui
diff --git a/protocol-libevdev/ftnoir_protocol_libevdev.cpp b/proto-libevdev/ftnoir_protocol_libevdev.cpp
index 96805b39..96805b39 100644
--- a/protocol-libevdev/ftnoir_protocol_libevdev.cpp
+++ b/proto-libevdev/ftnoir_protocol_libevdev.cpp
diff --git a/protocol-libevdev/ftnoir_protocol_libevdev.h b/proto-libevdev/ftnoir_protocol_libevdev.h
index ecb3b201..ecb3b201 100644
--- a/protocol-libevdev/ftnoir_protocol_libevdev.h
+++ b/proto-libevdev/ftnoir_protocol_libevdev.h
diff --git a/protocol-libevdev/ftnoir_protocol_libevdev_dialog.cpp b/proto-libevdev/ftnoir_protocol_libevdev_dialog.cpp
index 70495a8f..70495a8f 100644
--- a/protocol-libevdev/ftnoir_protocol_libevdev_dialog.cpp
+++ b/proto-libevdev/ftnoir_protocol_libevdev_dialog.cpp
diff --git a/protocol-libevdev/images/linux.png b/proto-libevdev/images/linux.png
index 8836c0e2..8836c0e2 100644
--- a/protocol-libevdev/images/linux.png
+++ b/proto-libevdev/images/linux.png
diff --git a/protocol-libevdev/libevdev-protocol.qrc b/proto-libevdev/libevdev-protocol.qrc
index 70bb415f..70bb415f 100644
--- a/protocol-libevdev/libevdev-protocol.qrc
+++ b/proto-libevdev/libevdev-protocol.qrc
diff --git a/protocol-mouse/CMakeLists.txt b/proto-mouse/CMakeLists.txt
index b221c79c..b221c79c 100644
--- a/protocol-mouse/CMakeLists.txt
+++ b/proto-mouse/CMakeLists.txt
diff --git a/protocol-mouse/ftnoir_mousecontrols.ui b/proto-mouse/ftnoir_mousecontrols.ui
index b1f4bcf8..b1f4bcf8 100644
--- a/protocol-mouse/ftnoir_mousecontrols.ui
+++ b/proto-mouse/ftnoir_mousecontrols.ui
diff --git a/protocol-mouse/ftnoir_protocol_mouse.cpp b/proto-mouse/ftnoir_protocol_mouse.cpp
index c0a0a868..c0a0a868 100644
--- a/protocol-mouse/ftnoir_protocol_mouse.cpp
+++ b/proto-mouse/ftnoir_protocol_mouse.cpp
diff --git a/protocol-mouse/ftnoir_protocol_mouse.h b/proto-mouse/ftnoir_protocol_mouse.h
index 595be393..595be393 100644
--- a/protocol-mouse/ftnoir_protocol_mouse.h
+++ b/proto-mouse/ftnoir_protocol_mouse.h
diff --git a/protocol-mouse/ftnoir_protocol_mouse_dialog.cpp b/proto-mouse/ftnoir_protocol_mouse_dialog.cpp
index bb5fe3b8..bb5fe3b8 100644
--- a/protocol-mouse/ftnoir_protocol_mouse_dialog.cpp
+++ b/proto-mouse/ftnoir_protocol_mouse_dialog.cpp
diff --git a/protocol-mouse/images/mouse.png b/proto-mouse/images/mouse.png
index c6f9ea26..c6f9ea26 100644
--- a/protocol-mouse/images/mouse.png
+++ b/proto-mouse/images/mouse.png
diff --git a/protocol-mouse/win32-mouse-protocol.qrc b/proto-mouse/win32-mouse-protocol.qrc
index ed6a71be..ed6a71be 100644
--- a/protocol-mouse/win32-mouse-protocol.qrc
+++ b/proto-mouse/win32-mouse-protocol.qrc
diff --git a/protocol-sc/CMakeLists.txt b/proto-sc/CMakeLists.txt
index bd83e944..bd83e944 100644
--- a/protocol-sc/CMakeLists.txt
+++ b/proto-sc/CMakeLists.txt
diff --git a/protocol-sc/ftnoir-protocol-sc.rc b/proto-sc/ftnoir-protocol-sc.rc
index c89eb9a7..c89eb9a7 100644
--- a/protocol-sc/ftnoir-protocol-sc.rc
+++ b/proto-sc/ftnoir-protocol-sc.rc
diff --git a/protocol-sc/ftnoir_protocol_sc.cpp b/proto-sc/ftnoir_protocol_sc.cpp
index 0c6cb486..0c6cb486 100644
--- a/protocol-sc/ftnoir_protocol_sc.cpp
+++ b/proto-sc/ftnoir_protocol_sc.cpp
diff --git a/protocol-sc/ftnoir_protocol_sc.h b/proto-sc/ftnoir_protocol_sc.h
index 671a3500..671a3500 100644
--- a/protocol-sc/ftnoir_protocol_sc.h
+++ b/proto-sc/ftnoir_protocol_sc.h
diff --git a/protocol-sc/ftnoir_protocol_sc_dialog.cpp b/proto-sc/ftnoir_protocol_sc_dialog.cpp
index 7c2ecfd4..7c2ecfd4 100644
--- a/protocol-sc/ftnoir_protocol_sc_dialog.cpp
+++ b/proto-sc/ftnoir_protocol_sc_dialog.cpp
diff --git a/protocol-sc/ftnoir_sccontrols.ui b/proto-sc/ftnoir_sccontrols.ui
index 5b2fd291..5b2fd291 100644
--- a/protocol-sc/ftnoir_sccontrols.ui
+++ b/proto-sc/ftnoir_sccontrols.ui
diff --git a/protocol-sc/images/fsx.png b/proto-sc/images/fsx.png
index 16b072a1..16b072a1 100644
--- a/protocol-sc/images/fsx.png
+++ b/proto-sc/images/fsx.png
diff --git a/protocol-sc/images/fsx1.png b/proto-sc/images/fsx1.png
index a1f0f188..a1f0f188 100644
--- a/protocol-sc/images/fsx1.png
+++ b/proto-sc/images/fsx1.png
diff --git a/protocol-sc/sc-protocol.qrc b/proto-sc/sc-protocol.qrc
index 127d5180..127d5180 100644
--- a/protocol-sc/sc-protocol.qrc
+++ b/proto-sc/sc-protocol.qrc
diff --git a/protocol-sc/scserver.manifest b/proto-sc/scserver.manifest
index d342cfda..d342cfda 100644
--- a/protocol-sc/scserver.manifest
+++ b/proto-sc/scserver.manifest
diff --git a/protocol-sc/scserver_acceleration.manifest b/proto-sc/scserver_acceleration.manifest
index 06459587..06459587 100644
--- a/protocol-sc/scserver_acceleration.manifest
+++ b/proto-sc/scserver_acceleration.manifest
diff --git a/protocol-sc/scserver_sp2.manifest b/proto-sc/scserver_sp2.manifest
index 3020d16c..3020d16c 100644
--- a/protocol-sc/scserver_sp2.manifest
+++ b/proto-sc/scserver_sp2.manifest
diff --git a/protocol-vjoy/CMakeLists.txt b/proto-vjoy/CMakeLists.txt
index 22678c32..22678c32 100644
--- a/protocol-vjoy/CMakeLists.txt
+++ b/proto-vjoy/CMakeLists.txt
diff --git a/protocol-vjoy/ftnoir_protocol_vjoy.cpp b/proto-vjoy/ftnoir_protocol_vjoy.cpp
index 24148c63..24148c63 100644
--- a/protocol-vjoy/ftnoir_protocol_vjoy.cpp
+++ b/proto-vjoy/ftnoir_protocol_vjoy.cpp
diff --git a/protocol-vjoy/ftnoir_protocol_vjoy.h b/proto-vjoy/ftnoir_protocol_vjoy.h
index 118306b5..118306b5 100644
--- a/protocol-vjoy/ftnoir_protocol_vjoy.h
+++ b/proto-vjoy/ftnoir_protocol_vjoy.h
diff --git a/protocol-vjoy/ftnoir_protocol_vjoy_dialog.cpp b/proto-vjoy/ftnoir_protocol_vjoy_dialog.cpp
index 08c65558..08c65558 100644
--- a/protocol-vjoy/ftnoir_protocol_vjoy_dialog.cpp
+++ b/proto-vjoy/ftnoir_protocol_vjoy_dialog.cpp
diff --git a/protocol-vjoy/ftnoir_vjoy_controls.ui b/proto-vjoy/ftnoir_vjoy_controls.ui
index 2214b887..2214b887 100644
--- a/protocol-vjoy/ftnoir_vjoy_controls.ui
+++ b/proto-vjoy/ftnoir_vjoy_controls.ui
diff --git a/protocol-vjoy/images/vjoy.png b/proto-vjoy/images/vjoy.png
index 8eb14be8..8eb14be8 100644
--- a/protocol-vjoy/images/vjoy.png
+++ b/proto-vjoy/images/vjoy.png
diff --git a/protocol-vjoy/vjoy-protocol.qrc b/proto-vjoy/vjoy-protocol.qrc
index 7b3741f1..7b3741f1 100644
--- a/protocol-vjoy/vjoy-protocol.qrc
+++ b/proto-vjoy/vjoy-protocol.qrc
diff --git a/protocol-vjoy/vjoy.def b/proto-vjoy/vjoy.def
index aea590a4..aea590a4 100644
--- a/protocol-vjoy/vjoy.def
+++ b/proto-vjoy/vjoy.def
diff --git a/protocol-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt
index 682e50de..bafcff8b 100644
--- a/protocol-wine/CMakeLists.txt
+++ b/proto-wine/CMakeLists.txt
@@ -9,7 +9,7 @@ if(NOT WIN32)
             if(APPLE)
                 set(my-rt)
             endif()
-            file(GLOB wine-deps ${CMAKE_SOURCE_DIR}/ftnoir_protocol_wine/*.cxx)
+            file(GLOB wine-deps ${PROJECT_SOURCE_DIR}/*.cxx)
             add_custom_command(
               OUTPUT opentrack-wrapper-wine.exe.so
               DEPENDS ${wine-deps}
diff --git a/protocol-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp
index 99ad30a2..99ad30a2 100644
--- a/protocol-wine/ftnoir_protocol_wine.cpp
+++ b/proto-wine/ftnoir_protocol_wine.cpp
diff --git a/protocol-wine/ftnoir_protocol_wine.h b/proto-wine/ftnoir_protocol_wine.h
index 2aeb4608..f78e1364 100644
--- a/protocol-wine/ftnoir_protocol_wine.h
+++ b/proto-wine/ftnoir_protocol_wine.h
@@ -10,7 +10,7 @@
 #include <QFile>
 #include "opentrack/plugin-api.hpp"
 #include "opentrack-compat/shm.h"
-#include "ftnoir_protocol_wine/wine-shm.h"
+#include "wine-shm.h"
 
 class FTNoIR_Protocol : public IProtocol
 {
diff --git a/protocol-wine/ftnoir_protocol_wine_dialog.cpp b/proto-wine/ftnoir_protocol_wine_dialog.cpp
index e4027c73..e4027c73 100644
--- a/protocol-wine/ftnoir_protocol_wine_dialog.cpp
+++ b/proto-wine/ftnoir_protocol_wine_dialog.cpp
diff --git a/protocol-wine/ftnoir_winecontrols.ui b/proto-wine/ftnoir_winecontrols.ui
index 9356c448..9356c448 100644
--- a/protocol-wine/ftnoir_winecontrols.ui
+++ b/proto-wine/ftnoir_winecontrols.ui
diff --git a/protocol-wine/images/wine.png b/proto-wine/images/wine.png
index bcf3a012..bcf3a012 100644
--- a/protocol-wine/images/wine.png
+++ b/proto-wine/images/wine.png
diff --git a/protocol-wine/opentrack-wrapper-wine-main.cxx b/proto-wine/opentrack-wrapper-wine-main.cxx
index ffe8938d..082e5dde 100644
--- a/protocol-wine/opentrack-wrapper-wine-main.cxx
+++ b/proto-wine/opentrack-wrapper-wine-main.cxx
@@ -5,7 +5,7 @@
 #endif
 #include <cstdio>
 #include "freetrackclient/fttypes.h"
-#include "ftnoir_protocol_wine/wine-shm.h"
+#include "wine-shm.h"
 #include "opentrack-compat/export.hpp"
 
 enum Axis {
diff --git a/protocol-wine/opentrack-wrapper-wine-posix.cxx b/proto-wine/opentrack-wrapper-wine-posix.cxx
index 50cce728..50cce728 100644
--- a/protocol-wine/opentrack-wrapper-wine-posix.cxx
+++ b/proto-wine/opentrack-wrapper-wine-posix.cxx
diff --git a/protocol-wine/opentrack-wrapper-wine-windows.cxx b/proto-wine/opentrack-wrapper-wine-windows.cxx
index 19ee8ffd..19ee8ffd 100644
--- a/protocol-wine/opentrack-wrapper-wine-windows.cxx
+++ b/proto-wine/opentrack-wrapper-wine-windows.cxx
diff --git a/protocol-wine/wine-protocol.qrc b/proto-wine/wine-protocol.qrc
index af81caea..af81caea 100644
--- a/protocol-wine/wine-protocol.qrc
+++ b/proto-wine/wine-protocol.qrc
diff --git a/protocol-wine/wine-shm.h b/proto-wine/wine-shm.h
index c7e29abb..c7e29abb 100644
--- a/protocol-wine/wine-shm.h
+++ b/proto-wine/wine-shm.h
diff --git a/qxt-mini/qxtglobal.h b/qxt-mini/qxtglobal.h
index fa592181..574482ae 100644
--- a/qxt-mini/qxtglobal.h
+++ b/qxt-mini/qxtglobal.h
@@ -51,9 +51,7 @@
 
 #define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE
 
-#define QXT_STATIC
-
-#if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN)
+#ifdef QXT_BUILD
 #    if defined(BUILD_QXT_CORE)
 #        define QXT_CORE_EXPORT Q_DECL_EXPORT
 #    else
diff --git a/qxt-mini/qxtglobalshortcut.cpp b/qxt-mini/qxtglobalshortcut.cpp
index 45576d37..4b400a72 100644
--- a/qxt-mini/qxtglobalshortcut.cpp
+++ b/qxt-mini/qxtglobalshortcut.cpp
@@ -1,3 +1,4 @@
+#define QXT_BUILD
 #include "qxtglobalshortcut.h"
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
diff --git a/qxt-mini/plat/qxtglobalshortcut_mac.cpp b/qxt-mini/qxtglobalshortcut_mac.cpp
index 1181b293..34de694e 100644
--- a/qxt-mini/plat/qxtglobalshortcut_mac.cpp
+++ b/qxt-mini/qxtglobalshortcut_mac.cpp
@@ -1,3 +1,5 @@
+#ifdef __APPLE__
+#define QXT_BUILD
 #include <Carbon/Carbon.h>
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
@@ -266,3 +268,4 @@ bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType,
 {
     return false;
 }
+#endif
diff --git a/qxt-mini/plat/qxtglobalshortcut_x11.cpp b/qxt-mini/qxtglobalshortcut_x11.cpp
index f18f86db..b13770a2 100644
--- a/qxt-mini/plat/qxtglobalshortcut_x11.cpp
+++ b/qxt-mini/qxtglobalshortcut_x11.cpp
@@ -1,4 +1,6 @@
-#include "../qxtglobalshortcut_p.h"
+#ifndef __APPLE_
+#define QXT_BUILD
+#include "qxtglobalshortcut_p.h"
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
 ** See the Qxt AUTHORS file for a list of authors and copyright holders.
@@ -233,3 +235,4 @@ bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nat
     QxtX11Data x11;
     return x11.isValid() && x11.ungrabKey(nativeKey, nativeMods, x11.rootWindow());
 }
+#endif
diff --git a/tracker-aruco/CMakeLists.txt b/tracker-aruco/CMakeLists.txt
index ed52eee6..70d742ee 100644
--- a/tracker-aruco/CMakeLists.txt
+++ b/tracker-aruco/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenCV 3.0)
+find_package(OpenCV 3.0 QUIET)
 set(SDK_ARUCO_LIBPATH "" CACHE FILEPATH "Aruco paper marker tracker static library path")
 if(SDK_ARUCO_LIBPATH)
     opentrack_boilerplate(opentrack-tracker-aruco)
diff --git a/tracker-freepie-udp/freepie-udp-controls.ui b/tracker-freepie-udp/freepie-udp-controls.ui
index 74e5a6f1..c59b9781 100644
--- a/tracker-freepie-udp/freepie-udp-controls.ui
+++ b/tracker-freepie-udp/freepie-udp-controls.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../facetracknoir/images/facetracknoir.png</normaloff>../facetracknoir/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/tracker-ht/CMakeLists.txt b/tracker-ht/CMakeLists.txt
index 74fd9056..248a113e 100644
--- a/tracker-ht/CMakeLists.txt
+++ b/tracker-ht/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(SDK_HT "" CACHE FILEPATH "Path to headtracker library")
 set(SDK_HT_FLANDMARK "" CACHE FILEPATH "Path to flandmark library for headtracker")
-find_package(OpenCV 3.0)
+find_package(OpenCV 3.0 QUIET)
 if(OpenCV_FOUND)
     if(SDK_HT AND SDK_HT_FLANDMARK)
         opentrack_boilerplate(opentrack-tracker-ht)
diff --git a/tracker-joystick/ftnoir_tracker_joystick_controls.ui b/tracker-joystick/ftnoir_tracker_joystick_controls.ui
index 88737023..ca41e35b 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_controls.ui
+++ b/tracker-joystick/ftnoir_tracker_joystick_controls.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../facetracknoir/images/facetracknoir.png</normaloff>../facetracknoir/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt
index 49943917..79405b4d 100644
--- a/tracker-pt/CMakeLists.txt
+++ b/tracker-pt/CMakeLists.txt
@@ -1,5 +1,7 @@
-find_package(OpenCV 3.0)
-opentrack_boilerplate(opentrack-tracker-pt STATIC)
-target_link_libraries(opentrack-tracker-pt ${OpenCV_LIBS})
-target_include_directories(opentrack-tracker-pt SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
-link_with_dinput8(opentrack-tracker-pt)
+find_package(OpenCV 3.0 QUIET)
+if(OpenCV_FOUND)
+    opentrack_boilerplate(opentrack-tracker-pt STATIC)
+    target_link_libraries(opentrack-tracker-pt ${OpenCV_LIBS})
+    target_include_directories(opentrack-tracker-pt SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
+    link_with_dinput8(opentrack-tracker-pt)
+endif()
diff --git a/tracker-udp/ftnoir_ftnclientcontrols.ui b/tracker-udp/ftnoir_ftnclientcontrols.ui
index cb9362ca..147c08e6 100644
--- a/tracker-udp/ftnoir_ftnclientcontrols.ui
+++ b/tracker-udp/ftnoir_ftnclientcontrols.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../facetracknoir/images/facetracknoir.png</normaloff>../facetracknoir/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>