diff --git a/include/setup.h b/include/setup.h
index 4f7e6595..e9891ba6 100644
--- a/include/setup.h
+++ b/include/setup.h
@@ -19,26 +19,12 @@
 #ifndef DOSBOX_SETUP_H
 #define DOSBOX_SETUP_H
 
-#ifndef CH_LIST
-#define CH_LIST
+#include <cstdio>
 #include <list>
-#endif
-
-#ifndef CH_VECTOR
-#define CH_VECTOR
-#include <vector>
-#endif
-
-#ifndef CH_STRING
-#define CH_STRING
 #include <string>
-#endif
-
-#ifndef CH_CSTDIO
-#define CH_CSTDIO
-#include <stdio.h>
-#endif
+#include <vector>
 
+#include "support.h"
 
 class Hex {
 private:
@@ -123,7 +109,9 @@ public:
 		  suggested_values{},
 		  default_value(),
 		  change(when)
-	{}
+	{
+		assertm(!name.empty(), "Property name can't be empty.");
+	}
 
 	virtual ~Property() = default;
 
@@ -354,4 +342,5 @@ public:
 	/* Returns true if succesful.*/
 	virtual bool Change_Config(Section* /*newconfig*/) {return false;} ;
 };
+
 #endif
diff --git a/include/support.h b/include/support.h
index 3b109f5f..3a03bf7e 100644
--- a/include/support.h
+++ b/include/support.h
@@ -22,6 +22,7 @@
 #include "dosbox.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstdio>
 #include <ctype.h>
 #include <string.h>