diff --git a/configure b/configure
index bb238f6..7d582e6 100755
--- a/configure
+++ b/configure
@@ -11927,6 +11927,8 @@ CC="$lt_save_CC"
 
 
 
+
+
 case $enable_ltdl_convenience in
   no) as_fn_error $? "this package needs a convenience libltdl" "$LINENO" 5 ;;
   "") enable_ltdl_convenience=yes
@@ -12816,9 +12818,6 @@ fi
 
 
 
-
-
-
 # Check whether --with-ltdl_include was given.
 if test "${with_ltdl_include+set}" = set; then :
   withval=$with_ltdl_include;
diff --git a/configure.ac b/configure.ac
index 53b231b..009254d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ dnl Check for libltdl
 dnl 
 dnl AC_CONFIG_SUBDIRS(libltdl)
 LT_INIT([dlopen])
-_LT_CONFIG_LTDL_DIR([m4_default([libltdl], [libltdl])])
+LT_CONFIG_LTDL_DIR([libltdl])
 _LTDL_CONVENIENCE
 LTDL_INIT([])
 AC_SUBST([LTDLINCL])
diff --git a/modules/AliceLogo/Makefile.am b/modules/AliceLogo/Makefile.am
index c5ca4b6..3cae410 100644
--- a/modules/AliceLogo/Makefile.am
+++ b/modules/AliceLogo/Makefile.am
@@ -6,7 +6,7 @@ AliceLogo_la_LIBADD  = ../lib/libgraph.la ../lib/libalk.la
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/AliceLogo/Makefile.in b/modules/AliceLogo/Makefile.in
index 0c2693d..d0c28aa 100644
--- a/modules/AliceLogo/Makefile.in
+++ b/modules/AliceLogo/Makefile.in
@@ -417,7 +417,7 @@ AliceLogo_la_LDFLAGS = -module -export-dynamic -avoid-version
 AliceLogo_la_SOURCES = AliceLogo.c
 AliceLogo_la_LIBADD = ../lib/libgraph.la ../lib/libalk.la
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/Confirm/Makefile.am b/modules/Confirm/Makefile.am
index 23fca1a..170083b 100644
--- a/modules/Confirm/Makefile.am
+++ b/modules/Confirm/Makefile.am
@@ -6,7 +6,7 @@ Confirm_la_LIBADD  =
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/Confirm/Makefile.in b/modules/Confirm/Makefile.in
index d523b10..73d0224 100644
--- a/modules/Confirm/Makefile.in
+++ b/modules/Confirm/Makefile.in
@@ -417,7 +417,7 @@ Confirm_la_LDFLAGS = -module -export-dynamic -avoid-version
 Confirm_la_SOURCES = Confirm.c
 Confirm_la_LIBADD = 
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/Gpx/Makefile.am b/modules/Gpx/Makefile.am
index 1ff3faf..cff7509 100644
--- a/modules/Gpx/Makefile.am
+++ b/modules/Gpx/Makefile.am
@@ -7,7 +7,7 @@ Gpx_la_SOURCES = Gpx.c \
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
diff --git a/modules/Gpx/Makefile.in b/modules/Gpx/Makefile.in
index 0c9a994..fcc8731 100644
--- a/modules/Gpx/Makefile.in
+++ b/modules/Gpx/Makefile.in
@@ -419,7 +419,7 @@ Gpx_la_SOURCES = Gpx.c \
 	effectcopy.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
diff --git a/modules/Math/Makefile.am b/modules/Math/Makefile.am
index 4a2d0d1..94a5406 100644
--- a/modules/Math/Makefile.am
+++ b/modules/Math/Makefile.am
@@ -5,7 +5,7 @@ Math_la_SOURCES = Math.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/Math -I$(top_srcdir)/modules/Math
diff --git a/modules/Math/Makefile.in b/modules/Math/Makefile.in
index e54afe3..869403c 100644
--- a/modules/Math/Makefile.in
+++ b/modules/Math/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = Math.la
 Math_la_LDFLAGS = -module -export-dynamic -avoid-version
 Math_la_SOURCES = Math.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/Math -I$(top_srcdir)/modules/Math
diff --git a/modules/MsgSkip/Makefile.am b/modules/MsgSkip/Makefile.am
index 9b2130b..c945bce 100644
--- a/modules/MsgSkip/Makefile.am
+++ b/modules/MsgSkip/Makefile.am
@@ -8,7 +8,7 @@ MSGSKIP_la_SOURCES = MsgSkip.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/MsgSkip -I$(top_srcdir)/modules/MsgSkip
diff --git a/modules/MsgSkip/Makefile.in b/modules/MsgSkip/Makefile.in
index 523ea24..bc2db67 100644
--- a/modules/MsgSkip/Makefile.in
+++ b/modules/MsgSkip/Makefile.in
@@ -424,7 +424,7 @@ MsgSkip_la_SOURCES = MsgSkip.c
 MSGSKIP_la_LDFLAGS = -module -export-dynamic -avoid-version
 MSGSKIP_la_SOURCES = MsgSkip.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/MsgSkip -I$(top_srcdir)/modules/MsgSkip
diff --git a/modules/NIGHTDLL/Makefile.am b/modules/NIGHTDLL/Makefile.am
index 49e9ecb..ff22fe5 100644
--- a/modules/NIGHTDLL/Makefile.am
+++ b/modules/NIGHTDLL/Makefile.am
@@ -19,7 +19,7 @@ NIGHTDLL_la_SOURCES = \
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
diff --git a/modules/NIGHTDLL/Makefile.in b/modules/NIGHTDLL/Makefile.in
index eb6e4cd..54a186d 100644
--- a/modules/NIGHTDLL/Makefile.in
+++ b/modules/NIGHTDLL/Makefile.in
@@ -434,7 +434,7 @@ NIGHTDLL_la_SOURCES = \
 	nt_sound.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
diff --git a/modules/NightDemonDemo/Makefile.am b/modules/NightDemonDemo/Makefile.am
index b9dfcdb..5fb114e 100644
--- a/modules/NightDemonDemo/Makefile.am
+++ b/modules/NightDemonDemo/Makefile.am
@@ -6,7 +6,7 @@ NightDemonDemo_la_LIBADD  = ../lib/libgraph.la ../lib/libalk.la @GLIB_LIBS@ @JPE
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@ @JPEG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/NightDemonDemo/Makefile.in b/modules/NightDemonDemo/Makefile.in
index f62620a..cd10705 100644
--- a/modules/NightDemonDemo/Makefile.in
+++ b/modules/NightDemonDemo/Makefile.in
@@ -419,7 +419,7 @@ NightDemonDemo_la_LDFLAGS = -module -export-dynamic -avoid-version
 NightDemonDemo_la_SOURCES = NightDemonDemo.c ndd.c jpeg2surface.c
 NightDemonDemo_la_LIBADD = ../lib/libgraph.la ../lib/libalk.la @GLIB_LIBS@ @JPEG_LIBS@
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@ @JPEG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/RandMT/Makefile.am b/modules/RandMT/Makefile.am
index c6d4020..5c63f15 100644
--- a/modules/RandMT/Makefile.am
+++ b/modules/RandMT/Makefile.am
@@ -5,7 +5,7 @@ RandMT_la_SOURCES = RandMT.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/RandMT -I$(top_srcdir)/modules/RandMT
diff --git a/modules/RandMT/Makefile.in b/modules/RandMT/Makefile.in
index 0358a2d..9c2fe1e 100644
--- a/modules/RandMT/Makefile.in
+++ b/modules/RandMT/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = RandMT.la
 RandMT_la_LDFLAGS = -module -export-dynamic -avoid-version
 RandMT_la_SOURCES = RandMT.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/RandMT -I$(top_srcdir)/modules/RandMT
diff --git a/modules/SACT/Makefile.am b/modules/SACT/Makefile.am
index be6a791..ec8d294 100644
--- a/modules/SACT/Makefile.am
+++ b/modules/SACT/Makefile.am
@@ -34,7 +34,7 @@ SACT_la_SOURCES = \
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
diff --git a/modules/SACT/Makefile.in b/modules/SACT/Makefile.in
index 564bc6a..6e88661 100644
--- a/modules/SACT/Makefile.in
+++ b/modules/SACT/Makefile.in
@@ -452,7 +452,7 @@ SACT_la_SOURCES = \
 	sprite_xmenu.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
diff --git a/modules/ShArray/Makefile.am b/modules/ShArray/Makefile.am
index c948433..47e6d09 100644
--- a/modules/ShArray/Makefile.am
+++ b/modules/ShArray/Makefile.am
@@ -5,7 +5,7 @@ ShArray_la_SOURCES = ShArray.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShArray -I$(top_srcdir)/modules/ShArray
diff --git a/modules/ShArray/Makefile.in b/modules/ShArray/Makefile.in
index 1a6ae09..b14c4c5 100644
--- a/modules/ShArray/Makefile.in
+++ b/modules/ShArray/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = ShArray.la
 ShArray_la_LDFLAGS = -module -export-dynamic -avoid-version
 ShArray_la_SOURCES = ShArray.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShArray -I$(top_srcdir)/modules/ShArray
diff --git a/modules/ShCalc/Makefile.am b/modules/ShCalc/Makefile.am
index 9a9b2ec..b973576 100644
--- a/modules/ShCalc/Makefile.am
+++ b/modules/ShCalc/Makefile.am
@@ -6,7 +6,7 @@ ShCalc_la_LIBADD = @GLIB_LIBS@
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShCalc -I$(top_srcdir)/modules/ShCalc
diff --git a/modules/ShCalc/Makefile.in b/modules/ShCalc/Makefile.in
index b931a5d..2cc9f20 100644
--- a/modules/ShCalc/Makefile.in
+++ b/modules/ShCalc/Makefile.in
@@ -417,7 +417,7 @@ ShCalc_la_LDFLAGS = -module -export-dynamic -avoid-version
 ShCalc_la_SOURCES = ShCalc.c
 ShCalc_la_LIBADD = @GLIB_LIBS@
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShCalc -I$(top_srcdir)/modules/ShCalc
diff --git a/modules/ShGraph/Makefile.am b/modules/ShGraph/Makefile.am
index d79d8e5..ec3d5bd 100644
--- a/modules/ShGraph/Makefile.am
+++ b/modules/ShGraph/Makefile.am
@@ -5,7 +5,7 @@ ShGraph_la_SOURCES = ShGraph.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShGraph -I$(top_srcdir)/modules/ShGraph
diff --git a/modules/ShGraph/Makefile.in b/modules/ShGraph/Makefile.in
index f035ce2..a0a17ff 100644
--- a/modules/ShGraph/Makefile.in
+++ b/modules/ShGraph/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = ShGraph.la
 ShGraph_la_LDFLAGS = -module -export-dynamic -avoid-version
 ShGraph_la_SOURCES = ShGraph.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShGraph -I$(top_srcdir)/modules/ShGraph
diff --git a/modules/ShPort/Makefile.am b/modules/ShPort/Makefile.am
index 14bbc1d..cfead00 100644
--- a/modules/ShPort/Makefile.am
+++ b/modules/ShPort/Makefile.am
@@ -6,7 +6,7 @@ ShPort_la_LIBADD = @GLIB_LIBS@
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShPort -I$(top_srcdir)/modules/ShPort
diff --git a/modules/ShPort/Makefile.in b/modules/ShPort/Makefile.in
index 8ef3d00..221e434 100644
--- a/modules/ShPort/Makefile.in
+++ b/modules/ShPort/Makefile.in
@@ -417,7 +417,7 @@ ShPort_la_LDFLAGS = -module -export-dynamic -avoid-version
 ShPort_la_SOURCES = ShPort.c
 ShPort_la_LIBADD = @GLIB_LIBS@
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShPort -I$(top_srcdir)/modules/ShPort
diff --git a/modules/ShSound/Makefile.am b/modules/ShSound/Makefile.am
index 874f7fa..e3d1321 100644
--- a/modules/ShSound/Makefile.am
+++ b/modules/ShSound/Makefile.am
@@ -7,7 +7,7 @@ ShSound_la_LIBADD = @GLIB_LIBS@
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShSound -I$(top_srcdir)/modules/ShSound
diff --git a/modules/ShSound/Makefile.in b/modules/ShSound/Makefile.in
index 101ecf4..0ea0475 100644
--- a/modules/ShSound/Makefile.in
+++ b/modules/ShSound/Makefile.in
@@ -417,7 +417,7 @@ ShSound_la_LDFLAGS = -module -export-dynamic -avoid-version
 ShSound_la_SOURCES = ShSound.c
 ShSound_la_LIBADD = @GLIB_LIBS@
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShSound -I$(top_srcdir)/modules/ShSound
diff --git a/modules/ShString/Makefile.am b/modules/ShString/Makefile.am
index 5e41b81..f8251dc 100644
--- a/modules/ShString/Makefile.am
+++ b/modules/ShString/Makefile.am
@@ -5,7 +5,7 @@ ShString_la_SOURCES = ShString.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShString -I$(top_srcdir)/modules/ShString
diff --git a/modules/ShString/Makefile.in b/modules/ShString/Makefile.in
index 5ade34f..4cfd49a 100644
--- a/modules/ShString/Makefile.in
+++ b/modules/ShString/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = ShString.la
 ShString_la_LDFLAGS = -module -export-dynamic -avoid-version
 ShString_la_SOURCES = ShString.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/ShString -I$(top_srcdir)/modules/ShString
diff --git a/modules/dDemo/Makefile.am b/modules/dDemo/Makefile.am
index 8639539..d591b13 100644
--- a/modules/dDemo/Makefile.am
+++ b/modules/dDemo/Makefile.am
@@ -6,7 +6,7 @@ dDemo_la_LIBADD  = ../lib/libgraph.la ../lib/libalk.la
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/dDemo/Makefile.in b/modules/dDemo/Makefile.in
index cdeaa4d..15dda77 100644
--- a/modules/dDemo/Makefile.in
+++ b/modules/dDemo/Makefile.in
@@ -417,7 +417,7 @@ dDemo_la_LDFLAGS = -module -export-dynamic -avoid-version
 dDemo_la_SOURCES = dDemo.c
 dDemo_la_LIBADD = ../lib/libgraph.la ../lib/libalk.la
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/eDemo/Makefile.am b/modules/eDemo/Makefile.am
index f1af95a..4c2f8ce 100644
--- a/modules/eDemo/Makefile.am
+++ b/modules/eDemo/Makefile.am
@@ -5,7 +5,7 @@ eDemo_la_SOURCES = eDemo.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/eDemo -I$(top_srcdir)/modules/eDemo
diff --git a/modules/eDemo/Makefile.in b/modules/eDemo/Makefile.in
index 0fde04f..2f308c0 100644
--- a/modules/eDemo/Makefile.in
+++ b/modules/eDemo/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = eDemo.la
 eDemo_la_LDFLAGS = -module -export-dynamic -avoid-version
 eDemo_la_SOURCES = eDemo.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/eDemo -I$(top_srcdir)/modules/eDemo
diff --git a/modules/eeDemo/Makefile.am b/modules/eeDemo/Makefile.am
index a389807..a136859 100644
--- a/modules/eeDemo/Makefile.am
+++ b/modules/eeDemo/Makefile.am
@@ -5,7 +5,7 @@ eeDemo_la_SOURCES = eeDemo.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/eeDemo -I$(top_srcdir)/modules/eeDemo
diff --git a/modules/eeDemo/Makefile.in b/modules/eeDemo/Makefile.in
index 52df22a..b31f458 100644
--- a/modules/eeDemo/Makefile.in
+++ b/modules/eeDemo/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = eeDemo.la
 eeDemo_la_LDFLAGS = -module -export-dynamic -avoid-version
 eeDemo_la_SOURCES = eeDemo.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/eeDemo -I$(top_srcdir)/modules/eeDemo
diff --git a/modules/lib/Makefile.am b/modules/lib/Makefile.am
index af8fb4e..7e7a382 100644
--- a/modules/lib/Makefile.am
+++ b/modules/lib/Makefile.am
@@ -30,7 +30,7 @@ libdrawtext_la_LIBADD = @GLIB_LIBS@
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	$(LTDLINCL) \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib
diff --git a/modules/lib/Makefile.in b/modules/lib/Makefile.in
index 9bb2c66..4f81405 100644
--- a/modules/lib/Makefile.in
+++ b/modules/lib/Makefile.in
@@ -425,7 +425,7 @@ libalk_la_LIBADD = @GLIB_LIBS@
 libdrawtext_la_SOURCES = drawtext.c
 libdrawtext_la_LIBADD = @GLIB_LIBS@
 AM_CFLAGS = @DEBUG_CFLAGS@ @GLIB_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	$(LTDLINCL) \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib
diff --git a/modules/nDEMO/Makefile.am b/modules/nDEMO/Makefile.am
index 527769c..dc79ed3 100644
--- a/modules/nDEMO/Makefile.am
+++ b/modules/nDEMO/Makefile.am
@@ -5,7 +5,7 @@ nDEMO_la_SOURCES = nDEMO.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/nDEMO -I$(top_srcdir)/modules/nDEMO
diff --git a/modules/nDEMO/Makefile.in b/modules/nDEMO/Makefile.in
index e46edb7..5daf8ce 100644
--- a/modules/nDEMO/Makefile.in
+++ b/modules/nDEMO/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = nDEMO.la
 nDEMO_la_LDFLAGS = -module -export-dynamic -avoid-version
 nDEMO_la_SOURCES = nDEMO.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/nDEMO -I$(top_srcdir)/modules/nDEMO
diff --git a/modules/nDEMOE/Makefile.am b/modules/nDEMOE/Makefile.am
index d90b454..62af994 100644
--- a/modules/nDEMOE/Makefile.am
+++ b/modules/nDEMOE/Makefile.am
@@ -5,7 +5,7 @@ nDEMOE_la_SOURCES = nDEMOE.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/nDEMOE -I$(top_srcdir)/modules/nDEMOE
diff --git a/modules/nDEMOE/Makefile.in b/modules/nDEMOE/Makefile.in
index 421dfb1..470b1a5 100644
--- a/modules/nDEMOE/Makefile.in
+++ b/modules/nDEMOE/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = nDEMOE.la
 nDEMOE_la_LDFLAGS = -module -export-dynamic -avoid-version
 nDEMOE_la_SOURCES = nDEMOE.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/nDEMOE -I$(top_srcdir)/modules/nDEMOE
diff --git a/modules/oDEMO/Makefile.am b/modules/oDEMO/Makefile.am
index 5470ead..aac06d7 100644
--- a/modules/oDEMO/Makefile.am
+++ b/modules/oDEMO/Makefile.am
@@ -5,7 +5,7 @@ oDEMO_la_SOURCES = oDEMO.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/oDEMO -I$(top_srcdir)/modules/oDEMO
diff --git a/modules/oDEMO/Makefile.in b/modules/oDEMO/Makefile.in
index ead670d..90d17f5 100644
--- a/modules/oDEMO/Makefile.in
+++ b/modules/oDEMO/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = oDEMO.la
 oDEMO_la_LDFLAGS = -module -export-dynamic -avoid-version
 oDEMO_la_SOURCES = oDEMO.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/oDEMO -I$(top_srcdir)/modules/oDEMO
diff --git a/modules/oujimisc/Makefile.am b/modules/oujimisc/Makefile.am
index 4ca4df2..acb8ba3 100644
--- a/modules/oujimisc/Makefile.am
+++ b/modules/oujimisc/Makefile.am
@@ -5,7 +5,7 @@ oujimisc_la_SOURCES = oujimisc.c
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/oujimisc -I$(top_srcdir)/modules/oujimisc
diff --git a/modules/oujimisc/Makefile.in b/modules/oujimisc/Makefile.in
index 982f92d..cdb8679 100644
--- a/modules/oujimisc/Makefile.in
+++ b/modules/oujimisc/Makefile.in
@@ -416,7 +416,7 @@ pkglib_LTLIBRARIES = oujimisc.la
 oujimisc_la_LDFLAGS = -module -export-dynamic -avoid-version
 oujimisc_la_SOURCES = oujimisc.c
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 	-I$(top_builddir)/modules/oujimisc -I$(top_srcdir)/modules/oujimisc
diff --git a/modules/tDemo/Makefile.am b/modules/tDemo/Makefile.am
index 06b0544..331d8ca 100644
--- a/modules/tDemo/Makefile.am
+++ b/modules/tDemo/Makefile.am
@@ -6,7 +6,7 @@ tDemo_la_LIBADD  = ../lib/libgraph.la ../lib/libalk.la
 
 AM_CFLAGS = @DEBUG_CFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/modules/tDemo/Makefile.in b/modules/tDemo/Makefile.in
index e7ecaa3..1f4b911 100644
--- a/modules/tDemo/Makefile.in
+++ b/modules/tDemo/Makefile.in
@@ -417,7 +417,7 @@ tDemo_la_LDFLAGS = -module -export-dynamic -avoid-version
 tDemo_la_SOURCES = tDemo.c
 tDemo_la_LIBADD = ../lib/libgraph.la ../lib/libalk.la
 AM_CFLAGS = @DEBUG_CFLAGS@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/modules/lib -I$(top_srcdir)/modules/lib \
 	-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
diff --git a/src/Makefile.am b/src/Makefile.am
index c759aea..7ad4a89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,22 +5,22 @@
 #programe name
 bin_PROGRAMS = xsystem35
 
-INCLUDES = $(LTDLINCL)
+AM_CPPFLAGS = $(LTDLINCL)
 
 xsystem35_LDFLAGS = @EXTRALDFLAGS@
 
 AM_CFLAGS = @DEBUG_CFLAGS@ @X_CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ @ESD_CFLAGS@ @SDL_CFLAGS@ @EXTRACFLAGS@ @VORBIS_CFLAGS@ -DMODULE_PATH=\"$(libdir)/@PACKAGE@\" -DLOCALEDIR=\""$(datadir)/locale"\"
 
 
-SRC_SYS35CMD := cmdb.c cmdc.c cmdd.c cmde.c cmdf.c cmdg.c cmdh.c cmdi.c cmdj.c cmdk.c cmdl.c cmdm.c cmdn.c cmdo.c cmdp.c cmdq.c cmds.c cmdt.c cmdu.c cmdv.c cmdw.c cmdy.c cmdz.c cmd2F.c cmd2F60.c
-SRC_CG    := pms.c vsp.c bmp.c qnt.c
-SRC_MUS   := music.c music_client.c music_server.c music_cdrom.c music_midi.c music_pcm.c music_fader.c wavfile.c wavmix.c audio.c midi.c cdrom.c sndcnv.c musstream.c pcmlib.c music_bgm.c musstream_wav.c musstream_ogg.c musstream_wav_ima.c
-SRC_MISC  := LittleEndian.c counter.c imput.c profile.c mt19937-1.c @JOY_S@.c eucsjis.c filecheck.c tempname.c
-SRC_SCO   := cali.c scenario.c variable.c cmd_check.c hankana2sjis.c nact.c selection.c message.c savedata.c hankaku.c s39ain.c s39init.c
-SRC_GRAPH := ags.c font.c flood.c cg.c ecopy.c antialiase.c alpha_plane.c cursor.c
+SRC_SYS35CMD = cmdb.c cmdc.c cmdd.c cmde.c cmdf.c cmdg.c cmdh.c cmdi.c cmdj.c cmdk.c cmdl.c cmdm.c cmdn.c cmdo.c cmdp.c cmdq.c cmds.c cmdt.c cmdu.c cmdv.c cmdw.c cmdy.c cmdz.c cmd2F.c cmd2F60.c
+SRC_CG    = pms.c vsp.c bmp.c qnt.c
+SRC_MUS   = music.c music_client.c music_server.c music_cdrom.c music_midi.c music_pcm.c music_fader.c wavfile.c wavmix.c audio.c midi.c cdrom.c sndcnv.c musstream.c pcmlib.c music_bgm.c musstream_wav.c musstream_ogg.c musstream_wav_ima.c
+SRC_MISC  = LittleEndian.c counter.c imput.c profile.c mt19937-1.c @JOY_S@.c eucsjis.c filecheck.c tempname.c
+SRC_SCO   = cali.c scenario.c variable.c cmd_check.c hankana2sjis.c nact.c selection.c message.c savedata.c hankaku.c s39ain.c s39init.c
+SRC_GRAPH = ags.c font.c flood.c cg.c ecopy.c antialiase.c alpha_plane.c cursor.c
 
-SRC_NET := network.c
-SRC_DLL := 
+SRC_NET = network.c
+SRC_DLL = 
 
 xsystem35_SOURCES = \
 	xsystem35.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 0233da1..dcf2000 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -424,17 +424,17 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = $(LTDLINCL)
+AM_CPPFLAGS = $(LTDLINCL)
 xsystem35_LDFLAGS = @EXTRALDFLAGS@
 AM_CFLAGS = @DEBUG_CFLAGS@ @X_CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ @ESD_CFLAGS@ @SDL_CFLAGS@ @EXTRACFLAGS@ @VORBIS_CFLAGS@ -DMODULE_PATH=\"$(libdir)/@PACKAGE@\" -DLOCALEDIR=\""$(datadir)/locale"\"
-SRC_SYS35CMD := cmdb.c cmdc.c cmdd.c cmde.c cmdf.c cmdg.c cmdh.c cmdi.c cmdj.c cmdk.c cmdl.c cmdm.c cmdn.c cmdo.c cmdp.c cmdq.c cmds.c cmdt.c cmdu.c cmdv.c cmdw.c cmdy.c cmdz.c cmd2F.c cmd2F60.c
-SRC_CG := pms.c vsp.c bmp.c qnt.c
-SRC_MUS := music.c music_client.c music_server.c music_cdrom.c music_midi.c music_pcm.c music_fader.c wavfile.c wavmix.c audio.c midi.c cdrom.c sndcnv.c musstream.c pcmlib.c music_bgm.c musstream_wav.c musstream_ogg.c musstream_wav_ima.c
-SRC_MISC := LittleEndian.c counter.c imput.c profile.c mt19937-1.c @JOY_S@.c eucsjis.c filecheck.c tempname.c
-SRC_SCO := cali.c scenario.c variable.c cmd_check.c hankana2sjis.c nact.c selection.c message.c savedata.c hankaku.c s39ain.c s39init.c
-SRC_GRAPH := ags.c font.c flood.c cg.c ecopy.c antialiase.c alpha_plane.c cursor.c
-SRC_NET := network.c
-SRC_DLL := 
+SRC_SYS35CMD = cmdb.c cmdc.c cmdd.c cmde.c cmdf.c cmdg.c cmdh.c cmdi.c cmdj.c cmdk.c cmdl.c cmdm.c cmdn.c cmdo.c cmdp.c cmdq.c cmds.c cmdt.c cmdu.c cmdv.c cmdw.c cmdy.c cmdz.c cmd2F.c cmd2F60.c
+SRC_CG = pms.c vsp.c bmp.c qnt.c
+SRC_MUS = music.c music_client.c music_server.c music_cdrom.c music_midi.c music_pcm.c music_fader.c wavfile.c wavmix.c audio.c midi.c cdrom.c sndcnv.c musstream.c pcmlib.c music_bgm.c musstream_wav.c musstream_ogg.c musstream_wav_ima.c
+SRC_MISC = LittleEndian.c counter.c imput.c profile.c mt19937-1.c @JOY_S@.c eucsjis.c filecheck.c tempname.c
+SRC_SCO = cali.c scenario.c variable.c cmd_check.c hankana2sjis.c nact.c selection.c message.c savedata.c hankaku.c s39ain.c s39init.c
+SRC_GRAPH = ags.c font.c flood.c cg.c ecopy.c antialiase.c alpha_plane.c cursor.c
+SRC_NET = network.c
+SRC_DLL = 
 xsystem35_SOURCES = \
 	xsystem35.c \
 	dri.c \