diff --git a/properties/Makefile.am b/properties/Makefile.am
index 584f1e6..5fdc019 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,2 +1,2 @@
-ACLOCAL_AMFLAGS = -I m4 -I /usr/local/share/aclocal
-SUBDIRS = include src demo
\ No newline at end of file
+ACLOCAL_AMFLAGS = -I m4 -I /usr/share/aclocal
+SUBDIRS = include src
\ No newline at end of file
diff --git a/properties/configure.ac b/properties/configure.ac
index 1202173..90351e7 100644
--- a/properties/configure.ac
+++ b/properties/configure.ac
@@ -26,7 +26,7 @@ if test "$wxWin" != 1; then
 		wxWidgets version is $reqwx or above.
 		])
 fi
-CPPFLAGS="$CPPFLAGS -D__GXX_EXPERIMENTAL_CXX0X__ $WX_CPPFLAGS -I/usr/local/include"
+CPPFLAGS="$WX_CPPFLAGS $CPPFLAGS"
 AC_ARG_ENABLE(debug,
 [[  --enable-debug   use debug configuration]],
 [