diff --git a/libsrc/common/_afailed.c b/libsrc/common/_afailed.c
index 654025e1a..980045a63 100644
--- a/libsrc/common/_afailed.c
+++ b/libsrc/common/_afailed.c
@@ -10,7 +10,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <cc65.h>
 
 
 void __fastcall__ _afailed (char* file, unsigned line)
diff --git a/libsrc/common/abort.c b/libsrc/common/abort.c
index e59adb7d3..43f4ab004 100644
--- a/libsrc/common/abort.c
+++ b/libsrc/common/abort.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h> 
 #include <signal.h>
-
+#include <cc65.h>
 
 
 void abort (void)
diff --git a/libsrc/dbg/dbg.c b/libsrc/dbg/dbg.c
index 1b08d7750..a58e6c7a6 100644
--- a/libsrc/dbg/dbg.c
+++ b/libsrc/dbg/dbg.c
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include <6502.h>
 #include <dbg.h>
-
+#include <cc65.h>
 
 
 /*****************************************************************************/
@@ -1580,8 +1580,11 @@ void DbgEntry (void)
             case 'q':
                 /* Quit program */
                 clrscr ();
+                
+                /* Exit intentionally with error because one may
+                   say that DbgEntry is always abnormal. */
                 exit (CC65_EXIT_FAILURE);
-
+        
         }
     }
 }
diff --git a/libsrc/geos-common/common/_afailed.c b/libsrc/geos-common/common/_afailed.c
index ec21a6b4e..cc9610ddf 100644
--- a/libsrc/geos-common/common/_afailed.c
+++ b/libsrc/geos-common/common/_afailed.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <geos.h>
+#include <cc65.h>
 
 void _afailed (char* file, unsigned line)
 {