diff --git a/api.c b/api.c
index 4a87255..f6d96ce 100644
--- a/api.c
+++ b/api.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: api.c v2.0 FreeBSD 2012-08-18 06:54 stable <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /* This file implement the public interfaces presented to host-applications.
  * Routines in other files are for internal use by PH7 and should not be
  * accessed by users of the library.
diff --git a/builtin.c b/builtin.c
index d3ce17f..e0ea451 100644
--- a/builtin.c
+++ b/builtin.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: builtin.c v1.0 FreeBSD 2012-08-06 08:39 devel <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /* This file implement built-in 'foreign' functions for the PH7 engine */
 /*
  * Section:
diff --git a/compile.c b/compile.c
index 15bd376..36b13ca 100644
--- a/compile.c
+++ b/compile.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: compile.c v6.0 Win7 2012-08-18 05:11 stable <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /*
  * This file implement a thread-safe and full-reentrant compiler for the PH7 engine.
  * That is, routines defined in this file takes a stream of tokens and output
diff --git a/constant.c b/constant.c
index 27308b7..d618732 100644
--- a/constant.c
+++ b/constant.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: constant.c v1.1 Win7 2012-08-07 08:22 devel <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /* This file implement built-in constants for the PH7 engine. */
 /*
  * PH7_VERSION
diff --git a/hashmap.c b/hashmap.c
index 071e625..a01e79a 100644
--- a/hashmap.c
+++ b/hashmap.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: hashmap.c v3.5 FreeBSD 2012-08-07 08:29 stable <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /* This file implement generic hashmaps known as 'array' in the PHP world */
 /* Allowed node types */
 #define HASHMAP_INT_NODE   1  /* Node with an int [i.e: 64-bit integer] key */
diff --git a/lex.c b/lex.c
index 8fe6b27..4393791 100644
--- a/lex.c
+++ b/lex.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: lex.c v2.8 Ubuntu-linux 2012-07-13 01:21 stable <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /*
  * This file implement an efficient hand-coded,thread-safe and full-reentrant 
  * lexical analyzer/Tokenizer for the PH7 engine.
diff --git a/lib.c b/lib.c
index 8a17457..b4caaf2 100644
--- a/lib.c
+++ b/lib.c
@@ -19,9 +19,7 @@
  * internally as a secure replacement of the standard libc.
  * The library is re-entrant,thread-safe and platform independent.
  */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 #if defined(__WINNT__)
 #include <Windows.h>
 #else
diff --git a/memobj.c b/memobj.c
index c8170ab..6a3998b 100644
--- a/memobj.c
+++ b/memobj.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: memobj.c v2.7 FreeBSD 2012-08-09 03:40 stable <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /* This file handle low-level stuff related to indexed memory objects [i.e: ph7_value] */
 /*
  * Notes on memory objects [i.e: ph7_value].
diff --git a/oo.c b/oo.c
index 04d08ce..a971d7a 100644
--- a/oo.c
+++ b/oo.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: oo.c v1.9 FeeBSD 2012-07-17 03:44 devel <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /*
  * This file implement an Object Oriented (OO) subsystem for the PH7 engine.
  */
diff --git a/parse.c b/parse.c
index 87e3274..a3334d7 100644
--- a/parse.c
+++ b/parse.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: parse.c v3.7 FreeBSD 2011-12-20 22:46 stable <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /*
  * This file implement a hand-coded, thread-safe, full-reentrant and highly-efficient
  * expression parser for the PH7 engine.
diff --git a/vfs.c b/vfs.c
index f452051..1f9c1a9 100644
--- a/vfs.c
+++ b/vfs.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: vfs.c v2.1 Win7 2012-05-24 01:18 devel <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /*
  * This file implement a virtual file systems (VFS) for the PH7 engine.
  */
diff --git a/vm.c b/vm.c
index 21a83ee..5075235 100644
--- a/vm.c
+++ b/vm.c
@@ -11,9 +11,7 @@
  *      http://ph7.symisc.net/
  */
  /* $SymiscID: vm.c v1.4 FreeBSD 2012-09-10 00:06 stable <chm@symisc.net> $ */
-#ifndef PH7_AMALGAMATION
 #include "ph7int.h"
-#endif
 /*
  * The code in this file implements execution method of the PH7 Virtual Machine.
  * The PH7 compiler (implemented in 'compiler.c' and 'parse.c') generates a bytecode program