5 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 4d147ac..0a48904 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
-DIST_SUBDIRS = util
-SUBDIRS = src
+SUBDIRS = src util
 
 desktopfilesdir = $(datadir)/applications
 dist_desktopfiles_DATA = machina.desktop
diff --git a/src/engine/machina/Action.hpp b/src/engine/machina/Action.hpp
index 9ea106a..24e295b 100644
--- a/src/engine/machina/Action.hpp
+++ b/src/engine/machina/Action.hpp
@@ -28,8 +28,6 @@
 
 namespace Machina {
 
-class MidiDriver;
-
 
 /** An Action, executed on entering or exiting of a state.
  */
diff --git a/src/engine/machina/Makefile.am b/src/engine/machina/Makefile.am
index 5907be5..4a97f3e 100644
--- a/src/engine/machina/Makefile.am
+++ b/src/engine/machina/Makefile.am
@@ -13,7 +13,9 @@ libmachinainclude_HEADERS = \
 	LearnRequest.hpp \
 	Engine.hpp \
 	Recorder.hpp \
-	MachineBuilder.hpp
+	MachineBuilder.hpp \
+	SMFDriver.hpp \
+	JackDriver.hpp
 	
 if WITH_JACK	
 	JackDriver.hpp
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 3a204f2..bbe902e 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -8,11 +8,6 @@ dist_sharefiles_DATA = machina.glade
 #globalpixmapsdir = $(datadir)/pixmaps
 #dist_globalpixmaps_DATA = machina-icon.svg
 
-if WITH_GUI
-
-machina_gui_LDADD = @FLOWCANVAS_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @RAUL_CFLAGS@ ../engine/libmachina.la
-
-bin_PROGRAMS = machina_gui
 machina_gui_SOURCES = \
 	main.cpp \
 	GladeXml.hpp \
@@ -27,4 +22,10 @@ machina_gui_SOURCES = \
 	NodePropertiesWindow.hpp \
 	NodePropertiesWindow.cpp
 
+if WITH_GUI
+
+machina_gui_LDADD = @FLOWCANVAS_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @RAUL_CFLAGS@ ../engine/libmachina.la
+
+bin_PROGRAMS = machina_gui
+
 endif
diff --git a/util/Makefile.am b/util/Makefile.am
index 7186db5..2df23aa 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = machina2dot.py
+EXTRA_DIST = machina2dot