8 files changed, 7 insertions, 28 deletions
diff --git a/CPP/7zip/Crypto/7zAes.cpp b/CPP/7zip/Crypto/7zAes.cpp
index 3a1cbd68..41ccb1d2 100755
--- a/CPP/7zip/Crypto/7zAes.cpp
+++ b/CPP/7zip/Crypto/7zAes.cpp
@@ -2,14 +2,13 @@
 
 #include "StdAfx.h"
 
-extern "C"
-{
 #include "../../../C/Sha256.h"
-}
 
 #include "Windows/Synchronization.h"
+
 #include "../Common/StreamObjects.h"
 #include "../Common/StreamUtils.h"
+
 #include "7zAes.h"
 #include "MyAes.h"
 
diff --git a/CPP/7zip/Crypto/MyAes.h b/CPP/7zip/Crypto/MyAes.h
index ffc6fea5..24e90d6f 100755
--- a/CPP/7zip/Crypto/MyAes.h
+++ b/CPP/7zip/Crypto/MyAes.h
@@ -3,10 +3,7 @@
 #ifndef __CRYPTO_MY_AES_H
 #define __CRYPTO_MY_AES_H
 
-extern "C"
-{
 #include "../../../C/Aes.h"
-}
 
 #include "../../Common/MyCom.h"
 #include "../../Common/Types.h"
diff --git a/CPP/7zip/Crypto/Rar20Crypto.cpp b/CPP/7zip/Crypto/Rar20Crypto.cpp
index 8fd2ab23..c2df0e52 100755
--- a/CPP/7zip/Crypto/Rar20Crypto.cpp
+++ b/CPP/7zip/Crypto/Rar20Crypto.cpp
@@ -2,12 +2,9 @@
 
 #include "StdAfx.h"
 
-extern "C"
-{
-  #include "../../../C/7zCrc.h"
-  #include "../../../C/CpuArch.h"
-  #include "../../../C/RotateDefs.h"
-}
+#include "../../../C/7zCrc.h"
+#include "../../../C/CpuArch.h"
+#include "../../../C/RotateDefs.h"
 
 #include "Rar20Crypto.h"
 
diff --git a/CPP/7zip/Crypto/RarAes.h b/CPP/7zip/Crypto/RarAes.h
index aa8e06ba..374017b8 100755
--- a/CPP/7zip/Crypto/RarAes.h
+++ b/CPP/7zip/Crypto/RarAes.h
@@ -3,10 +3,7 @@
 #ifndef __CRYPTO_RAR_AES_H
 #define __CRYPTO_RAR_AES_H
 
-extern "C"
-{
 #include "../../../C/Aes.h"
-}
 
 #include "Common/Buffer.h"
 #include "Common/MyCom.h"
diff --git a/CPP/7zip/Crypto/Sha1.cpp b/CPP/7zip/Crypto/Sha1.cpp
index af211f6c..84e589b2 100755
--- a/CPP/7zip/Crypto/Sha1.cpp
+++ b/CPP/7zip/Crypto/Sha1.cpp
@@ -4,11 +4,9 @@
 
 #include "StdAfx.h"
 
-#include "Sha1.h"
-extern "C"
-{
 #include "../../../C/RotateDefs.h"
-}
+
+#include "Sha1.h"
 
 namespace NCrypto {
 namespace NSha1 {
diff --git a/CPP/7zip/Crypto/WzAes.h b/CPP/7zip/Crypto/WzAes.h
index 2c7a4b43..22f4d4dd 100755
--- a/CPP/7zip/Crypto/WzAes.h
+++ b/CPP/7zip/Crypto/WzAes.h
@@ -12,10 +12,7 @@ specified in password Based File Encryption Utility:
 #ifndef __CRYPTO_WZ_AES_H
 #define __CRYPTO_WZ_AES_H
 
-extern "C"
-{
 #include "../../../C/Aes.h"
-}
 
 #include "Common/Buffer.h"
 #include "Common/MyCom.h"
diff --git a/CPP/7zip/Crypto/ZipCrypto.cpp b/CPP/7zip/Crypto/ZipCrypto.cpp
index fc9f8ac2..f5972c57 100755
--- a/CPP/7zip/Crypto/ZipCrypto.cpp
+++ b/CPP/7zip/Crypto/ZipCrypto.cpp
@@ -2,10 +2,7 @@
 
 #include "StdAfx.h"
 
-extern "C"
-{
 #include "../../../C/7zCrc.h"
-}
 
 #include "../Common/StreamUtils.h"
 
diff --git a/CPP/7zip/Crypto/ZipStrong.cpp b/CPP/7zip/Crypto/ZipStrong.cpp
index e693febd..b29a3ad4 100755
--- a/CPP/7zip/Crypto/ZipStrong.cpp
+++ b/CPP/7zip/Crypto/ZipStrong.cpp
@@ -2,11 +2,8 @@
 
 #include "StdAfx.h"
 
-extern "C"
-{
 #include "../../../C/7zCrc.h"
 #include "../../../C/CpuArch.h"
-}
 
 #include "../Common/StreamUtils.h"