diff --git a/src/morphydefs.h b/src/morphydefs.h
index def7955..ca5d364 100644
--- a/src/morphydefs.h
+++ b/src/morphydefs.h
@@ -46,7 +46,30 @@ typedef unsigned int MPLstate;
 #define MPLWTMIN        (MPL_EPSILON * 10) /*! Safest (for me!) if calculations
                                                steer pretty clear of epsilon */
     
-typedef struct MPLndsets MPLndsets;
+
+typedef struct MPLndsets {
+    
+    bool        updated;
+    int         steps_to_recall;
+    MPLstate*   downpass1;
+    MPLstate*   uppass1;
+    MPLstate*   downpass2;
+    MPLstate*   uppass2;
+    MPLstate*   subtree_actives;
+    MPLstate*   temp_subtr_actives;
+    MPLstate*   temp_downpass1;
+    MPLstate*   temp_uppass1;
+    MPLstate*   temp_downpass2;
+    MPLstate*   temp_uppass2;
+    bool*       changes;
+    char**      downp1str;
+    char**      downp2str;
+    char**      upp1str;
+    char**      upp2str;
+    
+} MPLndsets;
+
+    
 typedef struct partition_s MPLpartition;
 // Evaluator function pointers
 typedef int (*MPLdownfxn)
@@ -82,7 +105,6 @@ typedef struct {
 } MPLcell;
     
 
-typedef struct charinfo_s MPLcharinfo;
 typedef struct charinfo_s {
     
     int         charindex;
@@ -112,7 +134,6 @@ typedef struct {
 } MPLcupdate;
     
     
-typedef struct partition_s MPLpartition;
 typedef struct partition_s {
     
     MPLchtype       chtype;         /*!< The optimality type used for this partition. */
@@ -150,30 +171,6 @@ typedef struct partition_s {
 } MPLpartition;
     
 
-
-typedef struct MPLndsets {
-    
-    bool        updated;
-    int         steps_to_recall;
-    MPLstate*   downpass1;
-    MPLstate*   uppass1;
-    MPLstate*   downpass2;
-    MPLstate*   uppass2;
-    MPLstate*   subtree_actives;
-    MPLstate*   temp_subtr_actives;
-    MPLstate*   temp_downpass1;
-    MPLstate*   temp_uppass1;
-    MPLstate*   temp_downpass2;
-    MPLstate*   temp_uppass2;
-    bool*       changes;
-    char**      downp1str;
-    char**      downp2str;
-    char**      upp1str;
-    char**      upp2str;
-    
-} MPLndsets;
-    
-    
 typedef struct mpl_matrix_s {
     int             ncells;
     MPLcell*        cells;