diff --git a/src/core/sys/windows/ras.d b/src/core/sys/windows/ras.d
index d737fb12fc4..9903f1a430b 100644
--- a/src/core/sys/windows/ras.d
+++ b/src/core/sys/windows/ras.d
@@ -817,51 +817,48 @@ extern (Windows) { /* WINAPI */
     alias void function(HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD) RASDIALFUNC1;
     alias DWORD function (ULONG_PTR, DWORD, HRASCONN, UINT,
     RASCONNSTATE, DWORD, DWORD) RASDIALFUNC2;
-}
 
-/* External functions */
-DWORD RasDialA(LPRASDIALEXTENSIONS, LPCSTR, LPRASDIALPARAMSA, DWORD, LPVOID, LPHRASCONN);
-DWORD RasDialW(LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW, DWORD, LPVOID, LPHRASCONN);
-DWORD RasEnumConnectionsA(LPRASCONNA, LPDWORD, LPDWORD);
-DWORD RasEnumConnectionsW(LPRASCONNW, LPDWORD, LPDWORD);
-DWORD RasEnumEntriesA(LPCSTR, LPCSTR, LPRASENTRYNAMEA, LPDWORD, LPDWORD);
-DWORD RasEnumEntriesW(LPCWSTR, LPCWSTR, LPRASENTRYNAMEW, LPDWORD, LPDWORD);
-DWORD RasGetConnectStatusA(HRASCONN, LPRASCONNSTATUSA);
-DWORD RasGetConnectStatusW(HRASCONN, LPRASCONNSTATUSW);
-DWORD RasGetErrorStringA(UINT, LPSTR, DWORD);
-DWORD RasGetErrorStringW(UINT, LPWSTR, DWORD);
-DWORD RasHangUpA(HRASCONN);
-DWORD RasHangUpW(HRASCONN);
-DWORD RasGetProjectionInfoA(HRASCONN, RASPROJECTION, LPVOID, LPDWORD);
-DWORD RasGetProjectionInfoW(HRASCONN, RASPROJECTION, LPVOID, LPDWORD);
-DWORD RasCreatePhonebookEntryA(HWND, LPCSTR);
-DWORD RasCreatePhonebookEntryW(HWND, LPCWSTR);
-DWORD RasEditPhonebookEntryA(HWND, LPCSTR, LPCSTR);
-DWORD RasEditPhonebookEntryW(HWND, LPCWSTR, LPCWSTR);
-DWORD RasSetEntryDialParamsA(LPCSTR, LPRASDIALPARAMSA, BOOL);
-DWORD RasSetEntryDialParamsW(LPCWSTR, LPRASDIALPARAMSW, BOOL);
-DWORD RasGetEntryDialParamsA(LPCSTR, LPRASDIALPARAMSA, LPBOOL);
-DWORD RasGetEntryDialParamsW(LPCWSTR, LPRASDIALPARAMSW, LPBOOL);
-DWORD RasEnumDevicesA(LPRASDEVINFOA, LPDWORD, LPDWORD);
-DWORD RasEnumDevicesW(LPRASDEVINFOW, LPDWORD, LPDWORD);
-DWORD RasGetCountryInfoA(LPRASCTRYINFOA, LPDWORD);
-DWORD RasGetCountryInfoW(LPRASCTRYINFOW, LPDWORD);
-DWORD RasGetEntryPropertiesA(LPCSTR, LPCSTR, LPRASENTRYA, LPDWORD, LPBYTE, LPDWORD);
-DWORD RasGetEntryPropertiesW(LPCWSTR, LPCWSTR, LPRASENTRYW, LPDWORD, LPBYTE, LPDWORD);
-DWORD RasSetEntryPropertiesA(LPCSTR, LPCSTR, LPRASENTRYA, DWORD, LPBYTE, DWORD);
-DWORD RasSetEntryPropertiesW(LPCWSTR, LPCWSTR, LPRASENTRYW, DWORD, LPBYTE, DWORD);
-DWORD RasRenameEntryA(LPCSTR, LPCSTR, LPCSTR);
-DWORD RasRenameEntryW(LPCWSTR, LPCWSTR, LPCWSTR);
-DWORD RasDeleteEntryA(LPCSTR, LPCSTR);
-DWORD RasDeleteEntryW(LPCWSTR, LPCWSTR);
-DWORD RasValidateEntryNameA(LPCSTR, LPCSTR);
-DWORD RasValidateEntryNameW(LPCWSTR, LPCWSTR);
+    /* External functions */
+    DWORD RasDialA(LPRASDIALEXTENSIONS, LPCSTR, LPRASDIALPARAMSA, DWORD, LPVOID, LPHRASCONN);
+    DWORD RasDialW(LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW, DWORD, LPVOID, LPHRASCONN);
+    DWORD RasEnumConnectionsA(LPRASCONNA, LPDWORD, LPDWORD);
+    DWORD RasEnumConnectionsW(LPRASCONNW, LPDWORD, LPDWORD);
+    DWORD RasEnumEntriesA(LPCSTR, LPCSTR, LPRASENTRYNAMEA, LPDWORD, LPDWORD);
+    DWORD RasEnumEntriesW(LPCWSTR, LPCWSTR, LPRASENTRYNAMEW, LPDWORD, LPDWORD);
+    DWORD RasGetConnectStatusA(HRASCONN, LPRASCONNSTATUSA);
+    DWORD RasGetConnectStatusW(HRASCONN, LPRASCONNSTATUSW);
+    DWORD RasGetErrorStringA(UINT, LPSTR, DWORD);
+    DWORD RasGetErrorStringW(UINT, LPWSTR, DWORD);
+    DWORD RasHangUpA(HRASCONN);
+    DWORD RasHangUpW(HRASCONN);
+    DWORD RasGetProjectionInfoA(HRASCONN, RASPROJECTION, LPVOID, LPDWORD);
+    DWORD RasGetProjectionInfoW(HRASCONN, RASPROJECTION, LPVOID, LPDWORD);
+    DWORD RasCreatePhonebookEntryA(HWND, LPCSTR);
+    DWORD RasCreatePhonebookEntryW(HWND, LPCWSTR);
+    DWORD RasEditPhonebookEntryA(HWND, LPCSTR, LPCSTR);
+    DWORD RasEditPhonebookEntryW(HWND, LPCWSTR, LPCWSTR);
+    DWORD RasSetEntryDialParamsA(LPCSTR, LPRASDIALPARAMSA, BOOL);
+    DWORD RasSetEntryDialParamsW(LPCWSTR, LPRASDIALPARAMSW, BOOL);
+    DWORD RasGetEntryDialParamsA(LPCSTR, LPRASDIALPARAMSA, LPBOOL);
+    DWORD RasGetEntryDialParamsW(LPCWSTR, LPRASDIALPARAMSW, LPBOOL);
+    DWORD RasEnumDevicesA(LPRASDEVINFOA, LPDWORD, LPDWORD);
+    DWORD RasEnumDevicesW(LPRASDEVINFOW, LPDWORD, LPDWORD);
+    DWORD RasGetCountryInfoA(LPRASCTRYINFOA, LPDWORD);
+    DWORD RasGetCountryInfoW(LPRASCTRYINFOW, LPDWORD);
+    DWORD RasGetEntryPropertiesA(LPCSTR, LPCSTR, LPRASENTRYA, LPDWORD, LPBYTE, LPDWORD);
+    DWORD RasGetEntryPropertiesW(LPCWSTR, LPCWSTR, LPRASENTRYW, LPDWORD, LPBYTE, LPDWORD);
+    DWORD RasSetEntryPropertiesA(LPCSTR, LPCSTR, LPRASENTRYA, DWORD, LPBYTE, DWORD);
+    DWORD RasSetEntryPropertiesW(LPCWSTR, LPCWSTR, LPRASENTRYW, DWORD, LPBYTE, DWORD);
+    DWORD RasRenameEntryA(LPCSTR, LPCSTR, LPCSTR);
+    DWORD RasRenameEntryW(LPCWSTR, LPCWSTR, LPCWSTR);
+    DWORD RasDeleteEntryA(LPCSTR, LPCSTR);
+    DWORD RasDeleteEntryW(LPCWSTR, LPCWSTR);
+    DWORD RasValidateEntryNameA(LPCSTR, LPCSTR);
+    DWORD RasValidateEntryNameW(LPCWSTR, LPCWSTR);
 
 //static if(_WIN32_WINNT >= 0x401) {
-extern (Windows) { /* WINAPI */
     alias BOOL function(LPSTR, LPSTR, LPRASADPARAMS, LPDWORD) RASADFUNCA;
     alias BOOL function(LPWSTR, LPWSTR, LPRASADPARAMS, LPDWORD) RASADFUNCW;
-}
 
     DWORD RasGetSubEntryHandleA(HRASCONN, DWORD, LPHRASCONN);
     DWORD RasGetSubEntryHandleW(HRASCONN, DWORD, LPHRASCONN);
@@ -892,12 +889,10 @@ extern (Windows) { /* WINAPI */
 //}
 
 static if (_WIN32_WINNT >= 0x500) {
-extern (Windows) { /* WINAPI */
     alias DWORD function(HRASCONN) RasCustomHangUpFn;
     alias DWORD function(LPCTSTR, LPCTSTR, DWORD) RasCustomDeleteEntryNotifyFn;
     alias DWORD function(HINSTANCE, LPRASDIALEXTENSIONS, LPCTSTR, LPRASDIALPARAMS, DWORD, LPVOID,
                          LPHRASCONN, DWORD) RasCustomDialFn;
-}
 
     DWORD RasInvokeEapUI(HRASCONN, DWORD, LPRASDIALEXTENSIONS, HWND);
     DWORD RasGetLinkStatistics(HRASCONN, DWORD, RAS_STATS*);
@@ -917,6 +912,7 @@ extern (Windows) { /* WINAPI */
     void RasFreeEapUserIdentityW(LPRASEAPUSERIDENTITYW);
     void RasFreeEapUserIdentityA(LPRASEAPUSERIDENTITYA);
 }
+} // extern (Windows)
 
 
 /* UNICODE defines for functions */