diff --git a/src/Makefile.am b/src/Makefile.am
index 59caa55e70..38df228685 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -182,7 +182,6 @@ GRIDCOIN_CORE_H = \
     support/cleanse.h \
     support/lockedpool.h \
     sync.h \
-    threadinterrupt.h \
     threadsafety.h \
     tinyformat.h \
     txdb.h \
@@ -200,6 +199,7 @@ GRIDCOIN_CORE_H = \
     util/syserror.h \
     util/system.h \
     util/threadnames.h \
+    util/threadinterrupt.h \
     util/time.h \
     util/tokenpipe.h \
     util.h \
@@ -300,7 +300,6 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     support/cleanse.cpp \
     support/lockedpool.cpp \
     sync.cpp \
-    threadinterrupt.cpp \
     uint256.cpp \
     util/bip32.cpp \
     util/settings.cpp \
@@ -308,6 +307,7 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     util/string.cpp \
     util/syserror.cpp \
     util/system.cpp \
+    util/threadinterrupt.cpp \
     util/threadnames.cpp \
     util/time.cpp \
     util/tokenpipe.cpp \
diff --git a/src/threadinterrupt.cpp b/src/util/threadinterrupt.cpp
similarity index 97%
rename from src/threadinterrupt.cpp
rename to src/util/threadinterrupt.cpp
index 96f597209c..ad899813f9 100644
--- a/src/threadinterrupt.cpp
+++ b/src/util/threadinterrupt.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://opensource.org/licenses/mit-license.php.
 
-#include <threadinterrupt.h>
+#include <util/threadinterrupt.h>
 
 #include <sync.h>
 
diff --git a/src/threadinterrupt.h b/src/util/threadinterrupt.h
similarity index 87%
rename from src/threadinterrupt.h
rename to src/util/threadinterrupt.h
index 49c58d2330..4e33692801 100644
--- a/src/threadinterrupt.h
+++ b/src/util/threadinterrupt.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_THREADINTERRUPT_H
-#define BITCOIN_THREADINTERRUPT_H
+#ifndef BITCOIN_UTIL_THREADINTERRUPT_H
+#define BITCOIN_UTIL_THREADINTERRUPT_H
 
 #include <sync.h>
 
@@ -33,4 +33,4 @@ class CThreadInterrupt
     std::atomic<bool> flag;
 };
 
-#endif //BITCOIN_THREADINTERRUPT_H
+#endif // BITCOIN_UTIL_THREADINTERRUPT_H
diff --git a/src/util/time.h b/src/util/time.h
index ab73ae4897..173628e7c5 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -14,7 +14,7 @@
 
 #include <unordered_map>
 #include <sync.h>
-#include <threadinterrupt.h>
+#include <util/threadinterrupt.h>
 
 using namespace std::chrono_literals;