diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c
index 4ae44e8..ca51f42 100644
--- a/libisofs/ecma119.c
+++ b/libisofs/ecma119.c
@@ -41,8 +41,7 @@
 #include <langinfo.h>
 #include <stdio.h>
 
-/* >>> later change this to  Xorriso_standalonE */
-#ifdef Xorriso_jte_standalonE
+#ifdef Xorriso_standalonE
 
 #ifdef Xorriso_with_libjtE
 #include "../libjte/libjte.h"
@@ -54,7 +53,7 @@
 #include <libjte/libjte.h>
 #endif
 
-#endif /* ! Xorriso_jte_standalonE */
+#endif /* ! Xorriso_standalonE */
 
 /*
  * TODO #00011 : guard against bad path table usage with more than 65535 dirs
diff --git a/libisofs/filesrc.c b/libisofs/filesrc.c
index e3058f9..f1f7732 100644
--- a/libisofs/filesrc.c
+++ b/libisofs/filesrc.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007 Vreixo Formoso
+ *               2010 Thomas Schmitt
  *
  * This file is part of the libisofs project; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2 
@@ -26,8 +27,7 @@
 #include <limits.h>
 
 
-/* >>> later change this to  Xorriso_standalonE */
-#ifdef Xorriso_jte_standalonE
+#ifdef Xorriso_standalonE
 
 #ifdef Xorriso_with_libjtE
 #include "../libjte/libjte.h"
@@ -39,7 +39,7 @@
 #include <libjte/libjte.h>
 #endif
 
-#endif /* ! Xorriso_jte_standalonE */
+#endif /* ! Xorriso_standalonE */
 
 
 #ifndef PATH_MAX
diff --git a/libisofs/messages.c b/libisofs/messages.c
index b7d8d73..54fa682 100644
--- a/libisofs/messages.c
+++ b/libisofs/messages.c
@@ -17,8 +17,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-/* >>> later change this to  Xorriso_standalonE */
-#ifdef Xorriso_jte_standalonE
+#ifdef Xorriso_standalonE
 
 #ifdef Xorriso_with_libjtE
 #include "../libjte/libjte.h"
@@ -30,7 +29,7 @@
 #include <libjte/libjte.h>
 #endif
 
-#endif /* ! Xorriso_jte_standalonE */
+#endif /* ! Xorriso_standalonE */
 
 #include "libiso_msgs.h"
 #include "libisofs.h"