Moved #inclusion of startup.h from scfgdefs.h to sbbs.h, but only if C++.

src/sbbs3/sbbs.h

@@ -103,8 +103,10 @@
 /***********************/
 /* Synchronet-specific */
 /***********************/
+#ifdef __cplusplus
+	#include "startup.h"
+#endif
 #ifdef SBBS	
-	#include "threadwrap.h"	/* must be before dirwrap.h for OpenBSD FULLPATH */
 	#include "text.h"
 #endif
 #include "genwrap.h"

src/sbbs3/scfgdefs.h

@@ -40,8 +40,6 @@
 #ifndef _SCFGDEFS_H_
 #define _SCFGDEFS_H_
 
-#include "startup.h"
-
 typedef struct {                        /* Message sub board info */
 	char	code[LEN_EXTCODE+1];		/* Internal code (with optional lib prefix) */
 	char	code_suffix[LEN_CODE+1];	/* Eight character code suffix */