diff --git a/libm65/m65a.F90 b/libm65/m65a.F90
index d8f378af2..7e1997399 100644
--- a/libm65/m65a.F90
+++ b/libm65/m65a.F90
@@ -1,18 +1,14 @@
 subroutine m65a
 
-! NB: this interface block is required by g95, but must be omitted
-!     for gfortran.  (????)
-
-#ifndef UNIX
   interface
      function address_m65()
+     integer*1, pointer :: address_m65
      end function address_m65
   end interface
-#endif
   
   integer*1 attach_m65,lock_m65,unlock_m65
   integer size_m65
-  integer*1, pointer :: address_m65,p_m65
+  integer*1, pointer :: p_m65
   character*80 cwd
   logical fileExists
   common/tracer/limtrace,lu
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b0a8b2c27..21bcbcb70 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//------------------------------------------------------------ MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
diff --git a/map65.pro b/map65.pro
index c948f7b8f..b79d4e5a2 100644
--- a/map65.pro
+++ b/map65.pro
@@ -53,11 +53,9 @@ FORMS    += mainwindow.ui about.ui devsetup.ui widegraph.ui \
 RC_FILE = map65.rc
 
 unix {
-INCLUDEPATH += $$quote(/usr/include/qwt-qt4)
-LIBS += -lfftw3f /usr/lib/libgfortran.so.3
+INCLUDEPATH += -lqwt
 LIBS += ../map65/libm65/libm65.a
-LIBS += /usr/lib/libqwt-qt4.so
-LIBS += -lportaudio
+LIBS += -lfftw3f -lportaudio -lgfortran
 #LIBS +- -lusb
 }