diff --git a/src/cc65/codeoptutil.c b/src/cc65/codeoptutil.c
index 23c759fd1..16c41162a 100644
--- a/src/cc65/codeoptutil.c
+++ b/src/cc65/codeoptutil.c
@@ -1447,7 +1447,7 @@ void AdjustEntryIndices (Collection* Indices, int Index, int Change)
             } else if (Index <= *IndexPtr) {
                 /* Has been removed */
                 *IndexPtr = -1;
-                //CollDelete (Indices, I);
+                /*CollDelete (Indices, I);*/
                 --I;
             }
         }
diff --git a/src/cc65/datatype.c b/src/cc65/datatype.c
index 9e52027ce..90bf892ba 100644
--- a/src/cc65/datatype.c
+++ b/src/cc65/datatype.c
@@ -1242,7 +1242,7 @@ const Type* GetBaseElementType (const Type* T)
 
 
 
-SymEntry* GetESUSymEntry (const Type* T)
+struct SymEntry* GetESUSymEntry (const Type* T)
 /* Return a SymEntry pointer from an enum/struct/union type */
 {
     /* Only enums, structs or unions have a SymEntry attribute */
@@ -1254,7 +1254,7 @@ SymEntry* GetESUSymEntry (const Type* T)
 
 
 
-void SetESUSymEntry (Type* T, SymEntry* S)
+void SetESUSymEntry (Type* T, struct SymEntry* S)
 /* Set the SymEntry pointer for an enum/struct/union type */
 {
     /* Only enums, structs or unions have a SymEntry attribute */
diff --git a/src/cc65/datatype.h b/src/cc65/datatype.h
index 1140ee498..af1c6b8e4 100644
--- a/src/cc65/datatype.h
+++ b/src/cc65/datatype.h
@@ -45,6 +45,9 @@
 #include "inline.h"
 #include "mmodel.h"
 
+/* cc65 */
+#include "funcdesc.h"
+
 
 
 /*****************************************************************************/
@@ -53,8 +56,8 @@
 
 
 
-typedef struct FuncDesc FuncDesc;
-typedef struct SymEntry SymEntry;
+struct StrBuf;
+struct SymEntry;
 
 
 
@@ -162,12 +165,12 @@ typedef unsigned long TypeCode;
 /* Type entry */
 typedef struct Type Type;
 struct Type {
-    TypeCode            C;      /* Code for this entry */
+    TypeCode             C;     /* Code for this entry */
     union {
-        FuncDesc*       F;      /* Function description pointer */
-        SymEntry*       S;      /* Enum/struct/union tag symbol entry pointer */
-        long            L;      /* Numeric attribute value */
-        unsigned long   U;      /* Dito, unsigned */
+        struct FuncDesc* F;     /* Function description pointer */
+        struct SymEntry* S;     /* Enum/struct/union tag symbol entry pointer */
+        long             L;     /* Numeric attribute value */
+        unsigned long    U;     /* Dito, unsigned */
     } A;                        /* Type attribute if necessary */
 };
 
@@ -221,11 +224,6 @@ extern const Type type_c_char_p[];
 extern const Type type_void_p[];
 extern const Type type_c_void_p[];
 
-/* Forward for the SymEntry struct */
-struct SymEntry;
-
-/* Forward for the StrBuf struct */
-struct StrBuf;
 
 
 /*****************************************************************************/
@@ -849,7 +847,7 @@ int IsVariadicFunc (const Type* T) attribute ((const));
 */
 
 int IsFastcallFunc (const Type* T) attribute ((const));
-/* Return true if this is a function type or pointer to function type by
+/* Return true if this is a function type or pointer to function type with
 ** __fastcall__ calling convention.
 ** Check fails if the type is not a function or a pointer to function.
 */