diff --git a/base/applications/cmdutils/certutil/CMakeLists.txt b/base/applications/cmdutils/certutil/CMakeLists.txt
index bad17571c46..1cb0d5560ec 100644
--- a/base/applications/cmdutils/certutil/CMakeLists.txt
+++ b/base/applications/cmdutils/certutil/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
-
 list(APPEND SOURCE
     asn.cpp
     certutil.cpp
@@ -9,7 +7,7 @@ list(APPEND SOURCE
 
 add_executable(certutil ${SOURCE})
 set_module_type(certutil win32cui UNICODE)
-target_link_libraries(certutil conutils ${PSEH_LIB})
+target_link_libraries(certutil conutils)
 add_importlibs(certutil crypt32 advapi32 msvcrt kernel32)
 add_pch(certutil precomp.h SOURCE)
 add_cd_file(TARGET certutil DESTINATION reactos/system32 FOR all)
diff --git a/base/applications/cmdutils/certutil/asn.cpp b/base/applications/cmdutils/certutil/asn.cpp
index 030691d4f01..c2221d72e59 100644
--- a/base/applications/cmdutils/certutil/asn.cpp
+++ b/base/applications/cmdutils/certutil/asn.cpp
@@ -221,7 +221,7 @@ void PrintTag(PBYTE pRoot, PBYTE pHeader, DWORD dwTag, DWORD dwTagLength, PBYTE
     DWORD dwRemainder = HexDump(pRoot, pHeader, pData - pHeader, wszPrefix);
 
     LPCWSTR wszTag = TagToName(dwTag);
-    DWORD dwPadding = dwRemainder + wcslen(wszPrefix);
+    size_t dwPadding = dwRemainder + wcslen(wszPrefix);
     while (dwPadding > 50)
         dwPadding -= 50;
     ConPrintf(StdOut, L"%*s; %s (%x Bytes)\n", 50 - dwPadding, L"", wszTag, dwTagLength);
@@ -505,4 +505,3 @@ BOOL asn_dump(LPCWSTR Filename)
     LocalFree(pData);
     return fSucceeded;
 }
-
diff --git a/base/applications/cmdutils/certutil/hashfile.cpp b/base/applications/cmdutils/certutil/hashfile.cpp
index 214ff54bae7..bd233d7c47f 100644
--- a/base/applications/cmdutils/certutil/hashfile.cpp
+++ b/base/applications/cmdutils/certutil/hashfile.cpp
@@ -84,4 +84,3 @@ BOOL hash_file(LPCWSTR Filename)
     CloseHandle(hFile);
     return bSuccess;
 }
-
diff --git a/base/applications/cmdutils/certutil/precomp.h b/base/applications/cmdutils/certutil/precomp.h
index 9818fbee668..68d203ba928 100644
--- a/base/applications/cmdutils/certutil/precomp.h
+++ b/base/applications/cmdutils/certutil/precomp.h
@@ -1,5 +1,4 @@
-#ifndef __CERTUTIL_PRECOMP_H
-#define __CERTUTIL_PRECOMP_H
+#pragma once
 
 /* INCLUDES ******************************************************************/
 
@@ -14,7 +13,3 @@
 
 BOOL hash_file(LPCWSTR Filename);
 BOOL asn_dump(LPCWSTR Filename);
-
-
-
-#endif /* __CERTUTIL_PRECOMP_H */