Revert "Fixed order of includes in all source files"

This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3.

Fixes issue 8184
http://hercules.ws/board/tracker/issue-8184-cart-related/

1 files changed, 8 insertions, 24 deletions

diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c
index 3fdfadb41..a56896458 100644
--- a/src/common/sysinfo.c
+++ b/src/common/sysinfo.c
@@ -4,39 +4,23 @@
 
 /// See sysinfo.h for a description of this file
 
-#define HERCULES_CORE
-
+#define _COMMON_SYSINFO_P_
 #include "sysinfo.h"
-
-#include <stdio.h> // fopen
-#include <stdlib.h> // atoi
+#undef _COMMON_SYSINFO_P_
 
 #include "../common/cbasetypes.h"
 #include "../common/core.h"
-#include "../common/malloc.h"
 #include "../common/strlib.h"
+#include "../common/malloc.h"
 
 #ifdef WIN32
-#	include <string.h> // strlen
-#	include <windows.h>
+#include <windows.h>
+#include <string.h> // strlen
 #else
-#	include <unistd.h>
+#include <unistd.h>
 #endif
-
-/// Private interface fields
-struct sysinfo_private {
-	char *platform;
-	char *osversion;
-	char *cpu;
-	int cpucores;
-	char *arch;
-	char *compiler;
-	char *cflags;
-	char *vcstype_name;
-	int vcstype;
-	char *vcsrevision_src;
-	char *vcsrevision_scripts;
-};
+#include <stdio.h> // fopen
+#include <stdlib.h> // atoi
 
 /// sysinfo.c interface source
 struct sysinfo_interface sysinfo_s;