Index: /source/ariba/Makefile.am
===================================================================
--- /source/ariba/Makefile.am	(revision 2393)
+++ /source/ariba/Makefile.am	(revision 2396)
@@ -41,22 +41,5 @@
 endif
 
-libariba_la_INCLUDES =
-
 # sources and subdirs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#interfaces headers for make install - don't 
-#remove the here listed .h files from _SOURCES!
-libariba_la_INCLUDES += \
-  tidy/AribaModule.h \
-  tidy/TidyCommunicationListener.h \
-  tidy/Identifiers.h \
-  tidy/LinkProperties.h \
-  tidy/TidyMessage.h \
-  tidy/DataMessage.h \
-  tidy/Module.h \
-  tidy/Name.h \
-  tidy/Node.h \
-  tidy/NodeListener.h \
-  tidy/SpoVNetProperties.h
 
 #tidy interface
@@ -84,5 +67,5 @@
   tidy/SpoVNetProperties.cpp \
   tidy/SpoVNetProperties.h
-  
+
 #communication
 libariba_la_SOURCES += \
@@ -378,20 +361,32 @@
   utility/types/SpoVNetID.h
 
+# make install stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+libariba_ladir = ${pkgincludedir}
+
+#interfaces headers for make install - don't 
+#remove the here listed .h files from _SOURCES!
+libariba_la_HEADERS = \
+  tidy/ariba.h \
+  tidy/AribaModule.h \
+  tidy/DataMessage.h \
+  tidy/Identifiers.h \
+  tidy/LinkProperties.h \
+  tidy/Module.h \
+  tidy/Name.h \
+  tidy/Node.h \
+  tidy/NodeListener.h \
+  tidy/SpoVNetProperties.h \
+  tidy/TidyCommunicationListener.h \
+  tidy/TidyMessage.h
+
+# old make install stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 #autotools does not support hierarchical folders in the header dir
 #so we copy them on our own using, similar to 14.3 in the autobook
-
-
-#TODO: do we still need this? what is the default dir?#do we want the version no in the folder
-# so people can install multiple header versions?
-libariba_ladir = ${pkgincludedir}
-
 # header files to install - TODO: extract all *.h and *.hpp files ~~~~
 
-### --> no more longer needed when the tidy interface is done!
-#
-#              |
-#              |
-#             \/
-#
+#libariba_ladir = ${pkgincludedir}
+
 # install-data-local:
 # 	@for f in $(libariba_la_SOURCES); do \
Index: /source/ariba/tidy/ariba.h
===================================================================
--- /source/ariba/tidy/ariba.h	(revision 2393)
+++ /source/ariba/tidy/ariba.h	(revision 2396)
@@ -43,14 +43,16 @@
  * This file includes all standard headers for a working ariba substrate
  */
+
+#include "AribaModule.h"
+#include "DataMessage.h"
+#include "Identifiers.h"
+#include "LinkProperties.h"
 #include "Module.h"
-#include "Identifiers.h"
-#include "AribaModule.h"
-#include "LinkProperties.h"
-#include "DataMessage.h"
-#include "TidyCommunicationListener.h"
 #include "Name.h"
 #include "Node.h"
 #include "NodeListener.h"
 #include "SpoVNetProperties.h"
+#include "TidyCommunicationListener.h"
+#include "TidyMessage.h"
 
 #endif /* ARIBA_H_ */