Include headers properly

src/vpnclient/CMakeLists.txt

@@ -4,7 +4,6 @@ set(COMPONENT_INTERNAL_NAME "vpnclient")
 if(WIN32)
   add_executable(vpnclient WIN32
     "vpncsvc.c"
-    "vpncsvc.h"
 
     "${TOP_DIRECTORY}/src/BuildFiles/Manifests/common.manifest"
   )
@@ -20,7 +19,7 @@ if(WIN32)
   configure_file("${TOP_DIRECTORY}/src/BuildFiles/VerScript/ver.rc" "${CMAKE_CURRENT_BINARY_DIR}/ver.rc")
   target_sources(vpnclient PRIVATE "vpnclient.rc" "${CMAKE_CURRENT_BINARY_DIR}/ver.rc")
 else()
-  add_executable(vpnclient vpncsvc.c vpncsvc.h)
+  add_executable(vpnclient "vpncsvc.c")
 endif()
 
 set_target_properties(vpnclient

src/vpnclient/vpncsvc.c

@@ -5,18 +5,14 @@
 // vpncsvc.c
 // VPN Client Service Program
 
-#include <GlobalConst.h>
-
 #define	VPN_EXE
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <stdarg.h>
-#include <time.h>
-#include <Mayaqua/Mayaqua.h>
-#include <Cedar/Cedar.h>
+#include "Cedar/Client.h"
+
+#include "Mayaqua/Mayaqua.h"
+#include "Mayaqua/Microsoft.h"
+#include "Mayaqua/Unix.h"
+#include "Mayaqua/Win32.h"
 
 // Process start function
 void StartProcess()

src/vpnclient/vpncsvc.h

@@ -1,18 +0,0 @@
-// SoftEther VPN Source Code - Developer Edition Master Branch
-// Cedar Communication Module
-
-
-// vpncsvc.h
-// Header of vpncsvc.c
-
-#ifndef	VPNCSVC_H
-#define	VPNCSVC_H
-
-// Function prototype
-int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow);
-void StartProcess();
-void StopProcess();
-
-
-#endif	// VPNCSVC_H
-