Index: /sample/pingpong/PingPong.cpp
===================================================================
--- /sample/pingpong/PingPong.cpp	(revision 2412)
+++ /sample/pingpong/PingPong.cpp	(revision 2413)
@@ -121,17 +121,4 @@
 // timer event
 void PingPong::eventFunction() {
-
- 	logging_info("pinging our remote nodes");
-// 	RemoteNodes::iterator i = remoteNodes.begin();
-// 	RemoteNodes::iterator iend = remoteNodes.end();
-//
-// 	pingid++;
-//
-// 	for (; i != iend; i++) {
-// 		logging_info("     -> pinging " << i->first);
-//
-// 		PingPongMessage pingmsg(pingid);
-// 		overlay->sendMessage(&pingmsg, i->second);
-// 	}
 }
 
Index: /sample/pingpong/PingPong.h
===================================================================
--- /sample/pingpong/PingPong.h	(revision 2412)
+++ /sample/pingpong/PingPong.h	(revision 2413)
@@ -63,8 +63,4 @@
  	// the current ping id
  	unsigned long pingId;
-
-// 	// the known remote nodes
-// 	typedef map<NodeID, LinkID> RemoteNodes;
-// 	RemoteNodes remoteNodes;
 };
 
Index: /sample/pingpong/PingPongMessage.h
===================================================================
--- /sample/pingpong/PingPongMessage.h	(revision 2412)
+++ /sample/pingpong/PingPongMessage.h	(revision 2413)
@@ -1,9 +1,4 @@
 #ifndef PINGPONGMESSAGES_H_
 #define PINGPONGMESSAGES_H_
-
-// #include "ariba/utility/messages.h"
-// #include "ariba/utility/serialization.h"
-// #include "ariba/utility/misc/Helper.h"
-// using ariba::utility::Message;
 
 #include <string>
Index: /sample/pingpong/main.cpp
===================================================================
--- /sample/pingpong/main.cpp	(revision 2412)
+++ /sample/pingpong/main.cpp	(revision 2413)
@@ -1,5 +1,5 @@
 #include <string>
 #include "ariba/utility/system/StartupWrapper.h"
-#include "TidyPingPong.h"
+#include "PingPong.h"
 
 using std::string;
Index: /source/ariba/Makefile.am
===================================================================
--- /source/ariba/Makefile.am	(revision 2412)
+++ /source/ariba/Makefile.am	(revision 2413)
@@ -363,21 +363,21 @@
 # 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
+# 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -387,14 +387,14 @@
 # header files to install - TODO: extract all *.h and *.hpp files ~~~~
 
-#libariba_ladir = ${pkgincludedir}
-
-# install-data-local:
-# 	@for f in $(libariba_la_SOURCES); do \
-# 		d=`echo $$f | sed -e 's,/[^/]*$$,,'`; \
-# 		$(mkinstalldirs) $(DESTDIR)$(libariba_ladir)/$$d; \
-# 		if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
-# 		$(INSTALL_DATA) $$p $(DESTDIR)$(libariba_ladir)/$$f; \
-# 	done
-# 
-# uninstall-local:
-# 	rm -rf $(DESTDIR)$(libariba_ladir)
+libariba_ladir = ${pkgincludedir}
+
+install-data-local:
+	@for f in $(libariba_la_SOURCES); do \
+		d=`echo $$f | sed -e 's,/[^/]*$$,,'`; \
+		$(mkinstalldirs) $(DESTDIR)$(libariba_ladir)/$$d; \
+		if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(libariba_ladir)/$$f; \
+	done
+
+uninstall-local:
+	rm -rf $(DESTDIR)$(libariba_ladir)