diff --git a/.cproject b/.cproject
index 48a5332802b2a56e86ac1424067e2c5b44a34483..8a26a3c9c5bffc4dd88a10242ba01ccb0ab158f6 100644
--- a/.cproject
+++ b/.cproject
@@ -20,13 +20,13 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="tnl" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.configuration.build.1902170740" name="Build (GNU)" parent="org.eclipse.linuxtools.cdt.autotools.configuration.build">
<folderInfo id="org.eclipse.linuxtools.cdt.autotools.configuration.build.1902170740." name="/" resourcePath="">
-<toolChain id="org.eclipse.linuxtools.cdt.autotools.toolChain.1288116166" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.toolChain">
+<toolChain id="org.eclipse.linuxtools.cdt.autotools.toolChain.1288116166" name="GNU Autotools Toolchain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.linuxtools.cdt.autotools.toolChain">
<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform.1947158758" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform"/>
-<builder arguments="-j2" buildPath="${workspace_loc:/tnl}" command="make" enableAutoBuild="true" enableCleanBuild="false" id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.212780712" keepEnvironmentInBuildfile="false" name="Autotools Makefile Generator.Build (GNU)" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.212780712"/>
+<builder buildPath="${workspace_loc:/tnl/build}" enableAutoBuild="true" enableCleanBuild="false" id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.212780712" name="Autotools Makefile Generator.Build (GNU)" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.212780712"/>
<tool id="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure.141790725" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure">
-<option id="org.eclipse.linuxtools.cdt.autotools.option.configure.builddir.269985246" name="Build directory" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.builddir" value="" valueType="string"/>
+<option id="org.eclipse.linuxtools.cdt.autotools.option.configure.builddir.269985246" name="Build directory" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.builddir" value="build" valueType="string"/>
<option id="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix.180395393" name="Arch-independent install directory (--prefix)" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix" value="/home/oberhuber/local" valueType="string"/>
-<option id="org.eclipse.linuxtools.cdt.autotools.option.configure.version.904933857" name="Display version of autotools used to create configuration (--version)" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.version" value="true" valueType="boolean"/>
+<option id="org.eclipse.linuxtools.cdt.autotools.option.configure.version.904933857" name="Display version of autotools used to create configuration (--version)" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.version" value="false" valueType="boolean"/>
<inputType id="org.eclipse.linuxtools.cdt.autotools.inputType.configure.1862846218" superClass="org.eclipse.linuxtools.cdt.autotools.inputType.configure"/>
<inputType id="org.eclipse.linuxtools.cdt.autotools.inputType.configure1.1020168171" superClass="org.eclipse.linuxtools.cdt.autotools.inputType.configure1"/>
</tool>
@@ -35,6 +35,9 @@
</folderInfo>
</configuration>
</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -117,7 +120,7 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
-<scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.configuration.build.1902170740;org.eclipse.linuxtools.cdt.autotools.configuration.build.1902170740.">
+<scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.configuration.build.1902170740">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
<buildOutputProvider>
@@ -200,9 +203,90 @@
</scannerInfoProvider>
</profile>
</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.configuration.build.1902170740;org.eclipse.linuxtools.cdt.autotools.configuration.build.1902170740.">
+<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
<buildTargets>
<target name="all" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
@@ -245,6 +329,14 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
+<target name="clean-recursive" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+<buildCommand>make</buildCommand>
+<buildArguments/>
+<buildTarget>clean-recursive</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+<runAllBuilders>false</runAllBuilders>
+</target>
<target name="config.h" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -301,14 +393,6 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
-<target name="dist-lzma" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>dist-lzma</buildTarget>
-<stopOnError>true</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>false</runAllBuilders>
-</target>
<target name="dist-shar" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -325,14 +409,6 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
-<target name="dist-xz" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>dist-xz</buildTarget>
-<stopOnError>true</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>false</runAllBuilders>
-</target>
<target name="dist-zip" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -373,6 +449,14 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
+<target name="distclean-recursive" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+<buildCommand>make</buildCommand>
+<buildArguments/>
+<buildTarget>distclean-recursive</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+<runAllBuilders>false</runAllBuilders>
+</target>
<target name="distclean-tags" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -445,14 +529,6 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
-<target name="install-dvi" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>install-dvi</buildTarget>
-<stopOnError>true</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>false</runAllBuilders>
-</target>
<target name="install-exec" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -461,14 +537,6 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
-<target name="install-html" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>install-html</buildTarget>
-<stopOnError>true</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>false</runAllBuilders>
-</target>
<target name="install-info" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -485,14 +553,6 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
-<target name="install-pdf" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>install-pdf</buildTarget>
-<stopOnError>true</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>false</runAllBuilders>
-</target>
<target name="install-pkgconfigDATA" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -501,14 +561,6 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
-<target name="install-ps" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>install-ps</buildTarget>
-<stopOnError>true</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>false</runAllBuilders>
-</target>
<target name="install-strip" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -541,6 +593,14 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
+<target name="maintainer-clean-recursive" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+<buildCommand>make</buildCommand>
+<buildArguments/>
+<buildTarget>maintainer-clean-recursive</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+<runAllBuilders>false</runAllBuilders>
+</target>
<target name="Makefile" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -565,6 +625,14 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
+<target name="mostlyclean-recursive" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+<buildCommand>make</buildCommand>
+<buildArguments/>
+<buildTarget>mostlyclean-recursive</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+<runAllBuilders>false</runAllBuilders>
+</target>
<target name="pdf" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -613,6 +681,14 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders>
</target>
+<target name="uninstall-info" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+<buildCommand>make</buildCommand>
+<buildArguments/>
+<buildTarget>uninstall-info</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+<runAllBuilders>false</runAllBuilders>
+</target>
<target name="uninstall-pkgconfigDATA" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
<buildCommand>make</buildCommand>
<buildArguments/>
@@ -623,7 +699,6 @@
</target>
</buildTargets>
</storageModule>
-<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
diff --git a/src/diff/curve-ident.h b/src/diff/curve-ident.h
index 9638320b598909d78716e83addee4de14efae0b7..a5efcf1d431010a46984477beffe8f25d27ae47e 100644
--- a/src/diff/curve-ident.h
+++ b/src/diff/curve-ident.h
@@ -18,7 +18,6 @@
#ifndef curve_identH
#define curve_identH
-#include <core/mcore.h>
#include <diff/mGrid2D.h>
#include <debug/tnlDebug.h>
diff --git a/src/diff/drawGrid1D.h b/src/diff/drawGrid1D.h
index 7c329992adec64f4016bdcf0f9b773702acd4e8f..151442fe6055b4081131731cdec83c91b4f5c70c 100644
--- a/src/diff/drawGrid1D.h
+++ b/src/diff/drawGrid1D.h
@@ -21,7 +21,6 @@
#include <ostream>
#include <fstream>
#include <iomanip>
-#include <core/mcore.h>
#include "mGrid1D.h"
#include "mGridSystem1D.h"
diff --git a/src/diff/drawGrid2D.h b/src/diff/drawGrid2D.h
index b78493b54626dba447388f9bc7e2376d8bf29653..9f85a66648a6bfa9b05f5dfe71efdfc8f43f8b85 100644
--- a/src/diff/drawGrid2D.h
+++ b/src/diff/drawGrid2D.h
@@ -22,8 +22,7 @@
#include <fstream>
#include <iomanip>
#include <string>
-#include <core/mcore.h>
-#include "mGrid2D.h"
+#include <diff/mGrid2D.h>
template< class T > bool Draw( const mGrid2D< T >& u,
ostream& str,
diff --git a/src/diff/drawGrid3D.h b/src/diff/drawGrid3D.h
index 42f6d6a6051cc8b28e831d6bd5441198c6aa2d40..9341a25a644b8b652b453c5a65befdc901adc66a 100644
--- a/src/diff/drawGrid3D.h
+++ b/src/diff/drawGrid3D.h
@@ -21,9 +21,8 @@
#include <ostream>
#include <fstream>
#include <iomanip>
-#include <core/mcore.h>
#include <float.h>
-#include "mGrid3D.h"
+#include <diff/mGrid3D.h>
template< class T > bool Draw( const mGrid3D< T >& u,
ostream& str,
diff --git a/src/diff/mEulerSolver.h b/src/diff/mEulerSolver.h
index 2a8505811c2813cda3d6c0e90f3a77e584a9d097..746fdd5109a45abde2a5c23b8c355bb6175c2757 100644
--- a/src/diff/mEulerSolver.h
+++ b/src/diff/mEulerSolver.h
@@ -19,8 +19,7 @@
#define mEulerSolverH
#include <math.h>
-#include <core/mcore.h>
-#include "mExplicitSolver.h"
+#include <diff/mExplicitSolver.h>
template< class GRID, class SCHEME, typename T = double > class mEulerSolver : public mExplicitSolver< GRID, SCHEME, T >
{
diff --git a/src/diff/mExplicitSolver.h b/src/diff/mExplicitSolver.h
index 7cc2fcf2e1ae6211e468c720722f27debab13636..94d9a2b24836e9987f5418e1c4da71fb19a117c2 100644
--- a/src/diff/mExplicitSolver.h
+++ b/src/diff/mExplicitSolver.h
@@ -19,7 +19,6 @@
#define mExplicitSolverH
#include <iomanip>
-#include <core/mcore.h>
template< class GRID, class SCHEME, typename T = double > class mExplicitSolver : public tnlObject
{
diff --git a/src/diff/mFehlbergSolver.h b/src/diff/mFehlbergSolver.h
index d5f2ca6ffeb3d7a2417679ee43af343755e6606c..2404cc95983c1e2128d648aedae797a5d2a9449a 100644
--- a/src/diff/mFehlbergSolver.h
+++ b/src/diff/mFehlbergSolver.h
@@ -19,8 +19,7 @@
#define mFehlbergSolverH
#include <math.h>
-#include <core/mcore.h>
-#include "mExplicitSolver.h"
+#include <diff/mExplicitSolver.h>
template< class GRID, class SCHEME, typename T = double > class mFehlbergSolver : public mExplicitSolver< GRID, SCHEME, T >
{
diff --git a/src/diff/mGrid1D.h b/src/diff/mGrid1D.h
index 0c5260dc5b6cf7d10b5d94ee36a2fb9fe18cfe26..0c9c4bc43ed964d9c7a62f12d55d27f960e1bb29 100644
--- a/src/diff/mGrid1D.h
+++ b/src/diff/mGrid1D.h
@@ -18,7 +18,7 @@
#ifndef mGrid1DH
#define mGrid1DH
-#include <core/mcore.h>
+#include <diff/mField1D.h>
template< typename T = double > class mGrid1D : public mField1D< T >
{
diff --git a/src/diff/mGrid2D.h b/src/diff/mGrid2D.h
index 32f3e00623b35c2ad04506ee83e86935173104c3..920f890c106322226fda88f65ab7e682ea63ec56 100644
--- a/src/diff/mGrid2D.h
+++ b/src/diff/mGrid2D.h
@@ -18,7 +18,7 @@
#ifndef mGrid2DH
#define mGrid2DH
-#include <core/mcore.h>
+#include <diff/mField2D.h>
template< class T = double > class mGrid2D :
public mField2D< T >
diff --git a/src/diff/mGrid3D.h b/src/diff/mGrid3D.h
index bf32351466201a600c4b88ee326db65d57ba9d39..003cfa01f9aa0ff7b4b55e8322df4ab127e74438 100644
--- a/src/diff/mGrid3D.h
+++ b/src/diff/mGrid3D.h
@@ -18,7 +18,7 @@
#ifndef mGrid3DH
#define mGrid3DH
-#include <core/mcore.h>
+#include <diff/mField2D.h>
template< typename T = double > class mGrid3D : public mField3D< T >
{
diff --git a/src/diff/mGridSystem1D.h b/src/diff/mGridSystem1D.h
index fdda49cf3a38f5486c2a7e73aa5aaea876f13936..abc8fd5398bd65d32954aff7e33d25ca80883a5f 100644
--- a/src/diff/mGridSystem1D.h
+++ b/src/diff/mGridSystem1D.h
@@ -18,7 +18,7 @@
#ifndef mGridSystem1DH
#define mGridSystem1DH
-#include <core/mcore.h>
+#include <diff/mFieldSystem1D.h>
template< typename T, int SYSTEM_SIZE, typename SYSTEM_INDEX > class mGridSystem1D : public mFieldSystem1D< T, SYSTEM_SIZE, SYSTEM_INDEX >
{
diff --git a/src/diff/mMersonSolver.h b/src/diff/mMersonSolver.h
index 80cc024b752b99f2fd223ec80b2e977dbe21e7f7..d8f56343c4729da32b4c017c92210002867d304b 100644
--- a/src/diff/mMersonSolver.h
+++ b/src/diff/mMersonSolver.h
@@ -19,8 +19,7 @@
#define mMersonSolverH
#include <math.h>
-#include <core/mcore.h>
-#include "mExplicitSolver.h"
+#include <diff/mExplicitSolver.h>
template< class GRID, class SCHEME, typename T = double > class mMersonSolver : public mExplicitSolver< GRID, SCHEME, T >
{
diff --git a/src/diff/mNonlinearRungeKuttaSolver.h b/src/diff/mNonlinearRungeKuttaSolver.h
index 8d73219df88afb4fa4d39e5d26c5ffe2a74cdc47..da5c1c1c93ba373b0e0c904bd7a2dcbac04e23cc 100644
--- a/src/diff/mNonlinearRungeKuttaSolver.h
+++ b/src/diff/mNonlinearRungeKuttaSolver.h
@@ -19,8 +19,7 @@
#define mNonlinearRungeKuttaSolverH
#include <math.h>
-#include <core/mcore.h>
-#include "mExplicitSolver.h"
+#include <diff/mExplicitSolver.h>
template< class GRID, class SCHEME, typename T = double > class mNonlinearRungeKuttaSolver : public mExplicitSolver< GRID, SCHEME, T >
{